From 24cbfdd22dbe4fe02b07debf97eb13131bd91520 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 26 Jan 2006 19:00:50 +0000 Subject: [PATCH] Various bugfixes Little rearange compiler flags Added jpis-client example (dummy XML loader for now just for sharing the code), full implementation of the client as is now would require gsoap 2.7.6b. :-( --- org.glite.jp.index/Makefile | 42 +++++++++++++++++++++++++--------- org.glite.jp.index/doc/client_conf.xsd | 1 - org.glite.jp.index/src/bones_server.c | 10 +++----- org.glite.jp.index/src/db_ops.c | 2 +- org.glite.jp.index/src/typemap.dat | 1 + 5 files changed, 36 insertions(+), 20 deletions(-) diff --git a/org.glite.jp.index/Makefile b/org.glite.jp.index/Makefile index ab2ac6b..10571c8 100644 --- a/org.glite.jp.index/Makefile +++ b/org.glite.jp.index/Makefile @@ -30,16 +30,16 @@ GLOBUS_LIBS:=-L${globus_prefix}/lib \ GLOBUS_CFLAGS:=-I${globus_prefix}/include/${nothrflavour} -CPPFLAGS:=-DDEBUG -D_GNU_SOURCE DEBUG:=-W -Wall -Wno-unused-parameter -Wno-unused-function -g -O0 +CPPFLAGS:=-DDEBUG -D_GNU_SOURCE -I. -I${top_srcdir}/interface -I${top_srcdir}/src -I${gsoap_prefix}/include -I${gsoap_prefix} -I${stagedir}/include ${GLOBUS_CFLAGS} -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql -I${gsoap_prefix}/include +CFLAGS:=${DEBUG} +LDFLAGS:=-L${stagedir}/lib dotless_soap_ver:=${shell echo ${gsoap_version} | tr -d . } GSOAPLIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_soap_ver}_${nothrflavour} gsoap_bin_prefix:=${shell if [ -x ${gsoap_prefix}/bin/soapcpp2 ]; then echo ${gsoap_prefix}/bin; else echo ${gsoap_prefix}; fi } -CFLAGS:=${CPPFLAGS} ${DEBUG} -I. -I${top_srcdir}/interface -I${top_srcdir}/src -I${gsoap_prefix}/include -I${gsoap_prefix} -I${stagedir}/include ${GLOBUS_CFLAGS} -I${mysql_prefix}/include -I${mysql_prefix}/include/mysql -LDFLAGS:=-L${stagedir}/lib LINK:=libtool --mode=link ${CC} ${LDFLAGS} LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} @@ -47,8 +47,10 @@ INSTALL:=libtool --mode=install install daemon:=glite-jp-indexd -example:=glite-jpis-test +# glite-jpis-client not compiled +examples:=glite-jpis-test is_prefix:=jpis_ +is_client_prefix:=jpis_client_ ps_prefix:=jpps_ SRCS:= conf.c bones_server.c soap_ops.c soap_ps_calls.c \ @@ -56,10 +58,14 @@ SRCS:= conf.c bones_server.c soap_ops.c soap_ps_calls.c \ ${is_prefix}ServerLib.c \ ${ps_prefix}ClientLib.c ${ps_prefix}C.c \ -EXA_SRCS:=jpis-test.c ${is_prefix}C.c ${is_prefix}Client.c context.c db_ops.c conf.c +EXA_TEST_SRCS:=jpis-test.c ${is_prefix}C.c ${is_prefix}Client.c context.c db_ops.c conf.c +EXA_DB_SRCS:=jpis-db-internal.c db_ops.c conf.c context.c +EXA_CLIENT_SRCS:=jpis-client.c ${is_client_prefix}C.c OBJS:=${SRCS:.c=.o} -EXA_OBJS:=${EXA_SRCS:.c=.o} +EXA_TEST_OBJS:=${EXA_TEST_SRCS:.c=.o} +EXA_DB_OBJS:=${EXA_DB_SRCS:.c=.o} +EXA_CLIENT_OBJS:=${EXA_CLIENT_SRCS:.c=.o} COMMONLIB:=-lglite_jp_common @@ -69,17 +75,20 @@ TRIOLIB:=-lglite_jp_trio default all: compile -compile: ${daemon} ${example} +compile: ${daemon} ${examples} ${daemon}: ${OBJS} ${LINK} -o $@ -export-dynamic ${OBJS} ${BONESLIB} ${TRIOLIB} ${COMMONLIB} ${GSOAPLIB} ${GLOBUS_LIBS} ${SRVCOMMONLIB} -${example}: ${EXA_OBJS} - ${LINK} -o $@ ${EXA_OBJS} ${GSOAPLIB} ${GLOBUS_LIBS} ${COMMONLIB} ${TRIOLIB} ${SRVCOMMONLIB} +glite-jpis-test: ${EXA_TEST_OBJS} + ${LINK} -o $@ $+ ${GSOAPLIB} ${GLOBUS_LIBS} ${COMMONLIB} ${TRIOLIB} ${SRVCOMMONLIB} -jpis-db-internal: jpis-db-internal.o db_ops.o conf.o context.o +jpis-db-internal: ${EXA_DB_OBJS} ${LINK} -o $@ $+ ${COMMONLIB} ${SRVCOMMONLIB} ${GLOBUS_LIBS} +glite-jpis-client: ${EXA_CLIENT_OBJS} + ${LINK} -o $@ $+ ${GSOAPLIB} + JobProvenanceIS.xh: JobProvenanceIS.wsdl JobProvenanceTypes.wsdl typemap.dat cp ${stagedir}/interface/JobProvenanceTypes.wsdl . ${gsoap_bin_prefix}/wsdl2h -t ${top_srcdir}/src/typemap.dat -c -o $@ $< @@ -90,11 +99,21 @@ JobProvenancePS.xh: %.xh: %.wsdl JobProvenanceTypes.wsdl typemap.dat ${gsoap_bin_prefix}/wsdl2h -t ${top_srcdir}/src/typemap.dat -c -o $@ $< rm -f JobProvenanceTypes.wsdl +JobProvenanceISClient.xh: typemap.dat JobProvenanceISClient.xsd JobProvenanceIS.wsdl + cp ${stagedir}/interface/JobProvenance{Types.xsd,Types.wsdl,IS.wsdl} . + ${gsoap_bin_prefix}/wsdl2h -t ${top_srcdir}/src/typemap.dat -c -o $@ JobProvenanceIS.wsdl ${top_srcdir}/src/JobProvenanceISClient.xsd + rm -f JobProvenance{Types.xsd,Types.wsdl,IS.wsdl} + ${is_prefix}ClientLib.c ${is_prefix}Client.c \ ${is_prefix}Server.c ${is_prefix}ServerLib.c \ ${is_prefix}C.c ${is_prefix}H.h ${is_prefix}_Stub.h: JobProvenanceIS.xh ${gsoap_bin_prefix}/soapcpp2 -n -w -c -p ${is_prefix} JobProvenanceIS.xh +${is_client_prefix}ClientLib.c ${is_client_prefix}Client.c \ +${is_client_prefix}Server.c ${is_client_prefix}ServerLib.c \ +${is_client_prefix}C.c ${is_client_prefix}H.h ${is_client_prefix}_Stub.h: JobProvenanceISClient.xh + ${gsoap_bin_prefix}/soapcpp2 -n -w -c -p ${is_client_prefix} JobProvenanceISClient.xh + ${ps_prefix}Client.c ${ps_prefix}ClientLib.c \ ${ps_prefix}C.c ${ps_prefix}H.h ${ps_prefix}_Stub.h: JobProvenancePS.xh ${gsoap_bin_prefix}/soapcpp2 -n -w -c -p ${ps_prefix} JobProvenancePS.xh @@ -114,7 +133,7 @@ doc: stage: compile ${INSTALL} -m 755 ${daemon} ${stagedir}/bin - ${INSTALL} -m 755 ${example} ${stagedir}/bin + ${INSTALL} -m 755 ${examples} ${stagedir}/bin dist: distsrc distbin @@ -158,5 +177,6 @@ soap_ops.o: soap_ops.c jpis_H.h jpis_.nsmap soap_version.h db_ops.h ws_ps_typere ws_ps_typeref.o: ws_ps_typeref.c jpis_H.h ws_typemap.h ws_ps_typeref.h ws_is_typeref.o: ws_is_typeref.c jpis_H.h ws_typemap.h ws_is_typeref.h comon_server.o: common_server.c common_server.h +jpis-client.o: jpis-client.c ${is_client_prefix}H.h soap_version.h .PHONY: default all compile check doc stage dist distsrc distbin install clean diff --git a/org.glite.jp.index/doc/client_conf.xsd b/org.glite.jp.index/doc/client_conf.xsd index ac78900..4101567 100644 --- a/org.glite.jp.index/doc/client_conf.xsd +++ b/org.glite.jp.index/doc/client_conf.xsd @@ -18,7 +18,6 @@ elementFormDefault="qualified"> - diff --git a/org.glite.jp.index/src/bones_server.c b/org.glite.jp.index/src/bones_server.c index b71b4cd..299e041 100644 --- a/org.glite.jp.index/src/bones_server.c +++ b/org.glite.jp.index/src/bones_server.c @@ -317,11 +317,6 @@ int newconn(int conn,struct timeval *to,void *data) return 0; cleanup: -/* - - done in disconnect - glite_jpis_free_db(private->ctx); - glite_jpis_free_context(private->ctx); -*/ glite_gsplugin_free_context(plugin_ctx); soap_end(soap); @@ -385,8 +380,9 @@ static int disconn(int conn,struct timeval *to,void *data) slave_data_t *private = (slave_data_t *)data; struct soap *soap = private->soap; - glite_jpis_free_db(private->ctx); - glite_jpis_free_context(private->ctx); +// XXX: belongs to "data_init complement" +// glite_jpis_free_db(private->ctx); +// glite_jpis_free_context(private->ctx); soap_end(soap); // clean up everything and close socket return 0; diff --git a/org.glite.jp.index/src/db_ops.c b/org.glite.jp.index/src/db_ops.c index a965906..b7b5482 100644 --- a/org.glite.jp.index/src/db_ops.c +++ b/org.glite.jp.index/src/db_ops.c @@ -34,7 +34,7 @@ '%s',\n\ '%s',\n\ '%s',\n\ - '%d'\n\ + '%ld'\n\ )" #define INDEX_LENGTH 255 diff --git a/org.glite.jp.index/src/typemap.dat b/org.glite.jp.index/src/typemap.dat index 72f515f..e86b875 100644 --- a/org.glite.jp.index/src/typemap.dat +++ b/org.glite.jp.index/src/typemap.dat @@ -1,3 +1,4 @@ jpsrv = http://glite.org/wsdl/services/jp jptype = http://glite.org/wsdl/types/jp jpelem = http://glite.org/wsdl/elements/jp +jpisclient = http://glite.org/xsd/types/jpisclient -- 1.8.2.3