[gnunet] 02/08: MESSENGER: Add logging and adjust closing rooms

[gnunet]

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

thejackimonster pushed a commit to branch master
in repository gnunet.

commit 4003d89b714aba6f3c6e4f8d71bf44b3f13db872
Author: TheJackiMonster <thejackimonster@gmail.com>
AuthorDate: Sun Jan 21 11:06:13 2024 +0100

    MESSENGER: Add logging and adjust closing rooms
    
    Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
---
 src/service/messenger/gnunet-service-messenger_handle.c    |  8 ++++----
 .../messenger/gnunet-service-messenger_member_store.c      | 12 ++++++++++++
 .../messenger/gnunet-service-messenger_message_send.c      | 10 ++++++++++
 src/service/messenger/gnunet-service-messenger_room.c      | 14 ++++++++++++++
 src/service/messenger/gnunet-service-messenger_service.c   |  6 ++++--
 src/service/messenger/gnunet-service-messenger_service.h   |  5 ++++-
 src/service/messenger/messenger_api_contact_store.c        |  9 +++++++++
 7 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/service/messenger/gnunet-service-messenger_handle.c 
b/src/service/messenger/gnunet-service-messenger_handle.c
index 225a62af9..63adc8a76 100644
--- a/src/service/messenger/gnunet-service-messenger_handle.c
+++ b/src/service/messenger/gnunet-service-messenger_handle.c
@@ -23,11 +23,11 @@
  * @brief GNUnet MESSENGER service
  */
 
-#include "gnunet_messenger_service.h"
 #include "platform.h"
-#include "gnunet-service-messenger_handle.h"
+#include "gnunet_messenger_service.h"
 
 #include "gnunet-service-messenger.h"
+#include "gnunet-service-messenger_handle.h"
 #include "gnunet-service-messenger_room.h"
 
 #include "messenger_api_util.h"
@@ -66,7 +66,7 @@ iterate_close_rooms (void *cls,
                      void *value)
 {
   struct GNUNET_MESSENGER_SrvHandle *handle = cls;
-  close_service_room (handle->service, handle, key);
+  close_service_room (handle->service, handle, key, GNUNET_NO);
   return GNUNET_YES;
 }
 
@@ -286,7 +286,7 @@ close_srv_handle_room (struct GNUNET_MESSENGER_SrvHandle 
*handle,
     return GNUNET_NO;
 
   enum GNUNET_GenericReturnValue result;
-  result = close_service_room (handle->service, handle, key);
+  result = close_service_room (handle->service, handle, key, GNUNET_YES);
 
   if (GNUNET_YES != result)
     return result;
diff --git a/src/service/messenger/gnunet-service-messenger_member_store.c 
b/src/service/messenger/gnunet-service-messenger_member_store.c
index fb45147f4..8f09001f8 100644
--- a/src/service/messenger/gnunet-service-messenger_member_store.c
+++ b/src/service/messenger/gnunet-service-messenger_member_store.c
@@ -59,6 +59,9 @@ clear_member_store (struct GNUNET_MESSENGER_MemberStore 
*store)
 {
   GNUNET_assert ((store) && (store->members));
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Clear member store of room: %s\n",
+             GNUNET_h2s (get_srv_room_key (store->room)));
+
   GNUNET_CONTAINER_multishortmap_iterate (store->members,
                                           iterate_destroy_members, NULL);
   GNUNET_CONTAINER_multishortmap_destroy (store->members);
@@ -155,6 +158,9 @@ load_member_store (struct GNUNET_MESSENGER_MemberStore 
*store,
   char *scan_dir;
   GNUNET_asprintf (&scan_dir, "%s%s%c", directory, "members", DIR_SEPARATOR);
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Load member store from directory: %s\n",
+             scan_dir);
+
   if (GNUNET_OK == GNUNET_DISK_directory_test (scan_dir, GNUNET_YES))
     GNUNET_DISK_directory_scan (scan_dir, callback_scan_for_members, store);
 
@@ -202,6 +208,9 @@ save_member_store (struct GNUNET_MESSENGER_MemberStore 
*store,
   char *save_dir;
   GNUNET_asprintf (&save_dir, "%s%s%c", directory, "members", DIR_SEPARATOR);
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Save member store to directory: %s\n",
+             save_dir);
+
   if ((GNUNET_YES == GNUNET_DISK_directory_test (save_dir, GNUNET_NO)) ||
       (GNUNET_OK == GNUNET_DISK_directory_create (save_dir)))
     GNUNET_CONTAINER_multishortmap_iterate (store->members,
@@ -263,6 +272,9 @@ add_store_member (struct GNUNET_MESSENGER_MemberStore 
*store,
     return NULL;
   }
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Added store member with id: %s\n",
+             GNUNET_sh2s (get_member_id (member)));
+
   return member;
 }
 
