Changeset 1336:cec0812038bb in freeDiameter for extensions/rt_default/rt_default.c

Timestamp:

Apr 9, 2019, 10:46:50 PM (5 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

histedit_source:

4e04e2f73d936608db88f0e70d10049fcaf66190

Message:

rt_default: add reload support.

When SIGUSR1 is sent to the freeDiameter process, rt_default reloads
its config file.

Written for Effortel Technologies SA, published with their consent.

File:

• extensions/rt_default/rt_default.c (modified) (5 diffs)

extensions/rt_default/rt_default.c

@@ -38 +38 @@
  */
 
+#include <signal.h>
+
 #include "rt_default.h"
+
+#define MODULE_NAME "rt_default"
+
+#include <pthread.h>
+
+static pthread_rwlock_t rtd_lock;
+
+static char *rtd_config_file;
 
 /* The callback called on new messages */
@@ -45 +55 @@
         struct msg * msg = *pmsg;
         TRACE_ENTRY("%p %p %p", cbdata, msg, candidates);
+        int ret;
         
         CHECK_PARAMS(msg && candidates);
-        
+
+        if (pthread_rwlock_rdlock(&rtd_lock) != 0) {
+                fd_log_notice("%s: read-lock failed, skipping handler", MODULE_NAME);
+                return 0;
+        }
         /* Simply pass it to the appropriate function */
         if (FD_IS_LIST_EMPTY(candidates)) {
-                return 0;
+                ret = 0;
         } else {
-                return rtd_process( msg, candidates );
+                ret = rtd_process( msg, candidates );
         }
+        if (pthread_rwlock_unlock(&rtd_lock) != 0) {
+                fd_log_notice("%s: read-unlock failed after rtd_out, exiting", MODULE_NAME);
+                exit(1);
+        }
+        return ret;
 }
 
@@ -59 +79 @@
 static struct fd_rt_out_hdl * rtd_hdl = NULL;
 
+static volatile int in_signal_handler = 0;
+
+/* signal handler */
+static void sig_hdlr(void)
+{
+        if (in_signal_handler) {
+                fd_log_error("%s: already handling a signal, ignoring new one", MODULE_NAME);
+                return;
+        }
+        in_signal_handler = 1;
+
+        if (pthread_rwlock_wrlock(&rtd_lock) != 0) {
+                fd_log_error("%s: locking failed, aborting config reload", MODULE_NAME);
+                return;
+        }
+        rtd_conf_reload(rtd_config_file);
+        if (pthread_rwlock_unlock(&rtd_lock) != 0) {
+                fd_log_error("%s: unlocking failed after config reload, exiting", MODULE_NAME);
+                exit(1);
+        }               
+
+        fd_log_notice("%s: reloaded configuration", MODULE_NAME);
+
+        in_signal_handler = 0;
+}
+
+
 /* entry point */
 static int rtd_entry(char * conffile)
 {
         TRACE_ENTRY("%p", conffile);
-        
+
+        rtd_config_file = conffile;
+        pthread_rwlock_init(&rtd_lock, NULL);
+
+        if (pthread_rwlock_wrlock(&rtd_lock) != 0) {
+                fd_log_notice("%s: write-lock failed, aborting", MODULE_NAME);
+                return EDEADLK;
+        }
+
         /* Initialize the repo */
         CHECK_FCT( rtd_init() );
@@ -69 +124 @@
         /* Parse the configuration file */
         CHECK_FCT( rtd_conf_handle(conffile) );
-        
+
+        if (pthread_rwlock_unlock(&rtd_lock) != 0) {
+                fd_log_notice("%s: write-unlock failed, aborting", MODULE_NAME);
+                return EDEADLK;
+        }
+
+        /* Register reload callback */
+        CHECK_FCT(fd_event_trig_regcb(SIGUSR1, MODULE_NAME, sig_hdlr));
+
 #if 0
         /* Dump the rules */
@@ -92 +155 @@
         /* Destroy the data */
         rtd_fini();
-        
+
+        pthread_rwlock_destroy(&rtd_lock);
+
         /* Done */
         return ;
 }
 
-EXTENSION_ENTRY("rt_default", rtd_entry);
+EXTENSION_ENTRY(MODULE_NAME, rtd_entry);