Changes in extensions/rt_default/rtd_rules.c [1336:cec0812038bb:1179:f5e9b53d6f86] in freeDiameter

File:

• extensions/rt_default/rtd_rules.c (modified) (4 diffs)

extensions/rt_default/rtd_rules.c

@@ -47 +47 @@
  *  Under each TARGET element, we have the list of RULES that are defined for this target, ordered by CRITERIA type, then is_regex, then string value.
  *
- * Note: Access these only when holding rtd_lock; config reload may change the underlying data.
+ * Note: Except during configuration parsing and module termination, the lists are only ever accessed read-only, so we do not need a lock.
  */
 
@@ -390 +390 @@
 }
 
-static void free_targets(void)
+/* Destroy the module's data */
+void rtd_fini(void)
 {
         int i;
+        
+        TRACE_ENTRY();
 
         for (i = 0; i < RTD_TAR_MAX; i++) {
@@ -399 +402 @@
                 }
         }
-}
-
-/* Destroy the module's data */
-void rtd_fini(void)
-{
-        TRACE_ENTRY();
-
-        free_targets();
+        
 }
 
@@ -497 +493 @@
         
         return 0;
-}
-
-void rtd_conf_reload(char *config_file)
-{
-        /* save old config in case reload goes wrong */
-        struct fd_list old_config[RTD_TAR_MAX];
-        int i;
-
-        for (i = 0; i < RTD_TAR_MAX; i++) {
-                old_config[i] = TARGETS[i];
-        }
-        memset(TARGETS, 0, sizeof(*TARGETS) * RTD_TAR_MAX);
-        for (i = 0; i < RTD_TAR_MAX; i++) {
-                fd_list_init(&TARGETS[i], NULL);
-        }
-
-        if (rtd_conf_handle(config_file) != 0) {
-                fd_log_notice("rt_default: error reloading configuration, restoring previous configuration");
-                free_targets();
-                for (i = 0; i < RTD_TAR_MAX; i++) {
-                        TARGETS[i] = old_config[i];
-                }
-        } else {
-                /* this has to be done in this weird way because the items contain back pointers referencing TARGETS */
-                struct fd_list save_config[RTD_TAR_MAX];
-                for (i = 0; i < RTD_TAR_MAX; i++) {
-                        save_config[i] = TARGETS[i];
-                        TARGETS[i] = old_config[i];
-                }
-                free_targets();
-                for (i = 0; i < RTD_TAR_MAX; i++) {
-                        TARGETS[i] = save_config[i];
-                }
-        }
 }