projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Lowered reference counting to debug
[pazpar2-moved-to-github.git]
/
src
/
client.c
diff --git
a/src/client.c
b/src/client.c
index
a2fce08
..
064754a
100644
(file)
--- a/
src/client.c
+++ b/
src/client.c
@@
-24,7
+24,6
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#if HAVE_CONFIG_H
#include <config.h>
#endif
#if HAVE_CONFIG_H
#include <config.h>
#endif
-#include <pthread.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@
-79,7
+78,7
@@
static void client_use(int delta)
yaz_mutex_enter(g_mutex);
no_clients += delta;
yaz_mutex_leave(g_mutex);
yaz_mutex_enter(g_mutex);
no_clients += delta;
yaz_mutex_leave(g_mutex);
- yaz_log(YLOG_LOG, "%s clients=%d", delta > 0 ? "INC" : "DEC", no_clients);
+ yaz_log(YLOG_DEBUG, "%s clients=%d", delta > 0 ? "INC" : "DEC", no_clients);
}
#else
#define client_use(x)
}
#else
#define client_use(x)
@@
-99,7
+98,6
@@
struct client {
int diagnostic;
enum client_state state;
struct show_raw *show_raw;
int diagnostic;
enum client_state state;
struct show_raw *show_raw;
- struct client *next; // next client in session or next in free list
ZOOM_resultset resultset;
YAZ_MUTEX mutex;
int ref_count;
ZOOM_resultset resultset;
YAZ_MUTEX mutex;
int ref_count;
@@
-440,10
+438,13
@@
void client_search_response(struct client *cl)
void client_got_records(struct client *cl)
{
void client_got_records(struct client *cl)
{
- if (cl->session)
+ struct session *se = cl->session;
+ if (se)
{
{
- session_alert_watch(cl->session, SESSION_WATCH_SHOW);
- session_alert_watch(cl->session, SESSION_WATCH_RECORD);
+ client_unlock(cl);
+ session_alert_watch(se, SESSION_WATCH_SHOW);
+ session_alert_watch(se, SESSION_WATCH_RECORD);
+ client_lock(cl);
}
}
}
}
@@
-615,7
+616,6
@@
struct client *client_create(void)
r->state = Client_Disconnected;
r->show_raw = 0;
r->resultset = 0;
r->state = Client_Disconnected;
r->show_raw = 0;
r->resultset = 0;
- r->next = 0;
r->mutex = 0;
pazpar2_mutex_create(&r->mutex, "client");
r->mutex = 0;
pazpar2_mutex_create(&r->mutex, "client");
@@
-625,10
+625,20
@@
struct client *client_create(void)
return r;
}
return r;
}
+void client_lock(struct client *c)
+{
+ yaz_mutex_enter(c->mutex);
+}
+
+void client_unlock(struct client *c)
+{
+ yaz_mutex_leave(c->mutex);
+}
+
void client_incref(struct client *c)
{
pazpar2_incref(&c->ref_count, c->mutex);
void client_incref(struct client *c)
{
pazpar2_incref(&c->ref_count, c->mutex);
- yaz_log(YLOG_LOG, "client_incref c=%p %s cnt=%d",
+ yaz_log(YLOG_DEBUG, "client_incref c=%p %s cnt=%d",
c, client_get_url(c), c->ref_count);
}
c, client_get_url(c), c->ref_count);
}
@@
-636,11
+646,10
@@
int client_destroy(struct client *c)
{
if (c)
{
{
if (c)
{
- yaz_log(YLOG_LOG, "client_destroy c=%p %s cnt=%d",
+ yaz_log(YLOG_DEBUG, "client_destroy c=%p %s cnt=%d",
c, client_get_url(c), c->ref_count);
if (!pazpar2_decref(&c->ref_count, c->mutex))
{
c, client_get_url(c), c->ref_count);
if (!pazpar2_decref(&c->ref_count, c->mutex))
{
- c->next = 0;
xfree(c->pquery);
c->pquery = 0;
xfree(c->cqlquery);
xfree(c->pquery);
c->pquery = 0;
xfree(c->cqlquery);
@@
-822,33
+831,9
@@
int client_parse_query(struct client *cl, const char *query)
return 0;
}
return 0;
}
-
-void client_remove_from_session(struct client *c)
-{
- struct session *se;
-
- se = c->session;
- assert(se);
- if (se)
- {
- struct client **ccp = &se->clients;
-
- while (*ccp && *ccp != c)
- ccp = &(*ccp)->next;
- assert(*ccp == c);
- *ccp = c->next;
-
- c->database = 0;
- c->session = 0;
- c->next = 0;
- }
-}
-
void client_set_session(struct client *cl, struct session *se)
{
cl->session = se;
void client_set_session(struct client *cl, struct session *se)
{
cl->session = se;
- cl->next = se->clients;
- se->clients = cl;
}
int client_is_active(struct client *cl)
}
int client_is_active(struct client *cl)
@@
-859,14
+844,6
@@
int client_is_active(struct client *cl)
return 0;
}
return 0;
}
-struct client *client_next_in_session(struct client *cl)
-{
- if (cl)
- return cl->next;
- return 0;
-
-}
-
Odr_int client_get_hits(struct client *cl)
{
return cl->hits;
Odr_int client_get_hits(struct client *cl)
{
return cl->hits;