projects
/
pazpar2-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
55d2a48
)
Observe number of concurrent record ingests
author
Adam Dickmeiss
<adam@indexdata.dk>
Fri, 12 Mar 2010 23:59:58 +0000
(
00:59
+0100)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Fri, 12 Mar 2010 23:59:58 +0000
(
00:59
+0100)
src/client.c
patch
|
blob
|
history
diff --git
a/src/client.c
b/src/client.c
index
01267cd
..
7c5a01c
100644
(file)
--- a/
src/client.c
+++ b/
src/client.c
@@
-24,7
+24,7
@@
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>
@@
-428,6
+428,8
@@
void client_got_records(struct client *cl)
void client_record_response(struct client *cl)
{
void client_record_response(struct client *cl)
{
+ static pthread_mutex_t ingest_mutex = PTHREAD_MUTEX_INITIALIZER;
+ static int ingest_counter = 0, ingest_max = 0;
struct connection *co = cl->connection;
ZOOM_connection link = connection_get_link(co);
ZOOM_resultset resultset = cl->resultset;
struct connection *co = cl->connection;
ZOOM_connection link = connection_get_link(co);
ZOOM_resultset resultset = cl->resultset;
@@
-475,8
+477,19
@@
void client_record_response(struct client *cl)
struct session_database *sdb = client_get_database(cl);
NMEM nmem = nmem_create();
const char *xmlrec;
struct session_database *sdb = client_get_database(cl);
NMEM nmem = nmem_create();
const char *xmlrec;
+ int new_max = 0;
char type[80];
yaz_log(YLOG_LOG, "Record ingest begin client=%p session=%p", cl, cl->session);
char type[80];
yaz_log(YLOG_LOG, "Record ingest begin client=%p session=%p", cl, cl->session);
+ pthread_mutex_lock(&ingest_mutex);
+ ++ingest_counter;
+ if (ingest_counter > ingest_max)
+ {
+ ingest_max = ingest_counter;
+ new_max = ingest_max;
+ }
+ pthread_mutex_unlock(&ingest_mutex);
+ if (new_max)
+ yaz_log(YLOG_LOG, "New max client=%p new_max=%d", cl, new_max);
if (nativesyntax_to_type(sdb, type, rec))
yaz_log(YLOG_WARN, "Failed to determine record type");
xmlrec = ZOOM_record_get(rec, type, NULL);
if (nativesyntax_to_type(sdb, type, rec))
yaz_log(YLOG_WARN, "Failed to determine record type");
xmlrec = ZOOM_record_get(rec, type, NULL);
@@
-489,8
+502,11
@@
void client_record_response(struct client *cl)
yaz_log(YLOG_WARN, "Failed to ingest from %s",
client_get_url(cl));
}
yaz_log(YLOG_WARN, "Failed to ingest from %s",
client_get_url(cl));
}
+ pthread_mutex_lock(&ingest_mutex);
+ --ingest_counter;
+ pthread_mutex_unlock(&ingest_mutex);
nmem_destroy(nmem);
nmem_destroy(nmem);
- yaz_log(YLOG_LOG, "Record ingest end client=%p session=%p", cl, cl->session);
+ yaz_log(YLOG_LOG, "Record ingest end client=%p session=%p max=%d", cl, cl->session, ingest_max);
}
}
else
}
}
else