commit d016f9c35a8774ba0c05485dc63ae78166758a9b
author Tomas Cejka <cejkat@cesnet.cz> Wed Jul 10 09:16:16 2013 +0200
committer Tomas Cejka <cejkat@cesnet.cz> Wed Jul 10 09:16:16 2013 +0200
tree eeecf0727f4e021307e311c586b89a9558d0a4c6
parent b4cd6dc50120388ff8c1587a26e0a6b29d196465

mod_netconf: history of notification & pthread_key

use pthread-specific value to store history of notifications

src/mod_netconf.c

diff --git a/src/mod_netconf.c b/src/mod_netconf.c
index 4389125..1873c50 100644
--- a/src/mod_netconf.c
+++ b/src/mod_netconf.c
@@ -110,7 +110,7 @@
 pthread_mutex_t ntf_history_lock; /**< mutex protecting notification history list */
 apr_hash_t *netconf_sessions_list = NULL;
 
-json_object *notif_history_array = NULL;
+static pthread_key_t notif_history_key;
 server_rec *http_server = NULL;
 
 volatile int isterminated = 0;
@@ -1471,7 +1471,12 @@
 
 void notification_history(time_t eventtime, const char *content)
 {
-	ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, http_server, "Got notification from history.");
+	json_object *notif_history_array = (json_object *) pthread_getspecific(notif_history_key);
+	if (notif_history_array == NULL) {
+		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, http_server, "No list of notification history found.");
+		return;
+	}
+	ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, http_server, "Got notification from history %lu.", (long unsigned) eventtime);
 	json_object *notif = json_object_new_object();
 	if (notif == NULL) {
 		ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, http_server, "Could not allocate memory for notification (json).");
@@ -1538,7 +1543,10 @@
 
 			pthread_mutex_unlock(&locked_session->lock);
 			pthread_mutex_lock(&ntf_history_lock);
-			notif_history_array = json_object_new_array();
+			json_object *notif_history_array = json_object_new_array();
+			if (pthread_setspecific(notif_history_key, notif_history_array) != 0) {
+				ap_log_error(APLOG_MARK, APLOG_ERR, 0, http_server, "notif_history: cannot set thread-specific hash value.");
+			}
 
 			ncntf_dispatch_receive(temp_session, notification_history);
 
@@ -1986,6 +1994,10 @@
 		close (lsock);
 		return;
 	}
+	ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, http_server, "init of notif_history_key.");
+	if (pthread_key_create(&notif_history_key, NULL) != 0) {
+		ap_log_error(APLOG_MARK, APLOG_ERR, 0, http_server, "init of notif_history_key failed");
+	}
 
 	fcntl(lsock, F_SETFL, fcntl(lsock, F_GETFL, 0) | O_NONBLOCK);
 	while (isterminated == 0) {