From dbc748013a6a8915b6c21dd7a49dd5b814c53aea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Posp=C3=AD=C5=A1il?= Date: Wed, 7 Jun 2006 17:17:38 +0000 Subject: [PATCH] cleanup in LOGD_NOFILE and LB_PERF --- org.glite.lb.logger/Makefile | 29 ++++++++++++++--------------- org.glite.lb.logger/src/logd_proto.c | 26 +++++++++++++------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index b6f1292..95aecb3 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -37,6 +37,18 @@ ifdef LB_STANDALONE LB_STANDALONE_FLAGS:=-DLB_STANDALONE endif +ifdef LB_PERF + LOGD:=glite-lb-logd-perf glite-lb-logd-perf-nofile + INTERLOGD:=glite-lb-interlogd-perf \ + glite-lb-interlogd-perf-empty +# glite-lb-interlogd-perf-inline-empty + NOTIF_INTERLOGD:=glite-lb-notif-interlogd + LB_PERF_FLAGS:=-DLB_PERF +else + LOGD:=glite-lb-logd + INTERLOGD:=glite-lb-interlogd + NOTIF_INTERLOGD:=glite-lb-notif-interlogd +endif DEBUG:=-g -O0 CFLAGS:=${DEBUG} \ @@ -73,19 +85,6 @@ GLITE_GSS_LIB:=-lglite_security_gss TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit TEST_INC:=-I${cppunit_prefix}/include -ifdef LB_PERF - LOGD:=glite-lb-logd-perf glite-lb-logd-perf-nofile - INTERLOGD:=glite-lb-interlogd-perf \ - glite-lb-interlogd-perf-empty -# glite-lb-interlogd-perf-inline-empty - NOTIF_INTERLOGD:=glite-lb-notif-interlogd -else - LOGD:=glite-lb-logd - INTERLOGD:=glite-lb-interlogd - NOTIF_INTERLOGD:=glite-lb-notif-interlogd -endif - - LOGD_OBJS:= logd_proto.o logd.o LOGD_NOBJS:=${LOGD_OBJS:.o=.no} @@ -198,10 +197,10 @@ ${INTERLOG_OBJS}: %.o: %.c ${CC} ${CFLAGS} ${GLOBUSTHRINC} -c $< -o $@ ${INTERLOG_EMPTY_OBJS}: %.eo: %.c - ${CC} ${CFLAGS} ${GLOBUSTHRINC} -DLB_PERF -DPERF_EMPTY -c $< -o $@ + ${CC} ${CFLAGS} ${GLOBUSTHRINC} -DPERF_EMPTY -c $< -o $@ ${INTERLOG_PERF_OBJS}: %.po: %.c - ${CC} ${CFLAGS} ${GLOBUSTHRINC} -DLB_PERF -c $< -o $@ + ${CC} ${CFLAGS} ${GLOBUSTHRINC} -c $< -o $@ #${INTERLOG_INLINE_EMPTY_OBJS}: %.io: %.c # ${CC} ${CFLAGS} ${GLOBUSTHRINC} -DLB_PERF -DPERF_EMPTY -DPERF_EVENTS_INLINE -c $< -o $@ diff --git a/org.glite.lb.logger/src/logd_proto.c b/org.glite.lb.logger/src/logd_proto.c index f39b24d..4606277 100644 --- a/org.glite.lb.logger/src/logd_proto.c +++ b/org.glite.lb.logger/src/logd_proto.c @@ -463,12 +463,6 @@ int edg_wll_log_proto_server(edg_wll_GssConnection *con, char *name, char *prefi /* if not command, save message to file */ -#ifdef LOGD_NOFILE - edg_wll_ll_log(LOG_DEBUG,"Calling perftest\n"); - glite_wll_perftest_consumeEventString(msg); - edg_wll_ll_log(LOG_DEBUG,"o.k.\n"); - filepos = 0; -#else if(strstr(msg, "DG.TYPE=\"command\"") == NULL) { /* compose the name of the log file */ edg_wll_ll_log(LOG_DEBUG,"Composing filename from prefix \"%s\" and jobId \"%s\"...",prefix,jobId); @@ -478,12 +472,13 @@ int edg_wll_log_proto_server(edg_wll_GssConnection *con, char *name, char *prefi strncpy(outfilename+count_total,jobId,count); count_total+=count; outfilename[count_total]='\0'; edg_wll_ll_log(LOG_DEBUG,"o.k.\n"); - edg_wll_ll_log(LOG_INFO,"Writing message to \"%s\"...",outfilename); - - i = 0; -open_event_file: /* fopen and properly handle the filelock */ +#ifdef LOGD_NOFILE + edg_wll_ll_log(LOG_NOTICE,"NOT writing message to \"%s\".\n",outfilename); + filepos = 0; +#else + edg_wll_ll_log(LOG_INFO,"Writing message to \"%s\"...",outfilename); if ( edg_wll_log_event_write(context, outfilename, msg, FCNTL_ATTEMPTS, FCNTL_TIMEOUT, &filepos) ) { char *errd; answer = edg_wll_Error(context, NULL, &errd); @@ -491,12 +486,17 @@ open_event_file: SYSTEM_ERROR(errd); free(errd); goto edg_wll_log_proto_server_end; - } else edg_wll_ll_log(LOG_INFO,"o.k."); + } else edg_wll_ll_log(LOG_INFO,"o.k.\n"); +#endif } else { filepos = 0; } -#endif +#ifdef LB_PERF + edg_wll_ll_log(LOG_INFO,"Calling perftest"); + glite_wll_perftest_consumeEventString(msg); + edg_wll_ll_log(LOG_INFO,"o.k.\n"); +#endif /* if not priority send now the answer back to client */ if (!event->any.priority) { @@ -549,7 +549,7 @@ open_event_file: } } } else { - edg_wll_ll_log(LOG_NOTICE,"Not sending via IPC.\n"); + edg_wll_ll_log(LOG_NOTICE,"NOT sending via IPC.\n"); } edg_wll_log_proto_server_end: -- 1.8.2.3