X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-session.c;h=c312b46cbd9adc150dbaf9ea9a9d037959d9c303;hb=96ee1e30743b88780cc9dc975745d8dc03de25ae;hp=88d5b0d2b62d0718ebd9fa31eb54484cd21c1599;hpb=d45426257d5149c735e33e3055220625a919e7bc;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-session.c b/src/afb-session.c
index 88d5b0d2..c312b46c 100644
--- a/src/afb-session.c
+++ b/src/afb-session.c
@@ -29,6 +29,7 @@
 #include <json-c/json.h>
 
 #include "afb-session.h"
+#include "afb-hook.h"
 #include "verbose.h"
 
 #define SIZEUUID	37
@@ -39,7 +40,7 @@
 #define _MAXEXP_	((time_t)(~(time_t)0))
 #define _MAXEXP2_	((time_t)((((unsigned long long)_MAXEXP_) >> 1)))
 #define MAX_EXPIRATION	(_MAXEXP_ >= 0 ? _MAXEXP_ : _MAXEXP2_)
-#define NOW		(time(NULL))
+#define NOW		(time_now())
 
 /* structure for a cookie added to sessions */
 struct cookie
@@ -85,6 +86,14 @@ static struct {
 	.mutex = PTHREAD_MUTEX_INITIALIZER
 };
 
+/* Get the actual raw time */
+static inline time_t time_now()
+{
+	struct timespec ts;
+	clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
+	return ts.tv_sec;
+}
+
 /* generate a new fresh 'uuid' */
 static void new_uuid(char uuid[SIZEUUID])
 {
@@ -189,9 +198,13 @@ static void session_close(struct afb_session *session)
 
 	/* close only one time */
 	if (!session->closed) {
+		/* close it now */
 		session->closed = 1;
 
-		/* free cookies */
+		/* emit the hook */
+		afb_hook_session_close(session);
+
+		/* release cookies */
 		for (idx = 0 ; idx < COOKIECOUNT ; idx++) {
 			while ((cookie = session->cookies[idx])) {
 				session->cookies[idx] = cookie->next;
@@ -206,6 +219,7 @@ static void session_close(struct afb_session *session)
 /* destroy the 'session' */
 static void session_destroy (struct afb_session *session)
 {
+	afb_hook_session_destroy(session);
 	pthread_mutex_destroy(&session->mutex);
 	free(session);
 }
@@ -271,6 +285,8 @@ static struct afb_session *session_add(const char *uuid, int timeout, time_t now
 		return NULL;
 	}
 
+	afb_hook_session_create(session);
+
 	return session;
 }
 
@@ -338,6 +354,28 @@ int afb_session_init (int max_session_count, int timeout, const char *initok)
 	return 0;
 }
 
+/**
+ * Iterate the sessions and call 'callback' with
+ * the 'closure' for each session.
+ */
+void afb_session_foreach(void (*callback)(void *closure, struct afb_session *session), void *closure)
+{
+	struct afb_session *session;
+	int idx;
+
+	/* Loop on Sessions Table and remove anything that is older than timeout */
+	sessionset_lock();
+	for (idx = 0 ; idx < HEADCOUNT; idx++) {
+		session = sessions.heads[idx];
+		while (session) {
+			if (!session->closed)
+				callback(closure, session);
+			session = session->next;
+		}
+	}
+	sessionset_unlock();
+}
+
 /**
  * Cleanup the sessionset of its closed or expired sessions
  */
@@ -419,8 +457,11 @@ end:
 /* increase the use count on 'session' (can be NULL) */
 struct afb_session *afb_session_addref(struct afb_session *session)
 {
-	if (session != NULL)
-		__atomic_add_fetch(&session->refcount, 1, __ATOMIC_RELAXED);
+	if (session != NULL) {
+		afb_hook_session_addref(session);
+		session->refcount++;
+		session_unlock(session);
+	}
 	return session;
 }
 
@@ -431,7 +472,8 @@ void afb_session_unref(struct afb_session *session)
 		return;
 
 	session_lock(session);
-	if (!__atomic_sub_fetch(&session->refcount, 1, __ATOMIC_RELAXED)) {
+	afb_hook_session_unref(session);
+	if (--session->refcount) {
 		if (session->autoclose)
 			session_close(session);
 		if (session->notinset) {
@@ -489,11 +531,11 @@ int afb_session_check_token (struct afb_session *session, const char *token)
 /* generate a new token and update client context */
 void afb_session_new_token (struct afb_session *session)
 {
-	/* Old token was valid let's regenerate a new one */
+	session_unlock(session);
 	new_uuid(session->token);
-
-	/* keep track of time for session timeout and further clean up */
 	session_update_expiration(session, NOW);
+	afb_hook_session_renew(session);
+	session_unlock(session);
 }
 
 /* Returns the uuid of 'session' */