Changeset 6742

Timestamp:

10/06/08 17:05:24 (2 months ago)

Author:

rbertholon

Message:

fixed memory leaks

Location:

trunk/centstorage/centStorage

Files:

• modules/db_functions/db_connection.c (modified) (1 diff)
• modules/recup_perf_datas/confModule.c (modified) (2 diffs)
• src/Conf.c (modified) (2 diffs)

trunk/centstorage/centStorage/modules/db_functions/db_connection.c

@@ -81 +81 @@
   if (!strcmp(db->type, "MySQL"))
     mysql_disconnect((MYSQL *)db_connection, log, MOD_NAME);
-
 #endif
 

trunk/centstorage/centStorage/modules/recup_perf_datas/confModule.c

@@ -25 +25 @@
 
 #include <confModule.h>
+#include "../db_functions/db_connection.h"
 
 #ifdef HAVE_SSL
@@ -449 +450 @@
 
   /* if the databases configuration has changed */
-  if (changeDBPerf == 1)
+  if (changeDBPerf == 1 && db_connection)
     {
       printf("%s.", DB_CONF_CHANGED);
       if (log == 1)
         logger(" [module %s] %s." , MOD_NAME, DB_CONF_CHANGED);
-      db_disconnect(db_connection, log);
+      LOCK_MUTEX(&mutex);
+      db_disconnect(db_connection, log, MOD_NAME, conf->perfBase);
+      conf->perfBase->baseChanged = 0;
+      UNLOCK_MUTEX(&mutex);
       db_connection = NULL;
     }
 
-  if (changeDBConf == 1)
+  if (changeDBConf == 1 && rped_conf_db_connection)
     {
       printf("%s.", DB_CONF_CHANGED);
       if (log == 1)
         logger(" [module %s] %s." , MOD_NAME, DB_CONF_CHANGED);
-      db_disconnect(rped_conf_db_connection, log);
+      LOCK_MUTEX(&mutex);
+      db_disconnect(rped_conf_db_connection, log, MOD_NAME, conf->confBase);
+      conf->confBase->baseChanged = 0;
+      UNLOCK_MUTEX(&mutex);
       rped_conf_db_connection = NULL;
     }

trunk/centstorage/centStorage/src/Conf.c

@@ -108 +108 @@
     else if (conf->logs->log_file == NULL
              && (!xmlStrcmp(sub->name, (const xmlChar *)LOGGING_NODE)))
-      {
+     {
         /* if the node <logging> is found load all logging value */
 
@@ -241 +241 @@
 
   conf->confBase = loadBaseConf(xmlConfContext, doc, 0);
+  conf->confBase->baseChanged = 0;
   conf->perfBase = loadBaseConf(xmlConfContext, doc, 1);
+  conf->perfBase->baseChanged = 0;
 
   printf("%s\n", LOAD_CONF_SUCCESS);