[gnunet-scheme] 88/324: mq: Move message queue modules to (gnu gnunet mq SOMETHING).

[gnunet]

This is an automated email from the git hooks/post-receive script.

maxime-devos pushed a commit to branch master
in repository gnunet-scheme.

commit 1cb2b51cbc8c9d4605e5d9992ce4e0cdd2bda9b2
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Sun Mar 14 10:44:25 2021 +0100

    mq: Move message queue modules to (gnu gnunet mq SOMETHING).
    
    * gnu/gnunet/util/mq-enum.scm: Move to ...
    * gnu/gnunet/mq/prio-prefs2.scm: ... here.
    * gnu/gnunet/util/mq.scm: Move to ...
    * gnu/gnunet/mq/prio-prefs.scm: ... here, and correct some comments.
    * gnu/gnunet/util/mq-handler: Move to ...
    * gnu/gnunet/mq/handler.scm: ... here.
    * README.org (Modules): correct names of message queue modules and
      remove now obsolete comments.
---
 Makefile.am                                         | 6 +++---
 README.org                                          | 8 ++------
 gnu/gnunet/{util/mq-handler.scm => mq/handler.scm}  | 2 +-
 gnu/gnunet/{util/mq.scm => mq/prio-prefs.scm}       | 8 +++-----
 gnu/gnunet/{util/mq-enum.scm => mq/prio-prefs2.scm} | 4 +++-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bb6f9f3..d9ecc91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,9 +38,9 @@ modules = \
   \
   gnu/gnunet/concurrency/update.scm \
   \
-  gnu/gnunet/util/mq-enum.scm \
-  gnu/gnunet/util/mq-handler.scm \
-  gnu/gnunet/util/mq.scm \
+  gnu/gnunet/mq/handler.scm \
+  gnu/gnunet/mq/prio-prefs.scm \
+  gnu/gnunet/mq/prio-prefs2.scm \
   gnu/gnunet/mq/message-io.scm \
   \
   gnu/gnunet/utils/bv-slice.scm \
diff --git a/README.org b/README.org
index 2b41933..9c76857 100644
--- a/README.org
+++ b/README.org
@@ -57,20 +57,16 @@
    capability, a write+close request capability and a capability
    for all the previous, reacting to a close request and injecting errors.
 
-   + gnu/gnunet/util/mq.scm: message priorities & preferences
+   + gnu/gnunet/mq/prio-prefs.scm: message priorities & preferences
 
      Preferences: is out-of-order allowed or not,
      should the message be corked or not ...
-
-     TODO rename to gnu/gnunet/mq/priority.scm
-   + gnu/gnunet/util/mq-handler.scm: what to do in
+   + gnu/gnunet/mq/handler.scm: what to do in
      response to a message.
 
      Different message types may need need different
      capabilities; the interposition can be used to adjust
      the ambient authority appropriately.
-
-     TODO rename to gnu/gnunet/mq/handler.scm
    + gnu/gnunet/mq/message-io.scm: like soft ports, but using
      fibers channels and for messages.
    + TODO actual queues?  Maybe we don't need them?
diff --git a/gnu/gnunet/util/mq-handler.scm b/gnu/gnunet/mq/handler.scm
similarity index 99%
rename from gnu/gnunet/util/mq-handler.scm
rename to gnu/gnunet/mq/handler.scm
index 7eb1af2..8c142f2 100644
--- a/gnu/gnunet/util/mq-handler.scm
+++ b/gnu/gnunet/mq/handler.scm
@@ -19,7 +19,7 @@
 ;; @author Maxime Devos (scheme-GNUnet)
 ;;
 ;; @brief General-purpose message queue (message handlers)
-(library (gnu gnunet util mq-handler)
+(library (gnu gnunet mq handler)
   (export <message-handler>
          make-message-handler message-handler?
          message-handler-index
diff --git a/gnu/gnunet/util/mq.scm b/gnu/gnunet/mq/prio-prefs.scm
similarity index 95%
rename from gnu/gnunet/util/mq.scm
rename to gnu/gnunet/mq/prio-prefs.scm
index 43cf932..8d1f743 100644
--- a/gnu/gnunet/util/mq.scm
+++ b/gnu/gnunet/mq/prio-prefs.scm
@@ -21,8 +21,8 @@
 ;; @author Christian Grothoff (GNUnet)
 ;; @author Maxime Devos (scheme-GNUnet)
 ;;
-;; @brief General-purpose message queue
-(library (gnu gnunet util mq)
+;; @brief General-purpose message queue (priorities, numeric)
+(library (gnu gnunet mq prio-prefs)
   (export priority-preference priority-preference?
          PRIORITY_MASK
          prio-prefs->integer
@@ -31,7 +31,7 @@
          prio-pref:prio
          prio->integer)
   (import (only (guile) compose)
-         (gnu gnunet util mq-enum)
+         (gnu gnunet mq prio-prefs2)
          (gnu extractor enum)
          (srfi srfi-26)
          (rnrs arithmetic bitwise)
@@ -94,5 +94,3 @@ preference bits."
        ;; Highest priority, control traffic (i.e. CORE/CADET KX).
        ((prio:critical-control) 3)
        (else (assert #f))))))
-;; TODO the message queue itself
-
diff --git a/gnu/gnunet/util/mq-enum.scm b/gnu/gnunet/mq/prio-prefs2.scm
similarity index 96%
rename from gnu/gnunet/util/mq-enum.scm
rename to gnu/gnunet/mq/prio-prefs2.scm
index d7fb805..2bc7292 100644
--- a/gnu/gnunet/util/mq-enum.scm
+++ b/gnu/gnunet/mq/prio-prefs2.scm
@@ -17,12 +17,14 @@
 ;;
 ;; SPDX-License-Identifier: AGPL3.0-or-later
 
+;;;; @brief General-purpose message queue (priorities, documentation)
+
 ;; Work around self-references.
 ;; (enum-value ENUM sym) cannot be used in the
 ;; same module where ENUM is defined, as
 ;; when expanding enum-value, the module where
 ;; ENUM is loaded first.
-(define-library (gnu gnunet util mq-enum)
+(define-library (gnu gnunet mq prio-prefs2)
   (export priority-preference priority-preference?)
   (import (gnu extractor enum)
          (only (rnrs base) begin))

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.