conf_get_fname takes conf_config as arg

[pazpar2-moved-to-github.git] / src / http_command.c

diff --git a/src/http_command.c b/src/http_command.c
index 422fef1..9b1825d 100644 (file)
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/snprintf.h>
 #include <yaz/yaz-util.h>
 
+#include "ppmutex.h"
 #include "eventl.h"
 #include "parameters.h"
 #include "session.h"
@@ -50,6 +51,8 @@ struct http_session {
     struct session *psession;
     unsigned int session_id;
     int timestamp;
+    int destroy_counter;
+    int activity_counter;
     NMEM nmem;
     http_sessions_t http_sessions;
     struct http_session *next;
@@ -65,7 +68,7 @@ http_sessions_t http_sessions_create(void)
     http_sessions_t hs = xmalloc(sizeof(*hs));
     hs->session_list = 0;
     hs->mutex = 0;
-    yaz_mutex_create(&hs->mutex);
+    pazpar2_mutex_create(&hs->mutex, "http_sessions");
     return hs;
 }
 
@@ -96,15 +99,19 @@ static void session_timeout(IOCHAN i, int event)
 }
 
 struct http_session *http_session_create(struct conf_service *service,
-                                         http_sessions_t http_sessions)
+                                         http_sessions_t http_sessions,
+                                         unsigned int sesid)
 {
     NMEM nmem = nmem_create();
     struct http_session *r = nmem_malloc(nmem, sizeof(*r));
+    char tmp_str[50];
 
-    r->psession = new_session(nmem, service);
-    r->session_id = 0;
+    sprintf(tmp_str, "session#%u", sesid);
+    r->psession = new_session(nmem, service, tmp_str);
+    r->session_id = sesid;
     r->timestamp = 0;
     r->nmem = nmem;
+    r->destroy_counter = r->activity_counter = 0;
     r->http_sessions = http_sessions;
 
     yaz_mutex_enter(http_sessions->mutex);
@@ -112,8 +119,9 @@ struct http_session *http_session_create(struct conf_service *service,
     http_sessions->session_list = r;
     yaz_mutex_leave(http_sessions->mutex);
 
-    r->timeout_iochan = iochan_create(-1, session_timeout, 0);
+    r->timeout_iochan = iochan_create(-1, session_timeout, 0, "http_session_timeout");
     iochan_setdata(r->timeout_iochan, r);
+    yaz_log(YLOG_LOG, "timeout=%d", service->session_timeout);
     iochan_settimeout(r->timeout_iochan, service->session_timeout);
 
     iochan_add(service->server->iochan_man, r->timeout_iochan);
@@ -122,22 +130,41 @@ struct http_session *http_session_create(struct conf_service *service,
 
 void http_session_destroy(struct http_session *s)
 {
-    struct http_session **p;
+    int must_destroy = 1;
 
     http_sessions_t http_sessions = s->http_sessions;
 
+    yaz_log(YLOG_LOG, "http_session_destroy %u", s->session_id);
     yaz_mutex_enter(http_sessions->mutex);
-    for (p = &http_sessions->session_list; *p; p = &(*p)->next)
-        if (*p == s)
-        {
-            *p = (*p)->next;
-            break;
-        }
+
+    /* only if http_session destroy was already called, we will allow it
+       to be destroyed */
+    if (s->destroy_counter != s->activity_counter)
+        must_destroy = 0;
+
+    s->destroy_counter = s->activity_counter = 0;
+    if (must_destroy)
+    {
+        struct http_session **p = 0;
+        for (p = &http_sessions->session_list; *p; p = &(*p)->next)
+            if (*p == s)
+            {
+                *p = (*p)->next;
+                break;
+            }
+    }
     yaz_mutex_leave(http_sessions->mutex);
-    yaz_log(YLOG_LOG, "Destroying session %u", s->session_id);
-    iochan_destroy(s->timeout_iochan);
-    destroy_session(s->psession);
-    nmem_destroy(s->nmem);
+    if (must_destroy)
+    {   /* destroying for real */
+        yaz_log(YLOG_LOG, "Destroying session %u", s->session_id);
+        iochan_destroy(s->timeout_iochan);
+        destroy_session(s->psession);
+        nmem_destroy(s->nmem);
+    }
+    else {
+        yaz_log(YLOG_LOG, "Active clients on session %u. Waiting for new timeout.", s->session_id);
+    }
+
 }
 
 static const char *get_msg(enum pazpar2_error_code code)
@@ -245,6 +272,8 @@ static struct http_session *locate_session(struct http_channel *c)
     for (p = http_sessions->session_list; p; p = p->next)
         if (id == p->session_id)
             break;
+    if (p)
+        p->activity_counter++;
     yaz_mutex_leave(http_sessions->mutex);
     if (p)
         iochan_activity(p->timeout_iochan);
@@ -330,7 +359,8 @@ static void cmd_init(struct http_channel *c)
             return;
         }
     }
-    s = http_session_create(service, c->http_sessions);
+    sesid = make_sessionid();
+    s = http_session_create(service, c->http_sessions, sesid);
     
     yaz_log(YLOG_DEBUG, "HTTP Session init");
     if (!clear || *clear == '0')
@@ -338,13 +368,11 @@ static void cmd_init(struct http_channel *c)
     else
         yaz_log(YLOG_LOG, "No databases preloaded");
     
-    sesid = make_sessionid();
-    s->session_id = sesid;
     if (process_settings(s->psession, c->request, c->response) < 0)
         return;
     
     sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX 
-            "<init><status>OK</status><session>%u", sesid);
+            "<init><status>OK</status><session>%d", sesid);
     if (c->server->server_id)
     {
         strcat(buf, ".");