refactor(discord-refcount.c): complete rewrite using anomap

Cogmasters · Feb 15, 2024 · 8b09803 · 8b09803
1 parent d0e7c5a
commit 8b09803
Show file tree

Hide file tree

Showing 7 changed files with 134 additions and 202 deletions.
diff --git a/include/discord-internal.h b/include/discord-internal.h
@@ -29,6 +29,7 @@ extern "C" {
 #include "queue.h"
 #include "priority_queue.h"
 #include "attributes.h"
+#include "anomap.h"
 
 /** @brief Return 1 if string isn't considered empty */
 #define NOT_EMPTY_STR(str) ((str) && *(str))
@@ -938,17 +939,9 @@ void discord_gateway_dispatch(struct discord_gateway *gw);
 struct discord_refcounter {
     /** `DISCORD_REFCOUNT` logging module */
     struct logconf conf;
-    /** amount of individual user's data held for automatic cleanup */
-    int length;
-    /** cap before increase */
-    int capacity;
-    /**
-     * individual user's data held for automatic cleanup
-     * @note datatype declared at discord-refcount.c
-     */
-    struct _discord_ref *refs;
-    /** global lock */
-    pthread_mutex_t *g_lock;
+
+    struct anomap *maps[16];
+    pthread_mutex_t locks[16];
 };
 
 /**
@@ -971,6 +964,7 @@ void discord_refcounter_init(struct discord_refcounter *rc,
  * @param should_free whether `data` cleanup should be followed by a free()
  */
 void discord_refcounter_add_internal(struct discord_refcounter *rc,
+                                     const char * name,
                                      void *data,
                                      void (*cleanup)(void *data),
                                      bool should_free);
@@ -985,6 +979,7 @@ void discord_refcounter_add_internal(struct discord_refcounter *rc,
  * @param should_free whether `data` cleanup should be followed by a free()
  */
 void discord_refcounter_add_client(struct discord_refcounter *rc,
+                                   const char * name,
                                    void *data,
                                    void (*cleanup)(struct discord *client,
                                                    void *data),

diff --git a/src/channel.c b/src/channel.c
@@ -84,7 +84,8 @@ discord_get_channel_at_pos(struct discord *client,
         && CCORD_RESOURCE_UNAVAILABLE
                == discord_refcounter_incr(&client->refcounter, ret->data))
     {
-        discord_refcounter_add_client(&client->refcounter, ret->data,
+        discord_refcounter_add_client(&client->refcounter,
+                                      "discord_get_channel_at_pos", ret->data,
                                       ret->cleanup, false);
     }
 

diff --git a/src/discord-cache.c b/src/discord-cache.c
@@ -111,7 +111,7 @@ _on_shard_disconnected(struct discord *client,
         memset(guild, 0, sizeof *guild);                                      \
         discord_guild_from_json(buf, size, guild);                            \
         discord_refcounter_add_internal(                                      \
-            &client->refcounter, guild,                                       \
+            &client->refcounter, "cache_guild", guild,                        \
             (void (*)(void *))discord_guild_cleanup, true);                   \
     } while (0)
 

diff --git a/src/discord-gateway_dispatch.c b/src/discord-gateway_dispatch.c
@@ -120,6 +120,7 @@ discord_gateway_dispatch(struct discord_gateway *gw)
                 == discord_refcounter_incr(&client->refcounter, event_data))
             {
                 discord_refcounter_add_internal(&client->refcounter,
+                                                "discord_gateway_dispatch",
                                                 event_data,
                                                 dispatch[event].cleanup, true);
             }

diff --git a/src/discord-messagecommands.c b/src/discord-messagecommands.c
@@ -169,8 +169,9 @@ discord_message_commands_try_perform(struct discord_message_commands *cmds,
         if (CCORD_RESOURCE_UNAVAILABLE
             == discord_refcounter_incr(&client->refcounter, event_data))
         {
-            discord_refcounter_add_internal(&client->refcounter, event_data,
-                                            _discord_message_cleanup_v, false);
+            discord_refcounter_add_internal(
+                &client->refcounter, "discord_message_commands_try_perform",
+                event_data, _discord_message_cleanup_v, false);
         }
         callback(client, event_data);
         event_data->content = tmp; /* retrieve original ptr */