cleanups, and fr_message_done() doesn't need ms

diff --git a/src/tests/util/message_set_test.c b/src/tests/util/message_set_test.c
index 7f4f843199216dd4911c463f0d5ad9b479d6f716..67d0c05c725dfd407bcd67fdb7e21832b6fdc246 100644 (file)
--- a/src/tests/util/message_set_test.c
+++ b/src/tests/util/message_set_test.c
@@ -114,7 +114,7 @@ static void  alloc_blocks(fr_message_set_t *ms, uint32_t *seed, UNUSED int *star
        *end += my_alloc_size;
 }
 
-static void  free_blocks(fr_message_set_t *ms, UNUSED uint32_t *seed, int *start, int *end)
+static void  free_blocks(UNUSED fr_message_set_t *ms, UNUSED uint32_t *seed, int *start, int *end)
 {
        int i;
 
@@ -133,7 +133,7 @@ static void  free_blocks(fr_message_set_t *ms, UNUSED uint32_t *seed, int *start
 
                rad_assert(m->status == FR_MESSAGE_USED);
 
-               rcode = fr_message_done(ms, m);
+               rcode = fr_message_done(m);
 #ifndef NDEBUG
                rad_assert(rcode == 0);
 #else

diff --git a/src/util/message.c b/src/util/message.c
index 5ec16454397cabe1fa81d3c0b1360ea3b00cd51b..e646fb31f4871eaa64bbd061bb92db7cc0dce9ea 100644 (file)
--- a/src/util/message.c
+++ b/src/util/message.c
@@ -216,14 +216,14 @@ fr_message_set_t *fr_message_set_create(TALLOC_CTX *ctx, int num_messages, size_
        message_size &= ~(size_t) 15;
        ms->message_size = message_size;
 
-       ms->mr_array[0] = fr_message_ring_create(ms, num_messages, message_size);
-       if (!ms->mr_array[0]) {
+       ms->rb_array[0] = fr_ring_buffer_create(ms, ring_buffer_size);
+       if (!ms->rb_array[0]) {
                talloc_free(ms);
                return NULL;
        }
 
-       ms->rb_array[0] = fr_ring_buffer_create(ms, ring_buffer_size);
-       if (!ms->rb_array[0]) {
+       ms->mr_array[0] = fr_message_ring_create(ms, num_messages, message_size);
+       if (!ms->mr_array[0]) {
                talloc_free(ms);
                return NULL;
        }
@@ -240,18 +240,13 @@ fr_message_set_t *fr_message_set_create(TALLOC_CTX *ctx, int num_messages, size_
  *  originator of the message.  As such, the message is NOT actually
  *  freed.  Instead, it is just marked as freed.
  *
- * @param[in] ms the message set
  * @param[in] m the message to make as done.
  * @return
  *     - <0 on error
  *     - 0 on success
  */
-int fr_message_done(DBG_UNUSED fr_message_set_t *ms, fr_message_t *m)
+int fr_message_done(fr_message_t *m)
 {
-#ifndef NDEBUG
-       (void) talloc_get_type_abort(ms, fr_message_set_t);
-#endif
-
        rad_assert(m->status != FR_MESSAGE_FREE);
        rad_assert(m->status != FR_MESSAGE_DONE);
 
@@ -1443,7 +1438,7 @@ void fr_message_set_gc(fr_message_set_t *ms)
        MPRINT("GC cleaned %d\n", num_cleaned);
 
        /*
-        *      And then do omne last pass to clean up the arrays.
+        *      And then do one last pass to clean up the arrays.
         */
        fr_message_cleanup(ms, 1 << 24);
 }

diff --git a/src/util/message.h b/src/util/message.h
index a59d6b61f79e1389875b285846a8322bd689ca57..49b1a20b3251b9f85a321711816ece74a5c5f3d8 100644 (file)
--- a/src/util/message.h
+++ b/src/util/message.h
@@ -58,7 +58,7 @@ fr_message_t *fr_message_alloc(fr_message_set_t *ms, fr_message_t *m, size_t act
 fr_message_t *fr_message_alloc_reserve(fr_message_set_t *ms, fr_message_t *m, size_t actual_packet_size,
                                       size_t reserve_size) CC_HINT(nonnull);
 fr_message_t *fr_message_alloc_aligned(fr_message_set_t *ms, fr_message_t *m, size_t actual_packet_size) CC_HINT(nonnull(1));
-int fr_message_done(fr_message_set_t *ms, fr_message_t *m) CC_HINT(nonnull);
+int fr_message_done(fr_message_t *m) CC_HINT(nonnull);
 
 fr_message_t *fr_message_localize(fr_message_set_t *ms, fr_message_t *m, TALLOC_CTX *ctx) CC_HINT(nonnull);