Merge branch 'master' of https://git.cse.iitb.ac.in/synerg/xanadu

.gitmodules

 [submodule "resource_system/src/common/cJSON"]
 	path = resource_system/src/common/cJSON
 	url = https://github.com/DaveGamble/cJSON
-[submodule "resource_system/src/common/nlib"]
-	path = resource_system/src/common/nlib
-	url = https://github.com/namandixit/nlib
 [submodule "resource_system/src/common/inih"]
 	path = resource_system/src/common/inih
 	url = https://github.com/benhoyt/inih

resource_system/src/arbiter/arbiter.c

@@ -7,6 +7,7 @@
 #define logError(s, ...)   err(s "\n", ##__VA_ARGS__)
 
 #include "nlib/nlib.h"
+#define stringEqual streq
 
 #undef internal_malloc
 #undef internal_free
@@ -67,8 +68,8 @@ Sint main (Sint argc, Char *argv[])
     signal(SIGINT, signalHandlerSIGINT);
 
     { // Init cJSON
-        cJSON_Hooks hook = {.malloc_fn = dlmalloc,
-                            .free_fn = dlfree};
+        cJSON_Hooks hook = {.malloc_fn = malloc,
+                            .free_fn = free};
         cJSON_InitHooks(&hook);
     }
 
@@ -89,7 +90,7 @@ Sint main (Sint argc, Char *argv[])
     Command *commands = NULL;
     Grunt_Tracker gt = {0};
 
-    Hash_Table grunt_survey_map = htCreate(0);
+    Hash_Table grunt_survey_map = htCreate();
 
     Kafka kafka = {0};
 

resource_system/src/arbiter/grunt_manager.c

@@ -28,7 +28,7 @@ internal_function
 void gruntTrackBegin (Grunt_Tracker *t, Grunt g)
 {
     if (t->grunts == NULL) {
-        t->map = htCreate(0);
+        t->map = htCreate();
         sbufAdd(t->grunts, (Grunt){0}); // SInce 0 index out of hash table will be invalid
     }
 

nlib @ f71785e7

-Subproject commit f71785e7c6a820e65c450d526c60519b250f3115

resource_system/src/grunt/grunt.c

@@ -4,6 +4,7 @@
  */
 
 #include "nlib/nlib.h"
+#define stringEqual streq
 
 #undef internal_malloc
 #undef internal_free
@@ -115,14 +116,10 @@ int main(int argc, char** argv)
 
     { // Init third party libraries
         { // Init cJSON
-            cJSON_Hooks hook = {.malloc_fn = dlmalloc,
-                                .free_fn = dlfree};
+            cJSON_Hooks hook = {.malloc_fn = malloc,
+                                .free_fn = free};
             cJSON_InitHooks(&hook);
         }
-
-        { // Init
-            prom_collector_registry_default_init();
-        }
     }
 
     Configuration conf = {0};

resource_system/src/grunt/thread_manager.c

@@ -19,7 +19,7 @@ internal_function
 void threadTrackBegin (Thread_Tracker *t, Thread th)
 {
     if (t->threads == NULL) {
-        t->map = htCreate(0);
+        t->map = htCreate();
         sbufAdd(t->threads, (Thread){0}); // SInce 0 index out of hash table will be invalid
     }