From e4600c353f436dfe3742f46e1ec13549ed5ca34f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Posp=C3=AD=C5=A1il?= Date: Sun, 10 Jun 2007 14:37:41 +0000 Subject: [PATCH] cleanup in progress - removed the dependency on client! --- org.glite.lb.server/Makefile | 3 ++- org.glite.lb.server/interface/lbs_db.h | 2 +- org.glite.lb.server/interface/store.h | 7 +++---- org.glite.lb.server/src/bkindex.c | 1 - org.glite.lb.server/src/bkserverd.c | 2 -- org.glite.lb.server/src/db_store.c | 2 -- org.glite.lb.server/src/dump.c | 3 --- org.glite.lb.server/src/get_events.h | 7 +++++++ org.glite.lb.server/src/il_lbproxy.h | 8 +++++--- org.glite.lb.server/src/il_notification.h | 11 +++++++---- org.glite.lb.server/src/jobstat.c | 2 +- org.glite.lb.server/src/jobstat.h | 10 +++++----- org.glite.lb.server/src/jobstat_supp.c | 1 - org.glite.lb.server/src/lb_authz.c | 1 - org.glite.lb.server/src/lb_html.c | 1 - org.glite.lb.server/src/lb_html.h | 10 ++++++---- org.glite.lb.server/src/lb_http.c | 1 - org.glite.lb.server/src/lb_http.h | 10 ++++------ org.glite.lb.server/src/lb_plugin.c | 1 - org.glite.lb.server/src/lb_proto.c | 4 ---- org.glite.lb.server/src/lb_proto.h | 8 ++++---- org.glite.lb.server/src/lb_xml_parse.c.T | 5 ----- org.glite.lb.server/src/lb_xml_parse.h | 15 +++++++-------- org.glite.lb.server/src/lb_xml_parse_V21.c.T | 4 ---- org.glite.lb.server/src/lb_xml_parse_V21.h | 10 ++++++---- org.glite.lb.server/src/load.c | 4 ---- org.glite.lb.server/src/lock.h | 9 +++++++++ org.glite.lb.server/src/notif_match.c | 2 -- org.glite.lb.server/src/notification.c | 2 +- org.glite.lb.server/src/openserver.c | 3 --- org.glite.lb.server/src/process_event.c | 1 - org.glite.lb.server/src/process_event_condor.c | 1 - org.glite.lb.server/src/process_event_pbs.c | 1 - org.glite.lb.server/src/purge.h | 10 +++++++--- org.glite.lb.server/src/query.c | 2 -- org.glite.lb.server/src/query.h | 12 ++++++++++++ org.glite.lb.server/src/server_state.h | 10 ++++++---- org.glite.lb.server/src/srv_purge.c | 3 --- org.glite.lb.server/src/stats.h | 13 ++++++++++--- org.glite.lb.server/src/store.c.T | 1 - org.glite.lb.server/src/write2rgma.c | 1 - org.glite.lb.server/src/ws_fault.h | 10 +++++++--- org.glite.lb.server/src/ws_query.c | 1 - org.glite.lb.server/src/ws_typemap.h | 7 +++++++ org.glite.lb.server/src/ws_typeref.c.T | 3 ++- org.glite.lb.server/src/ws_typeref.h | 12 +++++++++--- org.glite.lb.server/test/test_query_events.cpp | 2 +- org.glite.lb.server/test/test_soap_conv.cpp | 2 +- org.glite.lb.server/test/test_xml.cpp.T | 1 - 49 files changed, 130 insertions(+), 112 deletions(-) diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index 40b213b..1e09780 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -386,7 +386,8 @@ install: ${INSTALL} -m 644 ${top_srcdir}/interface/srv_perf.h ${PREFIX}/include/${globalprefix}/${lbprefix} clean: - rm -rf *.c *.h *.ch *.xh *.xml *.nsmap *.o *.lo .libs glite-lb-* ${STATIC_LIB_BK} test* + rm -rvf *.c *.h *.ch *.xh *.xml *.nsmap *.o *.lo .libs glite-lb-* ${STATIC_LIB_BK} ${PLUGIN_LIB} test* + rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/ %.c: %.c.T rm -f $@ diff --git a/org.glite.lb.server/interface/lbs_db.h b/org.glite.lb.server/interface/lbs_db.h index 2fbdc0f..acdbb83 100644 --- a/org.glite.lb.server/interface/lbs_db.h +++ b/org.glite.lb.server/interface/lbs_db.h @@ -6,7 +6,7 @@ #include #include -#include "glite/lb/consumer.h" +#include "glite/lb/context.h" #ifdef __cplusplus extern "C" { diff --git a/org.glite.lb.server/interface/store.h b/org.glite.lb.server/interface/store.h index 17e71ac..8b25900 100644 --- a/org.glite.lb.server/interface/store.h +++ b/org.glite.lb.server/interface/store.h @@ -1,9 +1,8 @@ -#ifndef _LBS_STORE_H -#define _LBS_STORE_H +#ifndef __GLITE_LB_STORE_H__ +#define __GLITE_LB_STORE_H__ #ident "$Header$" -#include "glite/lb/consumer.h" #include "jobstat.h" #include "lb_authz.h" @@ -57,4 +56,4 @@ int edg_wll_delete_event(edg_wll_Context,const char *, int); } #endif -#endif +#endif /* __GLITE_LB_STORE_H__ */ diff --git a/org.glite.lb.server/src/bkindex.c b/org.glite.lb.server/src/bkindex.c index 16e7da3..7f88935 100644 --- a/org.glite.lb.server/src/bkindex.c +++ b/org.glite.lb.server/src/bkindex.c @@ -9,7 +9,6 @@ #include #include "glite/wmsutils/jobid/strmd5.h" -#include "glite/lb/consumer.h" #include "glite/lb/context-int.h" #include "index.h" #include "lbs_db.h" diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c index dd52f5f..8fe13ae 100644 --- a/org.glite.lb.server/src/bkserverd.c +++ b/org.glite.lb.server/src/bkserverd.c @@ -37,8 +37,6 @@ #include "glite/security/glite_gss.h" #include "glite/lb/srvbones.h" -#include "glite/lb/consumer.h" -#include "glite/lb/purge.h" #include "glite/lb/context.h" #include "glite/lb/mini_http.h" #include "glite/lb/context-int.h" diff --git a/org.glite.lb.server/src/db_store.c b/org.glite.lb.server/src/db_store.c index 4513638..4a0ea51 100644 --- a/org.glite.lb.server/src/db_store.c +++ b/org.glite.lb.server/src/db_store.c @@ -5,11 +5,9 @@ #include #include -#include "glite/lb/consumer.h" #include "glite/lb/context-int.h" #include "glite/lb/events_parse.h" #include "glite/lb/lb_maildir.h" -#include "glite/lb/purge.h" #include "purge.h" #include "store.h" #include "lbs_db.h" diff --git a/org.glite.lb.server/src/dump.c b/org.glite.lb.server/src/dump.c index e14a55c..71a31c6 100644 --- a/org.glite.lb.server/src/dump.c +++ b/org.glite.lb.server/src/dump.c @@ -13,9 +13,6 @@ #include "glite/lb/context-int.h" #include "glite/lb/events_parse.h" #include "glite/lb/ulm_parse.h" -#include "glite/lb/purge.h" -#include "glite/lb/purge.h" -#include "glite/lb/dump.h" #include "lbs_db.h" #include "query.h" diff --git a/org.glite.lb.server/src/get_events.h b/org.glite.lb.server/src/get_events.h index e3b6976..c3e0a18 100644 --- a/org.glite.lb.server/src/get_events.h +++ b/org.glite.lb.server/src/get_events.h @@ -1,5 +1,11 @@ +#ifndef __GLITE_LB_GET_EVENTS_H__ +#define __GLITE_LB_GET_EVENTS_H__ #ident "$Header$" +#include "glite/lb/context.h" +#include "glite/lb/events.h" +#include "glite/lb/query_rec.h" + /* Internal functions for getting event sets from the LB database */ #include "lbs_db.h" @@ -32,3 +38,4 @@ void edg_wll_SortPEvents(edg_wll_Event **); } #endif +#endif /* __GLITE_LB_GET_EVENTS_H__ */ diff --git a/org.glite.lb.server/src/il_lbproxy.h b/org.glite.lb.server/src/il_lbproxy.h index 4107304..c4b5420 100644 --- a/org.glite.lb.server/src/il_lbproxy.h +++ b/org.glite.lb.server/src/il_lbproxy.h @@ -1,5 +1,7 @@ -#ifndef IL_LBPROXY_H -#define IL_LBPROXY_H +#ifndef __GLITE_LB_IL_LBPROXY_H__ +#define __GLITE_LB_IL_LBPROXY_H__ + +#include "glite/lb/context.h" #ifdef __cplusplus #extern "C" { @@ -14,4 +16,4 @@ int edg_wll_EventSendProxy(edg_wll_Context ctx, const edg_wlc_JobId jobid, const } #endif -#endif +#endif /* __GLITE_LB_IL_LBPROXY_H__ */ diff --git a/org.glite.lb.server/src/il_notification.h b/org.glite.lb.server/src/il_notification.h index 52487c4..da85806 100644 --- a/org.glite.lb.server/src/il_notification.h +++ b/org.glite.lb.server/src/il_notification.h @@ -1,8 +1,11 @@ -#ifndef IL_NOTIFICATION_H -#define IL_NOTIFICATION_H +#ifndef __GLITE_LB_IL_NOTIFICATION_H__ +#define __GLITE_LB_IL_NOTIFICATION_H__ + +#ident "$Header$" /* needed for the edg_wll_NotifId */ -#include "glite/lb/notification.h" +#include "glite/lb/notifid.h" + /* import the edg_wll_JobStat structure */ #include "glite/lb/jobstat.h" @@ -93,4 +96,4 @@ edg_wll_NotifCancelRegId(edg_wll_Context context, } #endif -#endif +#endif /* __GLITE_LB_IL_NOTIFICATION_H__ */ diff --git a/org.glite.lb.server/src/jobstat.c b/org.glite.lb.server/src/jobstat.c index d1b49be..3618a4c 100644 --- a/org.glite.lb.server/src/jobstat.c +++ b/org.glite.lb.server/src/jobstat.c @@ -10,7 +10,7 @@ #include #include -#include "glite/lb/producer.h" +#include "glite/lb/events.h" #include "glite/lb/context-int.h" #include "glite/lb/trio.h" diff --git a/org.glite.lb.server/src/jobstat.h b/org.glite.lb.server/src/jobstat.h index 64e32b1..753cade 100644 --- a/org.glite.lb.server/src/jobstat.h +++ b/org.glite.lb.server/src/jobstat.h @@ -1,9 +1,9 @@ -/* $Header$ */ - -#ifndef _LBS_JOBSTAT_H -#define _LBS_JOBSTAT_H +#ifndef __GLITE_LB_LBS_JOBSTAT_H__ +#define __GLITE_LB_LBS_JOBSTAT_H__ +#ident "$Header$" +#include "glite/lb/jobstat.h" #include "lbs_db.h" /* @@ -123,4 +123,4 @@ void init_intJobStat(intJobStat *p); edg_wll_ErrorCode edg_wll_GetSubjobHistogram(edg_wll_Context, edg_wlc_JobId parent_jobid, int *hist); edg_wll_ErrorCode edg_wll_StoreSubjobHistogram(edg_wll_Context, edg_wlc_JobId parent_jobid, intJobStat *ijs); -#endif +#endif /* __GLITE_LB_LBS_JOBSTAT_H__*/ diff --git a/org.glite.lb.server/src/jobstat_supp.c b/org.glite.lb.server/src/jobstat_supp.c index c6d5bf8..2f24fef 100644 --- a/org.glite.lb.server/src/jobstat_supp.c +++ b/org.glite.lb.server/src/jobstat_supp.c @@ -11,7 +11,6 @@ #include #include "glite/wmsutils/jobid/cjobid.h" -#include "glite/lb/producer.h" #include "glite/lb/context-int.h" #include "glite/lb/trio.h" diff --git a/org.glite.lb.server/src/lb_authz.c b/org.glite.lb.server/src/lb_authz.c index 4773441..dd5d048 100644 --- a/org.glite.lb.server/src/lb_authz.c +++ b/org.glite.lb.server/src/lb_authz.c @@ -17,7 +17,6 @@ #include "glite/security/voms/voms_apic.h" #include "glite/wmsutils/jobid/strmd5.h" #include "glite/wmsutils/jobid/cjobid.h" -#include "glite/lb/producer.h" #include "glite/lb/trio.h" #include "lbs_db.h" diff --git a/org.glite.lb.server/src/lb_html.c b/org.glite.lb.server/src/lb_html.c index e91a3ba..4f43cd8 100644 --- a/org.glite.lb.server/src/lb_html.c +++ b/org.glite.lb.server/src/lb_html.c @@ -3,7 +3,6 @@ #include "lb_html.h" #include "lb_proto.h" -#include "glite/lb/consumer.h" #include "glite/lb/context-int.h" #include diff --git a/org.glite.lb.server/src/lb_html.h b/org.glite.lb.server/src/lb_html.h index 1cac83f..57c1685 100644 --- a/org.glite.lb.server/src/lb_html.h +++ b/org.glite.lb.server/src/lb_html.h @@ -1,13 +1,15 @@ -#ifndef _LB_HTML -#define _LB_HTML +#ifndef __GLITE_LB_HTML_H__ +#define __GLITE_LB_HTML_H__ #ident "$Header$" -#include "glite/lb/consumer.h" +#include "glite/lb/context.h" +#include "glite/lb/events.h" +#include "glite/lb/jobstat.h" int edg_wll_QueryToHTML(edg_wll_Context,edg_wll_Event *,char **); int edg_wll_JobStatusToHTML(edg_wll_Context, edg_wll_JobStat, char **); int edg_wll_UserJobsToHTML(edg_wll_Context, edg_wlc_JobId *, char **); char *edg_wll_ErrorToHTML(edg_wll_Context,int); -#endif +#endif /* __GLITE_LB_HTML_H__ */ diff --git a/org.glite.lb.server/src/lb_http.c b/org.glite.lb.server/src/lb_http.c index 3e2cb50..cbd5dc0 100644 --- a/org.glite.lb.server/src/lb_http.c +++ b/org.glite.lb.server/src/lb_http.c @@ -6,7 +6,6 @@ #include #include -#include "glite/lb/consumer.h" #include "glite/lb/mini_http.h" #include "glite/lb/context-int.h" diff --git a/org.glite.lb.server/src/lb_http.h b/org.glite.lb.server/src/lb_http.h index 76bb883..c63745d 100644 --- a/org.glite.lb.server/src/lb_http.h +++ b/org.glite.lb.server/src/lb_http.h @@ -1,13 +1,11 @@ -#ifndef _LB_HTTP_H -#define _LB_HTTP_H +#ifndef __GLITE_LB_HTTP_H__ +#define __GLITE_LB_HTTP_H__ #ident "$Header$" -#include - -#include "glite/lb/consumer.h" +#include "glite/lb/context.h" int edg_wll_ServerHTTP(edg_wll_Context); int edg_wll_ServerHTTPProxy(edg_wll_Context); -#endif +#endif /* __GLITE_LB_HTTP_H__ */ diff --git a/org.glite.lb.server/src/lb_plugin.c b/org.glite.lb.server/src/lb_plugin.c index 6630fa6..453f633 100644 --- a/org.glite.lb.server/src/lb_plugin.c +++ b/org.glite.lb.server/src/lb_plugin.c @@ -16,7 +16,6 @@ #include "glite/lb/events.h" #include "glite/lb/events_parse.h" #include "glite/lb/trio.h" -#include "glite/lb/producer.h" #include "jobstat.h" #include "get_events.h" diff --git a/org.glite.lb.server/src/lb_proto.c b/org.glite.lb.server/src/lb_proto.c index 7dba657..ef65998 100644 --- a/org.glite.lb.server/src/lb_proto.c +++ b/org.glite.lb.server/src/lb_proto.c @@ -8,13 +8,9 @@ #include -#include "glite/lb/consumer.h" #include "glite/lb/context-int.h" #include "glite/lb/mini_http.h" #include "glite/lb/xml_conversions.h" -#include "glite/lb/dump.h" -#include "glite/lb/load.h" -#include "glite/lb/purge.h" #include "lb_proto.h" #include "lb_html.h" diff --git a/org.glite.lb.server/src/lb_proto.h b/org.glite.lb.server/src/lb_proto.h index aea3957..80f75e3 100644 --- a/org.glite.lb.server/src/lb_proto.h +++ b/org.glite.lb.server/src/lb_proto.h @@ -1,9 +1,9 @@ -#ifndef _LB_PROTO_H -#define _LB_PROTO_H +#ifndef __GLITE_LB_PROTO_H__ +#define __GLITE_LB_PROTO_H__ #ident "$Header$" -#include "glite/lb/consumer.h" +#include "glite/lb/context.h" extern const char* const response_headers[]; @@ -24,4 +24,4 @@ extern edg_wll_ErrorCode edg_wll_Proto( extern char *edg_wll_HTTPErrorMessage(int); -#endif +#endif /* __GLITE_LB_PROTO_H__ */ diff --git a/org.glite.lb.server/src/lb_xml_parse.c.T b/org.glite.lb.server/src/lb_xml_parse.c.T index 764b188..14c4a0e 100644 --- a/org.glite.lb.server/src/lb_xml_parse.c.T +++ b/org.glite.lb.server/src/lb_xml_parse.c.T @@ -8,16 +8,11 @@ #include "glite/wmsutils/jobid/cjobid.h" -#include "glite/lb/consumer.h" #include "glite/lb/escape.h" #include "glite/lb/context-int.h" #include "glite/lb/trio.h" #include "glite/lb/xml_conversions.h" -#include "glite/lb/purge.h" -#include "glite/lb/dump.h" -#include "glite/lb/load.h" - #include "lb_xml_parse.h" #ifdef __GNUC__ diff --git a/org.glite.lb.server/src/lb_xml_parse.h b/org.glite.lb.server/src/lb_xml_parse.h index 0d2821e..8171c59 100644 --- a/org.glite.lb.server/src/lb_xml_parse.h +++ b/org.glite.lb.server/src/lb_xml_parse.h @@ -1,13 +1,12 @@ -#ifndef _LB_XML_PARSE_H -#define _LB_XML_PARSE_H +#ifndef __GLITE_LB_LB_XML_PARSE_H__ +#define __GLITE_LB_LB_XML_PARSE_H__ #ident "$Header$" -#include "glite/lb/consumer.h" -#include "glite/lb/notification.h" -#include "glite/lb/purge.h" -#include "glite/lb/dump.h" -#include "glite/lb/load.h" +#include "glite/lb/context.h" +#include "glite/lb/jobstat.h" +#include "glite/lb/notif_rec.h" +#include "glite/lb/query_rec.h" #ifdef __cplusplus extern "C" { @@ -43,4 +42,4 @@ int parseStatsRequest(edg_wll_Context,char *,char **,edg_wll_QueryRec ***,edg_wl } #endif -#endif +#endif /* __GLITE_LB_LB_XML_PARSE_H__ */ diff --git a/org.glite.lb.server/src/lb_xml_parse_V21.c.T b/org.glite.lb.server/src/lb_xml_parse_V21.c.T index 259453a..1d351d5 100644 --- a/org.glite.lb.server/src/lb_xml_parse_V21.c.T +++ b/org.glite.lb.server/src/lb_xml_parse_V21.c.T @@ -8,15 +8,11 @@ #include "glite/wmsutils/jobid/cjobid.h" -#include "glite/lb/consumer.h" #include "glite/lb/escape.h" #include "glite/lb/context-int.h" #include "glite/lb/trio.h" #include "glite/lb/xml_conversions.h" -#include "glite/lb/purge.h" -#include "glite/lb/dump.h" - #include "lb_xml_parse_V21.h" #ifdef __GNUC__ diff --git a/org.glite.lb.server/src/lb_xml_parse_V21.h b/org.glite.lb.server/src/lb_xml_parse_V21.h index ea731dc..0ffb29e 100644 --- a/org.glite.lb.server/src/lb_xml_parse_V21.h +++ b/org.glite.lb.server/src/lb_xml_parse_V21.h @@ -1,9 +1,11 @@ -#ifndef _LB_XML_PARSE_H_V21 -#define _LB_XML_PARSE_H_V21 +#ifndef __GLITE_LB_LB_XML_PARSE_V21_H__ +#define __GLITE_LB_LB_XML_PARSE_V21_H__ #ident "$Header$" -#include "glite/lb/consumer.h" +#include "glite/lb/context.h" +#include "glite/lb/jobstat.h" +#include "glite/lb/query_rec.h" /* function for parsing/unparsing XML requests from client */ @@ -18,4 +20,4 @@ int edg_wll_UserJobsToXMLV21(edg_wll_Context, edg_wlc_JobId *, char **); int edg_wll_PurgeResultToXMLV21(edg_wll_Context ctx, edg_wll_PurgeResult *result, char **message); int edg_wll_DumpResultToXMLV21(edg_wll_Context ctx, edg_wll_DumpResult *result, char **message); -#endif +#endif /* __GLITE_LB_LB_XML_PARSE_V21_H__ */ diff --git a/org.glite.lb.server/src/load.c b/org.glite.lb.server/src/load.c index f1610c1..9db226f 100644 --- a/org.glite.lb.server/src/load.c +++ b/org.glite.lb.server/src/load.c @@ -16,11 +16,7 @@ #include "glite/lb/context-int.h" #include "glite/lb/events_parse.h" #include "glite/lb/ulm_parse.h" -#include "glite/lb/purge.h" -#include "glite/lb/purge.h" #include "glite/lb/events.h" -#include "glite/lb/dump.h" -#include "glite/lb/load.h" #include "store.h" #include "purge.h" diff --git a/org.glite.lb.server/src/lock.h b/org.glite.lb.server/src/lock.h index b330177..1d2318a 100644 --- a/org.glite.lb.server/src/lock.h +++ b/org.glite.lb.server/src/lock.h @@ -1,5 +1,14 @@ +#ifndef __GLITE_LB_LOCK_H__ +#define __GLITE_LB_LOCK_H__ + +#ident "$Header$" + +#include "glite/lb/context.h" + #define edg_wll_LockJob(ctx,job) edg_wll_LockUnlockJob((ctx),(job),-1) #define edg_wll_UnlockJob(ctx,job) edg_wll_LockUnlockJob((ctx),(job),1) int edg_wll_LockUnlockJob(const edg_wll_Context,const edg_wlc_JobId,int); int edg_wll_JobSemaphore(const edg_wll_Context ctx, const edg_wlc_JobId job); + +#endif /* __GLITE_LB_LOCK_H__ */ diff --git a/org.glite.lb.server/src/notif_match.c b/org.glite.lb.server/src/notif_match.c index 7b23e73..1435e46 100644 --- a/org.glite.lb.server/src/notif_match.c +++ b/org.glite.lb.server/src/notif_match.c @@ -6,8 +6,6 @@ #include #include -#include "glite/lb/producer.h" -#include "glite/lb/consumer.h" #include "glite/lb/context-int.h" #include "glite/lb/trio.h" diff --git a/org.glite.lb.server/src/notification.c b/org.glite.lb.server/src/notification.c index 18d6287..6328e1f 100644 --- a/org.glite.lb.server/src/notification.c +++ b/org.glite.lb.server/src/notification.c @@ -9,7 +9,7 @@ #include "glite/lb/trio.h" #include "glite/lb/context-int.h" #include "glite/lb/xml_parse.h" -#include "glite/lb/notification.h" + #include "il_notification.h" #include "lbs_db.h" #include "query.h" diff --git a/org.glite.lb.server/src/openserver.c b/org.glite.lb.server/src/openserver.c index 44c7854..215418f 100644 --- a/org.glite.lb.server/src/openserver.c +++ b/org.glite.lb.server/src/openserver.c @@ -1,8 +1,5 @@ #ident "$Header$" -#include - -#include "glite/lb/consumer.h" #include "glite/lb/context-int.h" #include "lbs_db.h" diff --git a/org.glite.lb.server/src/process_event.c b/org.glite.lb.server/src/process_event.c index 1bce002..9369c03 100644 --- a/org.glite.lb.server/src/process_event.c +++ b/org.glite.lb.server/src/process_event.c @@ -7,7 +7,6 @@ #include #include -#include "glite/lb/producer.h" #include "glite/lb/context-int.h" #include "jobstat.h" diff --git a/org.glite.lb.server/src/process_event_condor.c b/org.glite.lb.server/src/process_event_condor.c index e884205..439d221 100644 --- a/org.glite.lb.server/src/process_event_condor.c +++ b/org.glite.lb.server/src/process_event_condor.c @@ -7,7 +7,6 @@ #include #include -#include "glite/lb/producer.h" #include "glite/lb/context-int.h" #include "jobstat.h" diff --git a/org.glite.lb.server/src/process_event_pbs.c b/org.glite.lb.server/src/process_event_pbs.c index 64c69d7..bc21175 100644 --- a/org.glite.lb.server/src/process_event_pbs.c +++ b/org.glite.lb.server/src/process_event_pbs.c @@ -7,7 +7,6 @@ #include #include -#include "glite/lb/producer.h" #include "glite/lb/context-int.h" #include "jobstat.h" diff --git a/org.glite.lb.server/src/purge.h b/org.glite.lb.server/src/purge.h index 91adb03..2904927 100644 --- a/org.glite.lb.server/src/purge.h +++ b/org.glite.lb.server/src/purge.h @@ -1,5 +1,9 @@ -#ifndef __EDG_WORKLOAD_LOGGING_COMMON_PURGE_H__ -#define __EDG_WORKLOAD_LOGGING_COMMON_PURGE_H__ +#ifndef __GLITE_LB_PURGE_H__ +#define __GLITE_LB_PURGE_H__ + +#ident "$Header" + +#include "glite/lb/context.h" /** Server side implementation * besides output to the SSL stream (in the context) it may produce @@ -54,4 +58,4 @@ extern int edg_wll_CreateFileStorage( #define edg_wll_CreateDumpFile(ctx, f) edg_wll_CreateFileStorage(ctx,FILE_TYPE_DUMP,NULL,f) #define edg_wll_CreatePurgeFile(ctx, f) edg_wll_CreateFileStorage(ctx,FILE_TYPE_PURGE,NULL,f) -#endif +#endif /* __GLITE_LB_PURGE_H__ */ diff --git a/org.glite.lb.server/src/query.c b/org.glite.lb.server/src/query.c index b07b9de..a583cca 100644 --- a/org.glite.lb.server/src/query.c +++ b/org.glite.lb.server/src/query.c @@ -11,8 +11,6 @@ #include "glite/wmsutils/jobid/strmd5.h" -#include "glite/lb/consumer.h" -#include "glite/lb/producer.h" #include "glite/lb/context-int.h" #include "glite/lb/trio.h" #include "glite/lb/xml_conversions.h" diff --git a/org.glite.lb.server/src/query.h b/org.glite.lb.server/src/query.h index fe9c9e8..46419de 100644 --- a/org.glite.lb.server/src/query.h +++ b/org.glite.lb.server/src/query.h @@ -1,5 +1,17 @@ +#ifndef __GLITE_LB_SERVER_QUERY_H__ +#define __GLITE_LB_SERVER_QUERY_H__ + +#ident "$Header$" + +#include "glite/lb/context.h" +#include "glite/lb/events.h" +#include "glite/lb/jobstat.h" +#include "glite/lb/query_rec.h" + int convert_event_head(edg_wll_Context,char **,edg_wll_Event *); int check_strict_jobid(edg_wll_Context, const edg_wlc_JobId); int match_status(edg_wll_Context, const edg_wll_JobStat *stat,const edg_wll_QueryRec **conditions); #define NOTIF_ALL_JOBS "all_jobs" + +#endif /* __GLITE_LB_SERVER_QUERY_H__ */ diff --git a/org.glite.lb.server/src/server_state.h b/org.glite.lb.server/src/server_state.h index 029fb7c..f661b84 100644 --- a/org.glite.lb.server/src/server_state.h +++ b/org.glite.lb.server/src/server_state.h @@ -1,10 +1,12 @@ -#ifndef _EDG_WORKLOAD_LOGGING_LBSERVER_H_ -#define EDG_WLL_STATE_DUMP_START "StartDump" -#define EDG_WLL_STATE_DUMP_END "EndDump" +#ifndef __GLITE_LB_SERVER_STATE_H__ +#define __GLITE_LB_SERVER_STATE_H__ #ident "$Header$" +#define EDG_WLL_STATE_DUMP_START "StartDump" +#define EDG_WLL_STATE_DUMP_END "EndDump" + int edg_wll_GetServerState(edg_wll_Context,const char *,char **); int edg_wll_SetServerState(edg_wll_Context,const char *,const char *); -#endif +#endif /* __GLITE_LB_SERVER_STATE_H__ */ diff --git a/org.glite.lb.server/src/srv_purge.c b/org.glite.lb.server/src/srv_purge.c index 5efad98..f0a00c0 100644 --- a/org.glite.lb.server/src/srv_purge.c +++ b/org.glite.lb.server/src/srv_purge.c @@ -25,9 +25,6 @@ #include "lbs_db.h" #include "query.h" #include "get_events.h" -#include "glite/lb/purge.h" -#include "glite/lb/load.h" -#include "glite/lb/dump.h" #include "purge.h" #include "lb_xml_parse.h" diff --git a/org.glite.lb.server/src/stats.h b/org.glite.lb.server/src/stats.h index dc869d3..a32c738 100644 --- a/org.glite.lb.server/src/stats.h +++ b/org.glite.lb.server/src/stats.h @@ -1,5 +1,12 @@ -#ifndef __EDG_WORKLOAD_LOGGING_LBSERVER_STATS_H__ -#define __EDG_WORKLOAD_LOGGING_LBSERVER_STATS_H__ +#ifndef __GLITE_LB_STATS_H__ +#define __GLITE_LB_STATS_H__ + +#ident "$Header$" + +#include "glite/lb/context.h" +#include "glite/lb/events.h" +#include "glite/lb/jobstat.h" +#include "glite/lb/query_rec.h" int edg_wll_InitStatistics(edg_wll_Context); @@ -67,4 +74,4 @@ int edg_wll_StateDurationServer( int *res_to ); -#endif +#endif /* __GLITE_LB_STATS_H__ */ diff --git a/org.glite.lb.server/src/store.c.T b/org.glite.lb.server/src/store.c.T index 28f32c6..03cbf84 100644 --- a/org.glite.lb.server/src/store.c.T +++ b/org.glite.lb.server/src/store.c.T @@ -23,7 +23,6 @@ #include "glite/lb/events_parse.h" #include "glite/lb/context-int.h" -#include "glite/lb/producer.h" #include "glite/lb/log_proto.h" /* for EDG_WLL_LOG_USER_DEFAULT */ #include "glite/lb/trio.h" diff --git a/org.glite.lb.server/src/write2rgma.c b/org.glite.lb.server/src/write2rgma.c index 7b4a60e..f5aae86 100755 --- a/org.glite.lb.server/src/write2rgma.c +++ b/org.glite.lb.server/src/write2rgma.c @@ -14,7 +14,6 @@ #include #include "glite/lb/trio.h" -#include "glite/lb/producer.h" #include "glite/lb/context-int.h" #include "glite/lb/jobstat.h" diff --git a/org.glite.lb.server/src/ws_fault.h b/org.glite.lb.server/src/ws_fault.h index 70870cd..9120fca 100644 --- a/org.glite.lb.server/src/ws_fault.h +++ b/org.glite.lb.server/src/ws_fault.h @@ -1,7 +1,11 @@ -#ifndef __EDG_WORKLOAD_LOGGING_LBSERVER_WS_FAULT_H__ -#define __EDG_WORKLOAD_LOGGING_LBSERVER_WS_FAULT_H__ +#ifndef __GLITE_LB_WS_FAULT_H__ +#define __GLITE_LB_WS_FAULT_H__ + +#ident "$Header$" + +#include "glite/lb/context.h" extern void edg_wll_ErrToFault(const edg_wll_Context, struct soap *); extern void edg_wll_FaultToErr(const struct soap *, edg_wll_Context); -#endif /* __EDG_WORKLOAD_LOGGING_LBSERVER_WS_FAULT_H__ */ +#endif /* __GLITE_LB_WS_FAULT_H__ */ diff --git a/org.glite.lb.server/src/ws_query.c b/org.glite.lb.server/src/ws_query.c index 10fd245..bc65f9a 100644 --- a/org.glite.lb.server/src/ws_query.c +++ b/org.glite.lb.server/src/ws_query.c @@ -2,7 +2,6 @@ #include #include "glite/lb/context-int.h" -#include "glite/lb/consumer.h" #include "glite/lb/xml_parse.h" #include "glite/lb/xml_conversions.h" diff --git a/org.glite.lb.server/src/ws_typemap.h b/org.glite.lb.server/src/ws_typemap.h index 6ea2d81..06679f9 100644 --- a/org.glite.lb.server/src/ws_typemap.h +++ b/org.glite.lb.server/src/ws_typemap.h @@ -1,3 +1,8 @@ +#ifndef __GLITE_LB_WS_TYPEMAP_H__ +#define __GLITE_LB_WS_TYPEMAP_H__ + +#ident "$Header" + #if GSOAP_VERSION >= 20700 #define JOBID lbt__queryAttr__JOBID @@ -60,3 +65,5 @@ #define LBServer lbt__eventSource__LBServer #endif + +#endif /* __GLITE_LB_WS_TYPEMAP_H__ */ diff --git a/org.glite.lb.server/src/ws_typeref.c.T b/org.glite.lb.server/src/ws_typeref.c.T index b9fb90c..be0ba23 100644 --- a/org.glite.lb.server/src/ws_typeref.c.T +++ b/org.glite.lb.server/src/ws_typeref.c.T @@ -7,7 +7,8 @@ #include "bk_ws_H.h" #include "ws_typemap.h" -#include "glite/lb/consumer.h" +#include "glite/lb/events.h" +#include "glite/lb/query_rec.h" /* XXX: references only, src and dest share pointers */ #include "glite/security/glite_gscompat.h" diff --git a/org.glite.lb.server/src/ws_typeref.h b/org.glite.lb.server/src/ws_typeref.h index e91841b..2b8515c 100644 --- a/org.glite.lb.server/src/ws_typeref.h +++ b/org.glite.lb.server/src/ws_typeref.h @@ -1,5 +1,11 @@ -#ifndef __EDG_WORKLOAD_LOGGING_LBSERVER_WS_TYPEREF_H__ -#define __EDG_WORKLOAD_LOGGING_LBSERVER_WS_TYPEREF_H__ +#ifndef __GLITE_LB_WS_TYPEREF_H__ +#define __GLITE_LB_WS_TYPEREF_H__ + +#ident "$Header" + +#include "glite/lb/jobstat.h" +#include "glite/lb/query_rec.h" +#include "glite/lb/events.h" #ifdef __cplusplus extern "C" { @@ -85,4 +91,4 @@ extern void edg_wll_FreeSoapEvent(struct soap *, struct lbt__event *); } #endif -#endif /* __EDG_WORKLOAD_LOGGING_LBSERVER_WS_TYPEREF_H__ */ +#endif /* __GLITE_LB_WS_TYPEREF_H__ */ diff --git a/org.glite.lb.server/test/test_query_events.cpp b/org.glite.lb.server/test/test_query_events.cpp index 1bc7c74..76ab6bd 100644 --- a/org.glite.lb.server/test/test_query_events.cpp +++ b/org.glite.lb.server/test/test_query_events.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include "lbs_db.h" diff --git a/org.glite.lb.server/test/test_soap_conv.cpp b/org.glite.lb.server/test/test_soap_conv.cpp index 10770dd..c5f4337 100644 --- a/org.glite.lb.server/test/test_soap_conv.cpp +++ b/org.glite.lb.server/test/test_soap_conv.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include "bk_ws_H.h" #include "ws_typeref.h" diff --git a/org.glite.lb.server/test/test_xml.cpp.T b/org.glite.lb.server/test/test_xml.cpp.T index 3cfe623..9073970 100644 --- a/org.glite.lb.server/test/test_xml.cpp.T +++ b/org.glite.lb.server/test/test_xml.cpp.T @@ -6,7 +6,6 @@ #include -#include #include "lb_xml_parse.h" #include -- 1.8.2.3