diff --git a/src/service/messenger/gnunet-service-messenger_message_send.c 
b/src/service/messenger/gnunet-service-messenger_message_send.c
index 6b3b3eb65..76a446973 100644
--- a/src/service/messenger/gnunet-service-messenger_message_send.c
+++ b/src/service/messenger/gnunet-service-messenger_message_send.c
@@ -31,6 +31,7 @@
 #include "gnunet-service-messenger_message_kind.h"
 #include "gnunet-service-messenger_operation.h"
 #include "gnunet-service-messenger_room.h"
+#include "gnunet_common.h"
 
 struct GNUNET_MESSENGER_MemberNotify
 {
@@ -52,6 +53,9 @@ notify_about_members (struct GNUNET_MESSENGER_MemberNotify 
*notify,
     get_srv_room_message_store (notify->room);
   struct GNUNET_MESSENGER_ListMessage *element;
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Notify through all of member session: 
%s\n",
+             GNUNET_sh2s(get_member_session_id(session)));
+
   for (element = session->messages.head; element; element = element->next)
   {
     if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (map,
@@ -101,6 +105,9 @@ iterate_notify_about_members (void *cls,
 {
   struct GNUNET_MESSENGER_MemberNotify *notify = cls;
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Notify about member session: %s\n",
+             GNUNET_sh2s(get_member_session_id(session)));
+
   if ((notify->session == session) || (GNUNET_YES ==
                                        is_member_session_completed (session)))
     return GNUNET_YES;
@@ -145,6 +152,9 @@ send_message_join (struct GNUNET_MESSENGER_SrvRoom *room,
   notify.handle = handle;
   notify.session = session;
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Notify about all member sessions 
except: %s\n",
+             GNUNET_sh2s (get_member_session_id (session)));
+
   iterate_store_members (get_srv_room_member_store (room),
                          iterate_notify_about_members, &notify);
 
diff --git a/src/service/messenger/gnunet-service-messenger_room.c 
b/src/service/messenger/gnunet-service-messenger_room.c
index a940af64c..61fce26f3 100644
--- a/src/service/messenger/gnunet-service-messenger_room.c
+++ b/src/service/messenger/gnunet-service-messenger_room.c
@@ -28,6 +28,7 @@
 
 #include "gnunet-service-messenger_basement.h"
 #include "gnunet-service-messenger_member.h"
+#include "gnunet-service-messenger_member_session.h"
 #include "gnunet-service-messenger_sender_session.h"
 #include "gnunet-service-messenger_message_kind.h"
 #include "gnunet-service-messenger_message_handle.h"
@@ -1383,6 +1384,9 @@ load_srv_room (struct GNUNET_MESSENGER_SrvRoom *room)
   char *room_dir;
   get_room_data_subdir (room, &room_dir);
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Load room from directory: %s\n",
+             room_dir);
+
   if (GNUNET_YES == GNUNET_DISK_directory_test (room_dir, GNUNET_YES))
   {
     load_member_store (get_srv_room_member_store (room), room_dir);
@@ -1410,6 +1414,9 @@ save_srv_room (struct GNUNET_MESSENGER_SrvRoom *room)
   char *room_dir;
   get_room_data_subdir (room, &room_dir);
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Save room to directory: %s\n",
+             room_dir);
+
   if ((GNUNET_YES == GNUNET_DISK_directory_test (room_dir, GNUNET_NO)) ||
       (GNUNET_OK == GNUNET_DISK_directory_create (room_dir)))
   {
@@ -1438,6 +1445,9 @@ remove_srv_room (struct GNUNET_MESSENGER_SrvRoom *room)
   char *room_dir;
   get_room_data_subdir (room, &room_dir);
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Remove room from directory: %s\n",
+             room_dir);
+
   if (GNUNET_YES == GNUNET_DISK_directory_test (room_dir, GNUNET_YES))
     GNUNET_DISK_directory_remove (room_dir);
 
@@ -1451,6 +1461,10 @@ remove_room_member_session (struct 
GNUNET_MESSENGER_SrvRoom *room,
 {
   GNUNET_assert ((room) && (session));
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Remove member session from room: %s 
(%s)\n",
+             GNUNET_sh2s (get_member_session_id (session)),
+             GNUNET_h2s (get_srv_room_key (room)));
+
   remove_member_session (session->member, session);
 
   const struct GNUNET_CRYPTO_PublicKey *public_key =
diff --git a/src/service/messenger/gnunet-service-messenger_service.c 
b/src/service/messenger/gnunet-service-messenger_service.c
index c10d2c5c6..fad235f27 100644
--- a/src/service/messenger/gnunet-service-messenger_service.c
+++ b/src/service/messenger/gnunet-service-messenger_service.c
@@ -28,6 +28,7 @@
 #include "gnunet-service-messenger_message_kind.h"
 #include "gnunet-service-messenger_room.h"
 
+#include "gnunet_common.h"
 #include "messenger_api_util.h"
 
 static void
@@ -382,7 +383,8 @@ entry_service_room (struct GNUNET_MESSENGER_Service 
*service,
 enum GNUNET_GenericReturnValue
 close_service_room (struct GNUNET_MESSENGER_Service *service,
                     struct GNUNET_MESSENGER_SrvHandle *handle,
-                    const struct GNUNET_HashCode *key)
+                    const struct GNUNET_HashCode *key,
+                    enum GNUNET_GenericReturnValue deletion)
 {
   GNUNET_assert ((service) && (handle) && (key));
 
@@ -413,7 +415,7 @@ close_service_room (struct GNUNET_MESSENGER_Service 
*service,
     if (GNUNET_OK == GNUNET_CONTAINER_multihashmap_remove (service->rooms, key,
                                                            room))
     {
-      destroy_srv_room (room, GNUNET_YES);
+      destroy_srv_room (room, deletion);
       return GNUNET_YES;
     }
     else
diff --git a/src/service/messenger/gnunet-service-messenger_service.h 
b/src/service/messenger/gnunet-service-messenger_service.h
index 403dfcc23..7634dba8e 100644
--- a/src/service/messenger/gnunet-service-messenger_service.h
+++ b/src/service/messenger/gnunet-service-messenger_service.h
@@ -26,6 +26,7 @@
 #ifndef GNUNET_SERVICE_MESSENGER_SERVICE_H
 #define GNUNET_SERVICE_MESSENGER_SERVICE_H
 
+#include "gnunet_common.h"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_util_lib.h"
 
@@ -175,12 +176,14 @@ entry_service_room (struct GNUNET_MESSENGER_Service 
*service,
  * @param[in,out] service Service
  * @param[in,out] handle Handle
  * @param[in] key Key of room
+ * @param[in] deletion Flag to indicate context of closing
  * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
 enum GNUNET_GenericReturnValue
 close_service_room (struct GNUNET_MESSENGER_Service *service,
                     struct GNUNET_MESSENGER_SrvHandle *handle,
-                    const struct GNUNET_HashCode *key);
+                    const struct GNUNET_HashCode *key,
+                    enum GNUNET_GenericReturnValue deletion);
 
 /**
  * Sends a received or sent <i>message</i> with a given <i>hash</i> to each 
handle of a <i>service</i> which
diff --git a/src/service/messenger/messenger_api_contact_store.c 
b/src/service/messenger/messenger_api_contact_store.c
index 843377e6e..538e97acc 100644
--- a/src/service/messenger/messenger_api_contact_store.c
+++ b/src/service/messenger/messenger_api_contact_store.c
@@ -25,6 +25,7 @@
 
 #include "messenger_api_contact_store.h"
 
+#include "gnunet_common.h"
 #include "messenger_api_contact.h"
 #include "messenger_api_util.h"
 
@@ -56,6 +57,8 @@ clear_contact_store (struct GNUNET_MESSENGER_ContactStore 
*store)
 {
   GNUNET_assert ((store) && (store->contacts));
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Clear contact store\n");
+
   GNUNET_CONTAINER_multihashmap_iterate (store->anonymous,
                                          iterate_destroy_contacts, NULL);
   GNUNET_CONTAINER_multihashmap_iterate (store->contacts,
@@ -162,6 +165,9 @@ update_store_contact (struct GNUNET_MESSENGER_ContactStore 
*store,
   struct GNUNET_HashCode hash;
   GNUNET_CRYPTO_hash (oldkey, sizeof(*oldkey), &hash);
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Update contact store entry: %s\n",
+             GNUNET_h2s (&hash));
+
   struct GNUNET_CONTAINER_MultiHashMap *map = select_store_contact_map (
     store, context, &hash
     );
@@ -196,6 +202,9 @@ remove_store_contact (struct GNUNET_MESSENGER_ContactStore 
*store,
   struct GNUNET_HashCode hash;
   GNUNET_CRYPTO_hash (pubkey, sizeof(*pubkey), &hash);
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Remove contact store entry: %s\n",
+             GNUNET_h2s (&hash));
+
   struct GNUNET_CONTAINER_MultiHashMap *map = select_store_contact_map (
     store, context, &hash
     );

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