X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=a8dde60d7cf139cbe0da44a8cf0fa6ab7b63a5e6;hb=bd75f23928644eba826382a45d42756cdd2ac7b1;hp=2002c69e5802e76ac5202aa2987e7a0eae009591;hpb=2eae70672f1e8ca9341a51c056469d8816a5538b;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 2002c69..a8dde60 100644 --- a/src/client.c +++ b/src/client.c @@ -73,7 +73,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA static YAZ_MUTEX g_mutex = 0; static int no_clients = 0; -static int no_clients_total = 0; static int client_use(int delta) { @@ -82,8 +81,6 @@ static int client_use(int delta) yaz_mutex_create(&g_mutex); yaz_mutex_enter(g_mutex); no_clients += delta; - if (delta > 0) - no_clients_total += delta; clients = no_clients; yaz_mutex_leave(g_mutex); yaz_log(YLOG_DEBUG, "%s clients=%d", @@ -96,18 +93,6 @@ int clients_count(void) return client_use(0); } -int clients_count_total(void) -{ - int total = 0; - if (!g_mutex) - return 0; - yaz_mutex_enter(g_mutex); - total = no_clients_total; - yaz_mutex_leave(g_mutex); - return total; -} - - /** \brief Represents client state for a connection to one search target */ struct client { struct session_database *database; @@ -882,12 +867,13 @@ int client_start_search(struct client *cl) /* Nothing has changed and we already have a result */ if (cl->same_search == 1 && rc_prep_connection == 2) { - session_log(se, YLOG_LOG, "client %s REUSE result", client_get_id(cl)); + session_log(se, YLOG_LOG, "client %s resuse result", client_get_id(cl)); return client_reingest(cl); } else if (!rc_prep_connection) { - session_log(se, YLOG_LOG, "client %s FAILED to search: No connection.", client_get_id(cl)); + session_log(se, YLOG_LOG, "client %s postponing search: No connection", + client_get_id(cl)); return -1; } co = client_get_connection(cl); @@ -895,7 +881,7 @@ int client_start_search(struct client *cl) link = connection_get_link(co); assert(link); - session_log(se, YLOG_LOG, "client %s NEW search", client_get_id(cl)); + session_log(se, YLOG_LOG, "client %s new search", client_get_id(cl)); cl->diagnostic = 0; cl->filtered = 0; @@ -1015,6 +1001,7 @@ struct client *client_create(const char *id) cl->id = xstrdup(id); client_use(1); + yaz_log(YLOG_DEBUG, "client_create c=%p %s", cl, id); return cl; }