From 6f0a73c5d868dd18dae7c79e2761d87f9e237d8f Mon Sep 17 00:00:00 2001 From: hadaq Date: Mon, 10 Feb 2003 13:43:51 +0000 Subject: [PATCH] *** empty log message *** --- allParam/Makefile.am | 56 +++- allParam/Makefile.in | 367 +++++++++++++++++++++++--- allParam/ca/client/caParam.c | 62 ++++- allParam/configure | 19 +- allParam/configure.in | 19 +- allParam/ora/oraParam.pc | 493 ++++++++++++++++++++--------------- allParam/tcl/tclParam.c | 131 +++++++--- 7 files changed, 825 insertions(+), 322 deletions(-) diff --git a/allParam/Makefile.am b/allParam/Makefile.am index 9edf291..556d3ae 100644 --- a/allParam/Makefile.am +++ b/allParam/Makefile.am @@ -1,5 +1,7 @@ -VPATH = @srcdir@ @srcdir@/ca/client @srcdir@/ca/server @srcdir@/file \ - @srcdir@/ora @srcdir@/tcl +VPATH = @srcdir@ +VPATH += @srcdir@/ora + +SUFFIXES = .pc PROC=@PROC@ PROCFLAGS=@PROCFLAGS@ @@ -14,16 +16,46 @@ EXTRA_HEADERS = include/allParam.h bin_PROGRAMS = @PAS@ EXTRA_PROGRAMS = pas -lib_LIBRARIES = @LIBCAPARAM_A@ @LIBFILEPARAM_A@ @LIBORAPARAM_A@ @LIBTCLPARAM_A@ -EXTRA_LIBRARIES = libcaParam.a libfileParam.a liboraParam.a libtclParam.a +lib_LIBRARIES = @LIBCAPARAM_A@ +lib_LIBRARIES += @LIBFILEPARAM_A@ +lib_LIBRARIES += @LIBORAPARAM_A@ +lib_LIBRARIES += @LIBTCLPARAM_A@ + +EXTRA_LIBRARIES = libcaParam.a libcaParam_p.a +EXTRA_LIBRARIES += libfileParam.a libfileParam_p.a +EXTRA_LIBRARIES += liboraParam.a liboraParam_p.a +EXTRA_LIBRARIES += libtclParam.a libtclParam_p.a -libcaParam_a_SOURCES = caParam.c -libfileParam_a_SOURCES = fileParam.c +libcaParam_a_SOURCES = ca/client/caParam.c +libcaParam_p_a_SOURCES = ca/client/caParam.c +libfileParam_a_SOURCES = file/fileParam.c +libfileParam_p_a_SOURCES = file/fileParam.c liboraParam_a_SOURCES = oraParam.c -libtclParam_a_SOURCES = tclParam.c -pas_SOURCES = arrayDest.cc arrayDest.h paramBlobRecord.cc paramBlobRecord.h \ - paramFilenameRecord.cc paramFilenameRecord.h \ - paramIntRecord.cc paramIntRecord.h paramRecord.cc paramRecord.h \ - paramRecordSet.cc paramRecordSet.h paramStringRecord.cc paramStringRecord.h \ - record.cc record.h paramServer.cc +liboraParam_p_a_SOURCES = oraParam.c +libtclParam_a_SOURCES = tcl/tclParam.c +libtclParam_p_a_SOURCES = tcl/tclParam.c + +libcaParam_a_CFLAGS = +libcaParam_p_a_CFLAGS = -DPTHREADS +libfileParam_a_CFLAGS = +libfileParam_p_a_CFLAGS = -DPTHREADS +liboraParam_a_CFLAGS = +liboraParam_p_a_CFLAGS = -DPTHREADS +libtclParam_a_CFLAGS = +libtclParam_p_a_CFLAGS = -DPTHREADS + +pas_SOURCES = ca/server/arrayDest.cc +pas_SOURCES += ca/server/paramBlobRecord.cc +pas_SOURCES += ca/server/paramFilenameRecord.cc +pas_SOURCES += ca/server/paramIntRecord.cc +pas_SOURCES += ca/server/paramRecord.cc +pas_SOURCES += ca/server/paramRecordSet.cc +pas_SOURCES += ca/server/paramStringRecord.cc +pas_SOURCES += ca/server/record.cc +pas_SOURCES += ca/server/paramServer.cc + +EXTRA_BUILT_SOURCES_MY = oraParam.c + +clean-local: + rm -f $(EXTRA_BUILT_SOURCES_MY) diff --git a/allParam/Makefile.in b/allParam/Makefile.in index d203fb3..fbd2abd 100644 --- a/allParam/Makefile.in +++ b/allParam/Makefile.in @@ -64,9 +64,7 @@ host_triplet = @host@ EXEEXT = @EXEEXT@ OBJEXT = @OBJEXT@ PATH_SEPARATOR = @PATH_SEPARATOR@ -VPATH = @srcdir@ @srcdir@/ca/client @srcdir@/ca/server @srcdir@/file \ - @srcdir@/ora @srcdir@/tcl - +VPATH = @srcdir@ @srcdir@/ora ALLPARAM_H = @ALLPARAM_H@ AMTAR = @AMTAR@ AWK = @AWK@ @@ -92,6 +90,8 @@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ +SUFFIXES = .pc + include_HEADERS = @ALLPARAM_H@ EXTRA_HEADERS = include/allParam.h @@ -99,18 +99,30 @@ bin_PROGRAMS = @PAS@ EXTRA_PROGRAMS = pas lib_LIBRARIES = @LIBCAPARAM_A@ @LIBFILEPARAM_A@ @LIBORAPARAM_A@ @LIBTCLPARAM_A@ -EXTRA_LIBRARIES = libcaParam.a libfileParam.a liboraParam.a libtclParam.a -libcaParam_a_SOURCES = caParam.c -libfileParam_a_SOURCES = fileParam.c -liboraParam_a_SOURCES = oraParam.c -libtclParam_a_SOURCES = tclParam.c -pas_SOURCES = arrayDest.cc arrayDest.h paramBlobRecord.cc paramBlobRecord.h \ - paramFilenameRecord.cc paramFilenameRecord.h \ - paramIntRecord.cc paramIntRecord.h paramRecord.cc paramRecord.h \ - paramRecordSet.cc paramRecordSet.h paramStringRecord.cc paramStringRecord.h \ - record.cc record.h paramServer.cc +EXTRA_LIBRARIES = libcaParam.a libcaParam_p.a libfileParam.a libfileParam_p.a liboraParam.a liboraParam_p.a libtclParam.a libtclParam_p.a +libcaParam_a_SOURCES = ca/client/caParam.c +libcaParam_p_a_SOURCES = ca/client/caParam.c +libfileParam_a_SOURCES = file/fileParam.c +libfileParam_p_a_SOURCES = file/fileParam.c +liboraParam_a_SOURCES = oraParam.c +liboraParam_p_a_SOURCES = oraParam.c +libtclParam_a_SOURCES = tcl/tclParam.c +libtclParam_p_a_SOURCES = tcl/tclParam.c + +libcaParam_a_CFLAGS = +libcaParam_p_a_CFLAGS = -DPTHREADS +libfileParam_a_CFLAGS = +libfileParam_p_a_CFLAGS = -DPTHREADS +liboraParam_a_CFLAGS = +liboraParam_p_a_CFLAGS = -DPTHREADS +libtclParam_a_CFLAGS = +libtclParam_p_a_CFLAGS = -DPTHREADS + +pas_SOURCES = ca/server/arrayDest.cc ca/server/paramBlobRecord.cc ca/server/paramFilenameRecord.cc ca/server/paramIntRecord.cc ca/server/paramRecord.cc ca/server/paramRecordSet.cc ca/server/paramStringRecord.cc ca/server/record.cc ca/server/paramServer.cc + +EXTRA_BUILT_SOURCES_MY = oraParam.c subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs @@ -120,20 +132,36 @@ LIBRARIES = $(lib_LIBRARIES) libcaParam_a_AR = $(AR) cru libcaParam_a_LIBADD = -am_libcaParam_a_OBJECTS = caParam.$(OBJEXT) +am_libcaParam_a_OBJECTS = libcaParam_a-caParam.$(OBJEXT) libcaParam_a_OBJECTS = $(am_libcaParam_a_OBJECTS) +libcaParam_p_a_AR = $(AR) cru +libcaParam_p_a_LIBADD = +am_libcaParam_p_a_OBJECTS = libcaParam_p_a-caParam.$(OBJEXT) +libcaParam_p_a_OBJECTS = $(am_libcaParam_p_a_OBJECTS) libfileParam_a_AR = $(AR) cru libfileParam_a_LIBADD = -am_libfileParam_a_OBJECTS = fileParam.$(OBJEXT) +am_libfileParam_a_OBJECTS = libfileParam_a-fileParam.$(OBJEXT) libfileParam_a_OBJECTS = $(am_libfileParam_a_OBJECTS) +libfileParam_p_a_AR = $(AR) cru +libfileParam_p_a_LIBADD = +am_libfileParam_p_a_OBJECTS = libfileParam_p_a-fileParam.$(OBJEXT) +libfileParam_p_a_OBJECTS = $(am_libfileParam_p_a_OBJECTS) liboraParam_a_AR = $(AR) cru liboraParam_a_LIBADD = -am_liboraParam_a_OBJECTS = oraParam.$(OBJEXT) +am_liboraParam_a_OBJECTS = liboraParam_a-oraParam.$(OBJEXT) liboraParam_a_OBJECTS = $(am_liboraParam_a_OBJECTS) +liboraParam_p_a_AR = $(AR) cru +liboraParam_p_a_LIBADD = +am_liboraParam_p_a_OBJECTS = liboraParam_p_a-oraParam.$(OBJEXT) +liboraParam_p_a_OBJECTS = $(am_liboraParam_p_a_OBJECTS) libtclParam_a_AR = $(AR) cru libtclParam_a_LIBADD = -am_libtclParam_a_OBJECTS = tclParam.$(OBJEXT) +am_libtclParam_a_OBJECTS = libtclParam_a-tclParam.$(OBJEXT) libtclParam_a_OBJECTS = $(am_libtclParam_a_OBJECTS) +libtclParam_p_a_AR = $(AR) cru +libtclParam_p_a_LIBADD = +am_libtclParam_p_a_OBJECTS = libtclParam_p_a-tclParam.$(OBJEXT) +libtclParam_p_a_OBJECTS = $(am_libtclParam_p_a_OBJECTS) EXTRA_PROGRAMS = pas$(EXEEXT) bin_PROGRAMS = @PAS@ PROGRAMS = $(bin_PROGRAMS) @@ -155,8 +183,15 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/arrayDest.Po ./$(DEPDIR)/caParam.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/fileParam.Po ./$(DEPDIR)/oraParam.Po \ +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/arrayDest.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/libcaParam_a-caParam.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/libcaParam_p_a-caParam.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/libfileParam_a-fileParam.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/libfileParam_p_a-fileParam.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/liboraParam_a-oraParam.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/liboraParam_p_a-oraParam.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/libtclParam_a-tclParam.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/libtclParam_p_a-tclParam.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/paramBlobRecord.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/paramFilenameRecord.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/paramIntRecord.Po \ @@ -164,7 +199,7 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/paramRecordSet.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/paramServer.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/paramStringRecord.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/record.Po ./$(DEPDIR)/tclParam.Po +@AMDEP_TRUE@ ./$(DEPDIR)/record.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -176,23 +211,25 @@ CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(libcaParam_a_SOURCES) $(libfileParam_a_SOURCES) \ - $(liboraParam_a_SOURCES) $(libtclParam_a_SOURCES) \ +DIST_SOURCES = $(libcaParam_a_SOURCES) $(libcaParam_p_a_SOURCES) \ + $(libfileParam_a_SOURCES) $(libfileParam_p_a_SOURCES) \ + $(liboraParam_a_SOURCES) $(liboraParam_p_a_SOURCES) \ + $(libtclParam_a_SOURCES) $(libtclParam_p_a_SOURCES) \ $(pas_SOURCES) HEADERS = $(include_HEADERS) DIST_COMMON = README $(include_HEADERS) AUTHORS COPYING ChangeLog \ INSTALL Makefile.am Makefile.in NEWS aclocal.m4 config.h.in \ - config/config.guess config/config.sub config/depcomp \ - config/install-sh config/missing config/mkinstalldirs configure \ - configure.in -SOURCES = $(libcaParam_a_SOURCES) $(libfileParam_a_SOURCES) $(liboraParam_a_SOURCES) $(libtclParam_a_SOURCES) $(pas_SOURCES) + config/compile config/config.guess config/config.sub \ + config/depcomp config/install-sh config/missing \ + config/mkinstalldirs configure configure.in +SOURCES = $(libcaParam_a_SOURCES) $(libcaParam_p_a_SOURCES) $(libfileParam_a_SOURCES) $(libfileParam_p_a_SOURCES) $(liboraParam_a_SOURCES) $(liboraParam_p_a_SOURCES) $(libtclParam_a_SOURCES) $(libtclParam_p_a_SOURCES) $(pas_SOURCES) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .cc .o .obj .pc +.SUFFIXES: .pc .c .cc .o .obj am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno @@ -258,22 +295,46 @@ uninstall-libLIBRARIES: clean-libLIBRARIES: -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) +libcaParam_a-caParam.$(OBJEXT): ca/client/caParam.c libcaParam.a: $(libcaParam_a_OBJECTS) $(libcaParam_a_DEPENDENCIES) -rm -f libcaParam.a $(libcaParam_a_AR) libcaParam.a $(libcaParam_a_OBJECTS) $(libcaParam_a_LIBADD) $(RANLIB) libcaParam.a +libcaParam_p_a-caParam.$(OBJEXT): ca/client/caParam.c +libcaParam_p.a: $(libcaParam_p_a_OBJECTS) $(libcaParam_p_a_DEPENDENCIES) + -rm -f libcaParam_p.a + $(libcaParam_p_a_AR) libcaParam_p.a $(libcaParam_p_a_OBJECTS) $(libcaParam_p_a_LIBADD) + $(RANLIB) libcaParam_p.a +libfileParam_a-fileParam.$(OBJEXT): file/fileParam.c libfileParam.a: $(libfileParam_a_OBJECTS) $(libfileParam_a_DEPENDENCIES) -rm -f libfileParam.a $(libfileParam_a_AR) libfileParam.a $(libfileParam_a_OBJECTS) $(libfileParam_a_LIBADD) $(RANLIB) libfileParam.a +libfileParam_p_a-fileParam.$(OBJEXT): file/fileParam.c +libfileParam_p.a: $(libfileParam_p_a_OBJECTS) $(libfileParam_p_a_DEPENDENCIES) + -rm -f libfileParam_p.a + $(libfileParam_p_a_AR) libfileParam_p.a $(libfileParam_p_a_OBJECTS) $(libfileParam_p_a_LIBADD) + $(RANLIB) libfileParam_p.a +liboraParam_a-oraParam.$(OBJEXT): oraParam.c liboraParam.a: $(liboraParam_a_OBJECTS) $(liboraParam_a_DEPENDENCIES) -rm -f liboraParam.a $(liboraParam_a_AR) liboraParam.a $(liboraParam_a_OBJECTS) $(liboraParam_a_LIBADD) $(RANLIB) liboraParam.a +liboraParam_p_a-oraParam.$(OBJEXT): oraParam.c +liboraParam_p.a: $(liboraParam_p_a_OBJECTS) $(liboraParam_p_a_DEPENDENCIES) + -rm -f liboraParam_p.a + $(liboraParam_p_a_AR) liboraParam_p.a $(liboraParam_p_a_OBJECTS) $(liboraParam_p_a_LIBADD) + $(RANLIB) liboraParam_p.a +libtclParam_a-tclParam.$(OBJEXT): tcl/tclParam.c libtclParam.a: $(libtclParam_a_OBJECTS) $(libtclParam_a_DEPENDENCIES) -rm -f libtclParam.a $(libtclParam_a_AR) libtclParam.a $(libtclParam_a_OBJECTS) $(libtclParam_a_LIBADD) $(RANLIB) libtclParam.a +libtclParam_p_a-tclParam.$(OBJEXT): tcl/tclParam.c +libtclParam_p.a: $(libtclParam_p_a_OBJECTS) $(libtclParam_p_a_DEPENDENCIES) + -rm -f libtclParam_p.a + $(libtclParam_p_a_AR) libtclParam_p.a $(libtclParam_p_a_OBJECTS) $(libtclParam_p_a_LIBADD) + $(RANLIB) libtclParam_p.a binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @@ -298,6 +359,15 @@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +arrayDest.$(OBJEXT): ca/server/arrayDest.cc +paramBlobRecord.$(OBJEXT): ca/server/paramBlobRecord.cc +paramFilenameRecord.$(OBJEXT): ca/server/paramFilenameRecord.cc +paramIntRecord.$(OBJEXT): ca/server/paramIntRecord.cc +paramRecord.$(OBJEXT): ca/server/paramRecord.cc +paramRecordSet.$(OBJEXT): ca/server/paramRecordSet.cc +paramStringRecord.$(OBJEXT): ca/server/paramStringRecord.cc +record.$(OBJEXT): ca/server/record.cc +paramServer.$(OBJEXT): ca/server/paramServer.cc pas$(EXEEXT): $(pas_OBJECTS) $(pas_DEPENDENCIES) @rm -f pas$(EXEEXT) $(CXXLINK) $(pas_LDFLAGS) $(pas_OBJECTS) $(pas_LDADD) $(LIBS) @@ -309,9 +379,14 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arrayDest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caParam.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileParam.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oraParam.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcaParam_a-caParam.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcaParam_p_a-caParam.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfileParam_a-fileParam.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfileParam_p_a-fileParam.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboraParam_a-oraParam.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboraParam_p_a-oraParam.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtclParam_a-tclParam.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtclParam_p_a-tclParam.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paramBlobRecord.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paramFilenameRecord.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paramIntRecord.Po@am__quote@ @@ -320,7 +395,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paramServer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paramStringRecord.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/record.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tclParam.Po@am__quote@ distclean-depend: -rm -rf ./$(DEPDIR) @@ -336,6 +410,102 @@ distclean-depend: @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `cygpath -w $<` + +libcaParam_a-caParam.o: ca/client/caParam.c +@AMDEP_TRUE@ source='ca/client/caParam.c' object='libcaParam_a-caParam.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libcaParam_a-caParam.Po' tmpdepfile='$(DEPDIR)/libcaParam_a-caParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcaParam_a_CFLAGS) $(CFLAGS) -c -o libcaParam_a-caParam.o `test -f 'ca/client/caParam.c' || echo '$(srcdir)/'`ca/client/caParam.c + +libcaParam_a-caParam.obj: ca/client/caParam.c +@AMDEP_TRUE@ source='ca/client/caParam.c' object='libcaParam_a-caParam.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libcaParam_a-caParam.Po' tmpdepfile='$(DEPDIR)/libcaParam_a-caParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcaParam_a_CFLAGS) $(CFLAGS) -c -o libcaParam_a-caParam.obj `cygpath -w ca/client/caParam.c` + +libcaParam_p_a-caParam.o: ca/client/caParam.c +@AMDEP_TRUE@ source='ca/client/caParam.c' object='libcaParam_p_a-caParam.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libcaParam_p_a-caParam.Po' tmpdepfile='$(DEPDIR)/libcaParam_p_a-caParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcaParam_p_a_CFLAGS) $(CFLAGS) -c -o libcaParam_p_a-caParam.o `test -f 'ca/client/caParam.c' || echo '$(srcdir)/'`ca/client/caParam.c + +libcaParam_p_a-caParam.obj: ca/client/caParam.c +@AMDEP_TRUE@ source='ca/client/caParam.c' object='libcaParam_p_a-caParam.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libcaParam_p_a-caParam.Po' tmpdepfile='$(DEPDIR)/libcaParam_p_a-caParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcaParam_p_a_CFLAGS) $(CFLAGS) -c -o libcaParam_p_a-caParam.obj `cygpath -w ca/client/caParam.c` + +libfileParam_a-fileParam.o: file/fileParam.c +@AMDEP_TRUE@ source='file/fileParam.c' object='libfileParam_a-fileParam.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libfileParam_a-fileParam.Po' tmpdepfile='$(DEPDIR)/libfileParam_a-fileParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfileParam_a_CFLAGS) $(CFLAGS) -c -o libfileParam_a-fileParam.o `test -f 'file/fileParam.c' || echo '$(srcdir)/'`file/fileParam.c + +libfileParam_a-fileParam.obj: file/fileParam.c +@AMDEP_TRUE@ source='file/fileParam.c' object='libfileParam_a-fileParam.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libfileParam_a-fileParam.Po' tmpdepfile='$(DEPDIR)/libfileParam_a-fileParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfileParam_a_CFLAGS) $(CFLAGS) -c -o libfileParam_a-fileParam.obj `cygpath -w file/fileParam.c` + +libfileParam_p_a-fileParam.o: file/fileParam.c +@AMDEP_TRUE@ source='file/fileParam.c' object='libfileParam_p_a-fileParam.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libfileParam_p_a-fileParam.Po' tmpdepfile='$(DEPDIR)/libfileParam_p_a-fileParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfileParam_p_a_CFLAGS) $(CFLAGS) -c -o libfileParam_p_a-fileParam.o `test -f 'file/fileParam.c' || echo '$(srcdir)/'`file/fileParam.c + +libfileParam_p_a-fileParam.obj: file/fileParam.c +@AMDEP_TRUE@ source='file/fileParam.c' object='libfileParam_p_a-fileParam.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libfileParam_p_a-fileParam.Po' tmpdepfile='$(DEPDIR)/libfileParam_p_a-fileParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfileParam_p_a_CFLAGS) $(CFLAGS) -c -o libfileParam_p_a-fileParam.obj `cygpath -w file/fileParam.c` + +liboraParam_a-oraParam.o: oraParam.c +@AMDEP_TRUE@ source='oraParam.c' object='liboraParam_a-oraParam.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/liboraParam_a-oraParam.Po' tmpdepfile='$(DEPDIR)/liboraParam_a-oraParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboraParam_a_CFLAGS) $(CFLAGS) -c -o liboraParam_a-oraParam.o `test -f 'oraParam.c' || echo '$(srcdir)/'`oraParam.c + +liboraParam_a-oraParam.obj: oraParam.c +@AMDEP_TRUE@ source='oraParam.c' object='liboraParam_a-oraParam.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/liboraParam_a-oraParam.Po' tmpdepfile='$(DEPDIR)/liboraParam_a-oraParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboraParam_a_CFLAGS) $(CFLAGS) -c -o liboraParam_a-oraParam.obj `cygpath -w oraParam.c` + +liboraParam_p_a-oraParam.o: oraParam.c +@AMDEP_TRUE@ source='oraParam.c' object='liboraParam_p_a-oraParam.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/liboraParam_p_a-oraParam.Po' tmpdepfile='$(DEPDIR)/liboraParam_p_a-oraParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboraParam_p_a_CFLAGS) $(CFLAGS) -c -o liboraParam_p_a-oraParam.o `test -f 'oraParam.c' || echo '$(srcdir)/'`oraParam.c + +liboraParam_p_a-oraParam.obj: oraParam.c +@AMDEP_TRUE@ source='oraParam.c' object='liboraParam_p_a-oraParam.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/liboraParam_p_a-oraParam.Po' tmpdepfile='$(DEPDIR)/liboraParam_p_a-oraParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboraParam_p_a_CFLAGS) $(CFLAGS) -c -o liboraParam_p_a-oraParam.obj `cygpath -w oraParam.c` + +libtclParam_a-tclParam.o: tcl/tclParam.c +@AMDEP_TRUE@ source='tcl/tclParam.c' object='libtclParam_a-tclParam.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libtclParam_a-tclParam.Po' tmpdepfile='$(DEPDIR)/libtclParam_a-tclParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtclParam_a_CFLAGS) $(CFLAGS) -c -o libtclParam_a-tclParam.o `test -f 'tcl/tclParam.c' || echo '$(srcdir)/'`tcl/tclParam.c + +libtclParam_a-tclParam.obj: tcl/tclParam.c +@AMDEP_TRUE@ source='tcl/tclParam.c' object='libtclParam_a-tclParam.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libtclParam_a-tclParam.Po' tmpdepfile='$(DEPDIR)/libtclParam_a-tclParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtclParam_a_CFLAGS) $(CFLAGS) -c -o libtclParam_a-tclParam.obj `cygpath -w tcl/tclParam.c` + +libtclParam_p_a-tclParam.o: tcl/tclParam.c +@AMDEP_TRUE@ source='tcl/tclParam.c' object='libtclParam_p_a-tclParam.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libtclParam_p_a-tclParam.Po' tmpdepfile='$(DEPDIR)/libtclParam_p_a-tclParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtclParam_p_a_CFLAGS) $(CFLAGS) -c -o libtclParam_p_a-tclParam.o `test -f 'tcl/tclParam.c' || echo '$(srcdir)/'`tcl/tclParam.c + +libtclParam_p_a-tclParam.obj: tcl/tclParam.c +@AMDEP_TRUE@ source='tcl/tclParam.c' object='libtclParam_p_a-tclParam.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/libtclParam_p_a-tclParam.Po' tmpdepfile='$(DEPDIR)/libtclParam_p_a-tclParam.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtclParam_p_a_CFLAGS) $(CFLAGS) -c -o libtclParam_p_a-tclParam.obj `cygpath -w tcl/tclParam.c` CCDEPMODE = @CCDEPMODE@ .cc.o: @@ -349,6 +519,114 @@ CCDEPMODE = @CCDEPMODE@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(CXXCOMPILE) -c -o $@ `cygpath -w $<` + +arrayDest.o: ca/server/arrayDest.cc +@AMDEP_TRUE@ source='ca/server/arrayDest.cc' object='arrayDest.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/arrayDest.Po' tmpdepfile='$(DEPDIR)/arrayDest.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o arrayDest.o `test -f 'ca/server/arrayDest.cc' || echo '$(srcdir)/'`ca/server/arrayDest.cc + +arrayDest.obj: ca/server/arrayDest.cc +@AMDEP_TRUE@ source='ca/server/arrayDest.cc' object='arrayDest.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/arrayDest.Po' tmpdepfile='$(DEPDIR)/arrayDest.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o arrayDest.obj `cygpath -w ca/server/arrayDest.cc` + +paramBlobRecord.o: ca/server/paramBlobRecord.cc +@AMDEP_TRUE@ source='ca/server/paramBlobRecord.cc' object='paramBlobRecord.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramBlobRecord.Po' tmpdepfile='$(DEPDIR)/paramBlobRecord.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramBlobRecord.o `test -f 'ca/server/paramBlobRecord.cc' || echo '$(srcdir)/'`ca/server/paramBlobRecord.cc + +paramBlobRecord.obj: ca/server/paramBlobRecord.cc +@AMDEP_TRUE@ source='ca/server/paramBlobRecord.cc' object='paramBlobRecord.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramBlobRecord.Po' tmpdepfile='$(DEPDIR)/paramBlobRecord.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramBlobRecord.obj `cygpath -w ca/server/paramBlobRecord.cc` + +paramFilenameRecord.o: ca/server/paramFilenameRecord.cc +@AMDEP_TRUE@ source='ca/server/paramFilenameRecord.cc' object='paramFilenameRecord.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramFilenameRecord.Po' tmpdepfile='$(DEPDIR)/paramFilenameRecord.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramFilenameRecord.o `test -f 'ca/server/paramFilenameRecord.cc' || echo '$(srcdir)/'`ca/server/paramFilenameRecord.cc + +paramFilenameRecord.obj: ca/server/paramFilenameRecord.cc +@AMDEP_TRUE@ source='ca/server/paramFilenameRecord.cc' object='paramFilenameRecord.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramFilenameRecord.Po' tmpdepfile='$(DEPDIR)/paramFilenameRecord.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramFilenameRecord.obj `cygpath -w ca/server/paramFilenameRecord.cc` + +paramIntRecord.o: ca/server/paramIntRecord.cc +@AMDEP_TRUE@ source='ca/server/paramIntRecord.cc' object='paramIntRecord.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramIntRecord.Po' tmpdepfile='$(DEPDIR)/paramIntRecord.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramIntRecord.o `test -f 'ca/server/paramIntRecord.cc' || echo '$(srcdir)/'`ca/server/paramIntRecord.cc + +paramIntRecord.obj: ca/server/paramIntRecord.cc +@AMDEP_TRUE@ source='ca/server/paramIntRecord.cc' object='paramIntRecord.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramIntRecord.Po' tmpdepfile='$(DEPDIR)/paramIntRecord.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramIntRecord.obj `cygpath -w ca/server/paramIntRecord.cc` + +paramRecord.o: ca/server/paramRecord.cc +@AMDEP_TRUE@ source='ca/server/paramRecord.cc' object='paramRecord.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramRecord.Po' tmpdepfile='$(DEPDIR)/paramRecord.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramRecord.o `test -f 'ca/server/paramRecord.cc' || echo '$(srcdir)/'`ca/server/paramRecord.cc + +paramRecord.obj: ca/server/paramRecord.cc +@AMDEP_TRUE@ source='ca/server/paramRecord.cc' object='paramRecord.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramRecord.Po' tmpdepfile='$(DEPDIR)/paramRecord.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramRecord.obj `cygpath -w ca/server/paramRecord.cc` + +paramRecordSet.o: ca/server/paramRecordSet.cc +@AMDEP_TRUE@ source='ca/server/paramRecordSet.cc' object='paramRecordSet.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramRecordSet.Po' tmpdepfile='$(DEPDIR)/paramRecordSet.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramRecordSet.o `test -f 'ca/server/paramRecordSet.cc' || echo '$(srcdir)/'`ca/server/paramRecordSet.cc + +paramRecordSet.obj: ca/server/paramRecordSet.cc +@AMDEP_TRUE@ source='ca/server/paramRecordSet.cc' object='paramRecordSet.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramRecordSet.Po' tmpdepfile='$(DEPDIR)/paramRecordSet.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramRecordSet.obj `cygpath -w ca/server/paramRecordSet.cc` + +paramStringRecord.o: ca/server/paramStringRecord.cc +@AMDEP_TRUE@ source='ca/server/paramStringRecord.cc' object='paramStringRecord.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramStringRecord.Po' tmpdepfile='$(DEPDIR)/paramStringRecord.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramStringRecord.o `test -f 'ca/server/paramStringRecord.cc' || echo '$(srcdir)/'`ca/server/paramStringRecord.cc + +paramStringRecord.obj: ca/server/paramStringRecord.cc +@AMDEP_TRUE@ source='ca/server/paramStringRecord.cc' object='paramStringRecord.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramStringRecord.Po' tmpdepfile='$(DEPDIR)/paramStringRecord.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramStringRecord.obj `cygpath -w ca/server/paramStringRecord.cc` + +record.o: ca/server/record.cc +@AMDEP_TRUE@ source='ca/server/record.cc' object='record.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/record.Po' tmpdepfile='$(DEPDIR)/record.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o record.o `test -f 'ca/server/record.cc' || echo '$(srcdir)/'`ca/server/record.cc + +record.obj: ca/server/record.cc +@AMDEP_TRUE@ source='ca/server/record.cc' object='record.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/record.Po' tmpdepfile='$(DEPDIR)/record.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o record.obj `cygpath -w ca/server/record.cc` + +paramServer.o: ca/server/paramServer.cc +@AMDEP_TRUE@ source='ca/server/paramServer.cc' object='paramServer.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramServer.Po' tmpdepfile='$(DEPDIR)/paramServer.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramServer.o `test -f 'ca/server/paramServer.cc' || echo '$(srcdir)/'`ca/server/paramServer.cc + +paramServer.obj: ca/server/paramServer.cc +@AMDEP_TRUE@ source='ca/server/paramServer.cc' object='paramServer.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/paramServer.Po' tmpdepfile='$(DEPDIR)/paramServer.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o paramServer.obj `cygpath -w ca/server/paramServer.cc` CXXDEPMODE = @CXXDEPMODE@ uninstall-info-am: includeHEADERS_INSTALL = $(INSTALL_HEADER) @@ -527,7 +805,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \ +clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES clean-local \ mostlyclean-am distclean: distclean-am @@ -566,22 +844,25 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \ uninstall-info-am uninstall-libLIBRARIES .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libLIBRARIES dist dist-all dist-gzip \ - distcheck distclean distclean-compile distclean-depend \ - distclean-generic distclean-hdr distclean-tags distcleancheck \ - distdir dvi dvi-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-exec \ - install-exec-am install-includeHEADERS install-info \ - install-info-am install-libLIBRARIES install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic tags uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-includeHEADERS \ + clean-generic clean-libLIBRARIES clean-local dist dist-all \ + dist-gzip distcheck distclean distclean-compile \ + distclean-depend distclean-generic distclean-hdr distclean-tags \ + distcleancheck distdir dvi dvi-am info info-am install \ + install-am install-binPROGRAMS install-data install-data-am \ + install-exec install-exec-am install-includeHEADERS \ + install-info install-info-am install-libLIBRARIES install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic tags uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-includeHEADERS \ uninstall-info-am uninstall-libLIBRARIES .pc.c : $(PROC) $(PROCFLAGS) $(AM_PROCFLAGS) $(PROC_INCLUDES) iname=$< oname=$@ + +clean-local: + rm -f $(EXTRA_BUILT_SOURCES_MY) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/allParam/ca/client/caParam.c b/allParam/ca/client/caParam.c index 26c950b..a4743b7 100644 --- a/allParam/ca/client/caParam.c +++ b/allParam/ca/client/caParam.c @@ -1,4 +1,4 @@ -static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/client/caParam.c,v 1.24 2003-02-05 16:54:46 hadaq Exp $"; +static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/client/caParam.c,v 1.25 2003-02-10 13:43:52 hadaq Exp $"; #define _POSIX_C_SOURCE 199509L #if HAVE_CONFIG_H @@ -8,7 +8,9 @@ static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuild #include #include +#ifdef PTHREADS #include +#endif /* PTHREADS */ #include #include #include @@ -36,8 +38,10 @@ static int Param_storeStringCache(const Param *, const char *, const char *, con typedef struct CaParamS { Tcl_Interp *cache; +#ifdef PTHREADS pthread_mutex_t *cacheLock; pthread_mutex_t *socketLock; +#endif /* PTHREADS */ } CaParam; typedef struct ParamStringResultS { @@ -76,12 +80,15 @@ int conSetupParam(Param *my, const char *setup) int retVal = 0; int row = 0; int status = ECA_NORMAL; +#ifdef PTHREADS #if ( _POSIX_VERSION < 199506L ) int *attr; #endif +#endif /* PTHREADS */ my->strerror = NULL; my->specParam = malloc(sizeof(CaParam)); +#ifdef PTHREADS #if ( _POSIX_VERSION < 199506L ) ((CaParam *) (my->specParam))->cacheLock = malloc(sizeof(pthread_mutex_t)); pthread_mutexattr_create(attr); @@ -99,15 +106,18 @@ int conSetupParam(Param *my, const char *setup) ((CaParam *) (my->specParam))->socketLock = malloc(sizeof(pthread_mutex_t)); pthread_mutex_init(((CaParam *) (my->specParam))->socketLock, NULL); #endif +#endif /* PTHREADS */ ((CaParam *) (my->specParam))->cache = Tcl_CreateInterp(); if ((status = ca_task_initialize()) != ECA_NORMAL) { Param_strerror((Param *) my, ca_message(status)); +#ifdef PTHREADS pthread_mutex_destroy(((CaParam *) (my->specParam))->cacheLock); free(((CaParam *) (my->specParam))->cacheLock); pthread_mutex_destroy(((CaParam *) (my->specParam))->socketLock); free(((CaParam *) (my->specParam))->socketLock); +#endif /* PTHREADS */ my->basedir = NULL; retVal = -1; } else { @@ -141,11 +151,21 @@ void desParam(Param *my) { ca_task_exit(); - Tcl_DeleteInterp(((CaParam *) (my->specParam))->cache); +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((CaParam *) (my->specParam))->cacheLock)) { +#endif /* PTHREADS */ + Tcl_DeleteInterp(((CaParam *) (my->specParam))->cache); +#ifdef PTHREADS + pthread_mutex_unlock(((CaParam *) (my->specParam))->cacheLock); + } +#endif /* PTHREADS */ + +#ifdef PTHREADS pthread_mutex_destroy(((CaParam *) (my->specParam))->cacheLock); free(((CaParam *) (my->specParam))->cacheLock); pthread_mutex_destroy(((CaParam *) (my->specParam))->socketLock); free(((CaParam *) (my->specParam))->socketLock); +#endif /* PTHREADS */ free(my->basedir); if (my->setup != NULL) { free(my->setup); @@ -183,7 +203,9 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma pPVName = malloc((strlen("HAD:PI:") + (my->setup == NULL ? 0 : strlen(my->setup) + 1) + strlen(name) + 1 + strlen(idx) + 1) * sizeof(char)); Param_returnPVName(my, "PI", name, idx, pPVName); +#ifdef PTHREADS if (0 == pthread_mutex_lock(((CaParam *) (my->specParam))->socketLock)) { +#endif /* PTHREADS */ if ((status = ca_search(pPVName, &chan)) == ECA_GETFAIL) { Param_strerror((Param *) my, ca_message(status)); found = 0; @@ -219,8 +241,10 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma Param_strerror((Param *) my, ca_message(status)); } } +#ifdef PTHREADS pthread_mutex_unlock(((CaParam *) (my->specParam))->socketLock); } +#endif /* PTHREADS */ free(pPVName); if (maxrows == 1) { @@ -252,7 +276,9 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int pPVName = malloc((strlen("HAD:PS:") + (my->setup == NULL ? 0 : strlen(my->setup) + 1) + strlen(name) + 1 + strlen(idx) + 1) * sizeof(char)); Param_returnPVName(my, "PS", name, idx, pPVName); +#ifdef PTHREADS if (0 == pthread_mutex_lock(((CaParam *) (my->specParam))->socketLock)) { +#endif /* PTHREADS */ if ((status = ca_search(pPVName, &chan)) == ECA_GETFAIL) { Param_strerror((Param *) my, ca_message(status)); found = 0; @@ -289,8 +315,10 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int Param_strerror((Param *) my, ca_message(status)); } } +#ifdef PTHREADS pthread_mutex_unlock(((CaParam *) (my->specParam))->socketLock); } +#endif /* PTHREADS */ free(pPVName); @@ -324,7 +352,9 @@ int Param_getFilenameArray(const Param *my, const char *name, const char *idx, i pPVName = malloc((strlen("HAD:PS:") + (my->setup == NULL ? 0 : strlen(my->setup) + 1) + strlen(name) + 1 + strlen(idx) + 1) * sizeof(char)); Param_returnPVName(my, "PS", name, idx, pPVName); +#ifdef PTHREADS if (0 == pthread_mutex_lock(((CaParam *) (my->specParam))->socketLock)) { +#endif /* PTHREADS */ if ((status = ca_search(pPVName, &chan)) == ECA_GETFAIL) { Param_strerror((Param *) my, ca_message(status)); found = 0; @@ -375,8 +405,10 @@ int Param_getFilenameArray(const Param *my, const char *name, const char *idx, i Param_strerror((Param *) my, ca_message(status)); } } +#ifdef PTHREADS pthread_mutex_unlock(((CaParam *) (my->specParam))->socketLock); } +#endif /* PTHREADS */ free(pPVName); @@ -405,7 +437,9 @@ int Param_getBlob(const Param *my, const char *name, const char *idx, size_t *si pPVName = malloc((strlen("HAD:PB:") + (my->setup == NULL ? 0 : strlen(my->setup) + 1) + strlen(name) + 1 + strlen(idx) + 1) * sizeof(char)); Param_returnPVName(my, "PB", name, idx, pPVName); +#ifdef PTHREADS if (0 == pthread_mutex_lock(((CaParam *) (my->specParam))->socketLock)) { +#endif /* PTHREADS */ if ((status = ca_search(pPVName, &chan)) == ECA_GETFAIL) { Param_strerror((Param *) my, ca_message(status)); found = 0; @@ -446,8 +480,10 @@ int Param_getBlob(const Param *my, const char *name, const char *idx, size_t *si Param_strerror((Param *) my, ca_message(status)); } } +#ifdef PTHREADS pthread_mutex_unlock(((CaParam *) (my->specParam))->socketLock); } +#endif /* PTHREADS */ free(pPVName); @@ -465,7 +501,9 @@ int Param_storeInt(const Param *my, const char *name, const char *idx, unsigned pPVName = malloc((strlen("HAD:PI:") + (my->setup == NULL ? 0 : strlen(my->setup) + 1) + strlen(name) + 1 + strlen(idx) + 1) * sizeof(char)); Param_returnPVName(my, "PI", name, idx, pPVName); +#ifdef PTHREADS if (0 == pthread_mutex_lock(((CaParam *) (my->specParam))->socketLock)) { +#endif /* PTHREADS */ if ((status = ca_search(pPVName, &chan)) == ECA_GETFAIL) { Param_strerror((Param *) my, ca_message(status)); found = 0; @@ -497,8 +535,10 @@ int Param_storeInt(const Param *my, const char *name, const char *idx, unsigned Param_strerror((Param *) my, ca_message(status)); } } +#ifdef PTHREADS pthread_mutex_unlock(((CaParam *) (my->specParam))->socketLock); } +#endif /* PTHREADS */ free(pPVName); @@ -516,7 +556,9 @@ int Param_storeString(const Param *my, const char *name, const char *idx, const pPVName = malloc((strlen("HAD:PS:") + (my->setup == NULL ? 0 : strlen(my->setup) + 1) + strlen(name) + 1 + strlen(idx) + 1) * sizeof(char)); Param_returnPVName(my, "PS", name, idx, pPVName); +#ifdef PTHREADS if (0 == pthread_mutex_lock(((CaParam *) (my->specParam))->socketLock)) { +#endif /* PTHREADS */ if ((status = ca_search(pPVName, &chan)) == ECA_GETFAIL) { Param_strerror((Param *) my, ca_message(status)); found = 0; @@ -548,8 +590,10 @@ int Param_storeString(const Param *my, const char *name, const char *idx, const Param_strerror((Param *) my, ca_message(status)); } } +#ifdef PTHREADS pthread_mutex_unlock(((CaParam *) (my->specParam))->socketLock); } +#endif /* PTHREADS */ free(pPVName); @@ -558,11 +602,13 @@ int Param_storeString(const Param *my, const char *name, const char *idx, const void Param_clearCache(const Param *my) { +#ifdef PTHREADS if (0 == pthread_mutex_lock(((CaParam *) (my->specParam))->cacheLock)) { Tcl_DeleteInterp(((CaParam *) (my->specParam))->cache); ((CaParam *) (my->specParam))->cache = Tcl_CreateInterp(); pthread_mutex_unlock(((CaParam *) (my->specParam))->cacheLock); } +#endif /* PTHREADS */ } const char *Param_getErrStr(const Param *my) @@ -697,7 +743,9 @@ static int Param_getStringArrayCache(const Param *my, const char *name, const ch char lname[PARAM_MAX_NAME_LEN]; char lidx[PARAM_MAX_NAME_LEN]; +#ifdef PTHREADS if (0 == pthread_mutex_lock(((CaParam *) (my->specParam))->cacheLock)) { +#endif /* PTHREADS */ for(i = 0 ; i <=strlen(name) ; i++) { lname[i] = tolower(name[i]); } @@ -721,10 +769,12 @@ static int Param_getStringArrayCache(const Param *my, const char *name, const ch } } } +#ifdef PTHREADS pthread_mutex_unlock(((CaParam *) (my->specParam))->cacheLock); } else { retVal = -1; } +#endif /* PTHREADS */ return retVal; } @@ -732,10 +782,14 @@ static int Param_storeIntCache(const Param *my, const char *name, const char *id { char buf[7 + 2 * PARAM_MAX_NAME_LEN + PARAM_MAX_VALUE_LEN]; sprintf(buf, "set %s(%s)\t%lu\n", name, idx, value); +#ifdef PTHREADS if (0 == pthread_mutex_lock(((CaParam *) (my->specParam))->cacheLock)) { +#endif /* PTHREADS */ Tcl_Eval(((CaParam *) (my->specParam))->cache, buf); +#ifdef PTHREADS pthread_mutex_unlock(((CaParam *) (my->specParam))->cacheLock); } +#endif /* PTHREADS */ return 0; } @@ -743,10 +797,14 @@ static int Param_storeStringCache(const Param *my, const char *name, const char { char buf[7 + 2 * PARAM_MAX_NAME_LEN + PARAM_MAX_VALUE_LEN]; sprintf(buf, "set %s(%s)\t\"%s\"\n", name, idx, value); +#ifdef PTHREADS if (0 == pthread_mutex_lock(((CaParam *) (my->specParam))->cacheLock)) { +#endif /* PTHREADS */ Tcl_Eval(((CaParam *) (my->specParam))->cache, buf); +#ifdef PTHREADS pthread_mutex_unlock(((CaParam *) (my->specParam))->cacheLock); } +#endif /* PTHREADS */ return 0; } diff --git a/allParam/configure b/allParam/configure index e5ac02c..a46257d 100644 --- a/allParam/configure +++ b/allParam/configure @@ -1741,17 +1741,17 @@ then PAS="pas" ALLPARAM_H="" else - LIBCAPARAM_A="libcaParam.a" + LIBCAPARAM_A="libcaParam.a libcaParam_p.a" fi elif test "x$enable_param" = "xfile" then - LIBFILEPARAM_A="libfileParam.a" + LIBFILEPARAM_A="libfileParam.a libfileParam_p.a" elif test "x$enable_param" = "xora" then - LIBORAPARAM_A="liboraParam.a" + LIBORAPARAM_A="liboraParam.a liboraParam_p.a" elif test "x$enable_param" = "xtcl" then - LIBTCLPARAM_A="libtclParam.a" + LIBTCLPARAM_A="libtclParam.a libtclParam_p.a" fi @@ -3306,7 +3306,6 @@ echo "$as_me: error: Missing valid EPICS version" >&2;} fi -LIBS="-L/usr/local/lib -L$HOME/$host/lib $LIBS" if test "x$enable_server" = "xyes" then @@ -3594,10 +3593,10 @@ fi if test "x$epics_release" = "x313" then - LIBS="-L$with_epics/lib/$HOST_ARCH $LIBS" + LDFLAGS="-L$with_epics/lib/$HOST_ARCH $LDFLAGS" elif test "x$epics_release" = "x314" then - LIBS="-L$with_epics/lib/$EPICS_HOST_ARCH $LIBS" + LDFLAGS="-L$with_epics/lib/$EPICS_HOST_ARCH $LDFLAGS" fi echo "$as_me:$LINENO: checking for osiSleep in -lCom" >&5 @@ -3894,10 +3893,10 @@ if test "x$enable_paramsrc" = "xca" then if test "x$epics_release" = "x313" then - LIBS="-L$with_epics/lib/$HOST_ARCH $LIBS" + LDFLAGS="-L$with_epics/lib/$HOST_ARCH $LDFLAGS" elif test "x$epics_release" = "x314" then - LIBS="-L$with_epics/lib/$EPICS_HOST_ARCH $LIBS" + LDFLAGS="-L$with_epics/lib/$EPICS_HOST_ARCH $LDFLAGS" fi echo "$as_me:$LINENO: checking for osiSleep in -lCom" >&5 @@ -4165,7 +4164,7 @@ fi elif test "x$enable_paramsrc" = "xora" then - LIBS="-L$with_oracle/lib $LIBS" + LDFLAGS="-L$with_oracle/lib $LDFLAGS" echo "$as_me:$LINENO: checking for library containing sqlorat" >&5 echo $ECHO_N "checking for library containing sqlorat... $ECHO_C" >&6 if test "${ac_cv_search_sqlorat+set}" = set; then diff --git a/allParam/configure.in b/allParam/configure.in index 27da67f..b7d9368 100644 --- a/allParam/configure.in +++ b/allParam/configure.in @@ -40,17 +40,17 @@ then PAS="pas" ALLPARAM_H="" else - LIBCAPARAM_A="libcaParam.a" + LIBCAPARAM_A="libcaParam.a libcaParam_p.a" fi elif test "x$enable_param" = "xfile" then - LIBFILEPARAM_A="libfileParam.a" + LIBFILEPARAM_A="libfileParam.a libfileParam_p.a" elif test "x$enable_param" = "xora" then - LIBORAPARAM_A="liboraParam.a" + LIBORAPARAM_A="liboraParam.a liboraParam_p.a" elif test "x$enable_param" = "xtcl" then - LIBTCLPARAM_A="libtclParam.a" + LIBTCLPARAM_A="libtclParam.a libtclParam_p.a" fi AC_SUBST(PAS) @@ -112,7 +112,6 @@ fi dnl Checks for libraries. -LIBS="-L/usr/local/lib -L$HOME/$host/lib $LIBS" if test "x$enable_server" = "xyes" then AC_SEARCH_LIBS(getprotobyname, netinet) @@ -121,10 +120,10 @@ then if test "x$epics_release" = "x313" then - LIBS="-L$with_epics/lib/$HOST_ARCH $LIBS" + LDFLAGS="-L$with_epics/lib/$HOST_ARCH $LDFLAGS" elif test "x$epics_release" = "x314" then - LIBS="-L$with_epics/lib/$EPICS_HOST_ARCH $LIBS" + LDFLAGS="-L$with_epics/lib/$EPICS_HOST_ARCH $LDFLAGS" fi AC_CHECK_LIB(Com, osiSleep) AC_SEARCH_LIBS(ca_array_get, ca,,[LIBS="-lca $LIBS"]) @@ -139,10 +138,10 @@ if test "x$enable_paramsrc" = "xca" then if test "x$epics_release" = "x313" then - LIBS="-L$with_epics/lib/$HOST_ARCH $LIBS" + LDFLAGS="-L$with_epics/lib/$HOST_ARCH $LDFLAGS" elif test "x$epics_release" = "x314" then - LIBS="-L$with_epics/lib/$EPICS_HOST_ARCH $LIBS" + LDFLAGS="-L$with_epics/lib/$EPICS_HOST_ARCH $LDFLAGS" fi AC_CHECK_LIB(Com, osiSleep) AC_CHECK_LIB(ca, ca_array_get,,[LIBS="-lca $LIBS"]) @@ -152,7 +151,7 @@ then AC_CHECK_LIB(fileParam, conSetupParam) elif test "x$enable_paramsrc" = "xora" then - LIBS="-L$with_oracle/lib $LIBS" + LDFLAGS="-L$with_oracle/lib $LDFLAGS" AC_SEARCH_LIBS(sqlorat, clntsh) AC_SEARCH_LIBS(sqlcxt, clntsh) AC_CHECK_LIB(oraParam, conSetupParam) diff --git a/allParam/ora/oraParam.pc b/allParam/ora/oraParam.pc index 666c538..7680adb 100644 --- a/allParam/ora/oraParam.pc +++ b/allParam/ora/oraParam.pc @@ -1,4 +1,4 @@ -static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ora/oraParam.pc,v 1.30 2003-02-05 16:54:46 hadaq Exp $"; +static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ora/oraParam.pc,v 1.31 2003-02-10 13:43:52 hadaq Exp $"; #define _POSIX_C_SOURCE 199509L #if HAVE_CONFIG_H @@ -7,6 +7,9 @@ static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuild #include #include +#ifdef PTHREADS +#include +#endif /* PTHREADS */ #include #include #include @@ -25,6 +28,9 @@ static void Param_strerror(const Param *, const char *); typedef struct OraParamS { const char *user; const char *passwd; +#ifdef PTHREADS + pthread_mutex_t *dbLock; +#endif /* PTHREADS */ } OraParam; int conSetupParam(Param *my, const char *setup) @@ -47,10 +53,22 @@ int conSetupParam(Param *my, const char *setup) ((OraParam *) (my->specParam))->user = "daq_oper@db-hades.gsi.de"; ((OraParam *) (my->specParam))->passwd = "daqall"; +#ifdef PTHREADS + ((OraParam *) (my->specParam))->dbLock = malloc(sizeof(pthread_mutex_t)); + pthread_mutex_init(((OraParam *) (my->specParam))->dbLock, NULL); +#endif /* PTHREADS */ + un = ((OraParam *) (my->specParam))->user; pw = ((OraParam *) (my->specParam))->passwd; - EXEC SQL CONNECT :un IDENTIFIED BY :pw; +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((OraParam *) (my->specParam))->dbLock)) { +#endif /* PTHREADS */ + EXEC SQL CONNECT :un IDENTIFIED BY :pw; +#ifdef PTHREADS + pthread_mutex_unlock(((OraParam *) (my->specParam))->dbLock); + } +#endif /* PTHREADS */ my->basedir = malloc(PARAM_MAX_VALUE_LEN); uname(buffer); @@ -73,13 +91,23 @@ int conParam(Param *my) void desParam(Param *my) { - EXEC SQL COMMIT RELEASE; +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((OraParam *) (my->specParam))->dbLock)) { +#endif /* PTHREADS */ + EXEC SQL COMMIT RELEASE; +#ifdef PTHREADS + pthread_mutex_unlock(((OraParam *) (my->specParam))->dbLock); + } +#endif /* PTHREADS */ + +#ifdef PTHREADS + pthread_mutex_destroy(((OraParam *) (my->specParam))->dbLock); + free(((OraParam *) (my->specParam))->dbLock); +#endif /* PTHREADS */ free(my->specParam); free(my->basedir); - if(my->setup != NULL) { - free(my->setup); - } + free(my->setup); } int Param_getInt(const Param *my, const char *name, const char *idx, int *row, unsigned long int *val) @@ -128,71 +156,80 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma sqlidx[i] = tolower(idx[i]); } - if (my->setup != NULL) { - EXEC SQL EXECUTE - BEGIN - SELECT - valid, locked - INTO - :l_valid, :l_locked - FROM - daq.cache_table_valid - WHERE - cache_table = 'param_int_cache'; - IF - :l_valid = 0 AND :l_locked = 0 - THEN - daq.daq_oper_interface.validate_cache_table ( 'param_int_cache' ); - END IF; - END; - END-EXEC; - EXEC SQL SELECT - value - INTO - :value - FROM - daq.param_int_cache - WHERE - setup = :sqlsetup - AND - name = :sqlname - AND - idx = :sqlidx - ORDER BY - seq_num; - } else { - EXEC SQL EXECUTE - BEGIN - SELECT - valid, locked - INTO - :l_valid, :l_locked - FROM - daq.cache_table_valid - WHERE - cache_table = 'param_int_cache'; - IF - :l_valid = 0 AND :l_locked = 0 - THEN - daq.daq_oper_interface.validate_cache_table ( 'param_int_cache' ); - END IF; - END; - END-EXEC; - EXEC SQL SELECT - value - INTO - :value - FROM - daq.param_int_cache - WHERE - setup IS NULL - AND - name = :sqlname - AND - idx = :sqlidx - ORDER BY - seq_num; +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((OraParam *) (my->specParam))->dbLock)) { +#endif /* PTHREADS */ + + if (my->setup != NULL) { + EXEC SQL EXECUTE + BEGIN + SELECT + valid, locked + INTO + :l_valid, :l_locked + FROM + daq.cache_table_valid + WHERE + cache_table = 'param_int_cache'; + IF + :l_valid = 0 AND :l_locked = 0 + THEN + daq.daq_oper_interface.validate_cache_table ( 'param_int_cache' ); + END IF; + END; + END-EXEC; + EXEC SQL SELECT + value + INTO + :value + FROM + daq.param_int_cache + WHERE + setup = :sqlsetup + AND + name = :sqlname + AND + idx = :sqlidx + ORDER BY + seq_num; + } else { + EXEC SQL EXECUTE + BEGIN + SELECT + valid, locked + INTO + :l_valid, :l_locked + FROM + daq.cache_table_valid + WHERE + cache_table = 'param_int_cache'; + IF + :l_valid = 0 AND :l_locked = 0 + THEN + daq.daq_oper_interface.validate_cache_table ( 'param_int_cache' ); + END IF; + END; + END-EXEC; + EXEC SQL SELECT + value + INTO + :value + FROM + daq.param_int_cache + WHERE + setup IS NULL + AND + name = :sqlname + AND + idx = :sqlidx + ORDER BY + seq_num; + } + +#ifdef PTHREADS + pthread_mutex_unlock(((OraParam *) (my->specParam))->dbLock); } +#endif /* PTHREADS */ *rows = sqlca.sqlerrd[2]; @@ -238,71 +275,80 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int sqlidx[i] = tolower(idx[i]); } - if (my->setup != NULL) { - EXEC SQL EXECUTE - BEGIN - SELECT - valid, locked - INTO - :l_valid, :l_locked - FROM - daq.cache_table_valid - WHERE - cache_table = 'param_string_cache'; - IF - :l_valid = 0 AND :l_locked = 0 - THEN - daq.daq_oper_interface.validate_cache_table ( 'param_string_cache' ); - END IF; - END; - END-EXEC; - EXEC SQL SELECT - value - INTO - :value - FROM - daq.param_string_cache - WHERE - setup = :sqlsetup - AND - name = :sqlname - AND - idx = :sqlidx - ORDER BY - seq_num; - } else { - EXEC SQL EXECUTE - BEGIN - SELECT - valid, locked - INTO - :l_valid, :l_locked - FROM - daq.cache_table_valid - WHERE - cache_table = 'param_string_cache'; - IF - :l_valid = 0 AND :l_locked = 0 - THEN - daq.daq_oper_interface.validate_cache_table ( 'param_string_cache' ); - END IF; - END; - END-EXEC; - EXEC SQL SELECT - value - INTO - :value - FROM - daq.param_string_cache - WHERE - setup IS NULL - AND - name = :sqlname - AND - idx = :sqlidx - ORDER BY - seq_num; +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((OraParam *) (my->specParam))->dbLock)) { +#endif /* PTHREADS */ + + if (my->setup != NULL) { + EXEC SQL EXECUTE + BEGIN + SELECT + valid, locked + INTO + :l_valid, :l_locked + FROM + daq.cache_table_valid + WHERE + cache_table = 'param_string_cache'; + IF + :l_valid = 0 AND :l_locked = 0 + THEN + daq.daq_oper_interface.validate_cache_table ( 'param_string_cache' ); + END IF; + END; + END-EXEC; + EXEC SQL SELECT + value + INTO + :value + FROM + daq.param_string_cache + WHERE + setup = :sqlsetup + AND + name = :sqlname + AND + idx = :sqlidx + ORDER BY + seq_num; + } else { + EXEC SQL EXECUTE + BEGIN + SELECT + valid, locked + INTO + :l_valid, :l_locked + FROM + daq.cache_table_valid + WHERE + cache_table = 'param_string_cache'; + IF + :l_valid = 0 AND :l_locked = 0 + THEN + daq.daq_oper_interface.validate_cache_table ( 'param_string_cache' ); + END IF; + END; + END-EXEC; + EXEC SQL SELECT + value + INTO + :value + FROM + daq.param_string_cache + WHERE + setup IS NULL + AND + name = :sqlname + AND + idx = :sqlidx + ORDER BY + seq_num; + } + +#ifdef PTHREADS + pthread_mutex_unlock(((OraParam *) (my->specParam))->dbLock); } +#endif /* PTHREADS */ *rows = sqlca.sqlerrd[2]; @@ -311,71 +357,80 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int unsigned long int intvalue[PARAM_MAX_ARRAY_LEN]; EXEC SQL END DECLARE SECTION; - if (my->setup != NULL) { - EXEC SQL EXECUTE - BEGIN - SELECT - valid, locked - INTO - :l_valid, :l_locked - FROM - daq.cache_table_valid - WHERE - cache_table = 'param_int_cache'; - IF - :l_valid = 0 AND :l_locked = 0 - THEN - daq.daq_oper_interface.validate_cache_table ( 'param_int_cache' ); - END IF; - END; - END-EXEC; - EXEC SQL SELECT - value - INTO - :intvalue - FROM - daq.param_int_cache - WHERE - setup = :sqlsetup - AND - name = :sqlname - AND - idx = :sqlidx - ORDER BY - seq_num; - } else { - EXEC SQL EXECUTE - BEGIN - SELECT - valid, locked - INTO - :l_valid, :l_locked - FROM - daq.cache_table_valid - WHERE - cache_table = 'param_int_cache'; - IF - :l_valid = 0 AND :l_locked = 0 - THEN - daq.daq_oper_interface.validate_cache_table ( 'param_int_cache' ); - END IF; - END; - END-EXEC; - EXEC SQL SELECT - value - INTO - :intvalue - FROM - daq.param_int_cache - WHERE - setup IS NULL - AND - name = :sqlname - AND - idx = :sqlidx - ORDER BY - seq_num; +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((OraParam *) (my->specParam))->dbLock)) { +#endif /* PTHREADS */ + + if (my->setup != NULL) { + EXEC SQL EXECUTE + BEGIN + SELECT + valid, locked + INTO + :l_valid, :l_locked + FROM + daq.cache_table_valid + WHERE + cache_table = 'param_int_cache'; + IF + :l_valid = 0 AND :l_locked = 0 + THEN + daq.daq_oper_interface.validate_cache_table ( 'param_int_cache' ); + END IF; + END; + END-EXEC; + EXEC SQL SELECT + value + INTO + :intvalue + FROM + daq.param_int_cache + WHERE + setup = :sqlsetup + AND + name = :sqlname + AND + idx = :sqlidx + ORDER BY + seq_num; + } else { + EXEC SQL EXECUTE + BEGIN + SELECT + valid, locked + INTO + :l_valid, :l_locked + FROM + daq.cache_table_valid + WHERE + cache_table = 'param_int_cache'; + IF + :l_valid = 0 AND :l_locked = 0 + THEN + daq.daq_oper_interface.validate_cache_table ( 'param_int_cache' ); + END IF; + END; + END-EXEC; + EXEC SQL SELECT + value + INTO + :intvalue + FROM + daq.param_int_cache + WHERE + setup IS NULL + AND + name = :sqlname + AND + idx = :sqlidx + ORDER BY + seq_num; + } + +#ifdef PTHREADS + pthread_mutex_unlock(((OraParam *) (my->specParam))->dbLock); } +#endif /* PTHREADS */ *rows = sqlca.sqlerrd[2]; @@ -481,14 +536,23 @@ int Param_storeInt(const Param *my, const char *name, const char *idx, unsigned } value = val; +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((OraParam *) (my->specParam))->dbLock)) { +#endif /* PTHREADS */ - EXEC SQL EXECUTE - BEGIN - daq.daq_oper_interface.store_param_int ( :sqlsetup, :sqlname, :sqlidx, :value ); - END; - END-EXEC; + EXEC SQL EXECUTE + BEGIN + daq.daq_oper_interface.store_param_int ( :sqlsetup, :sqlname, :sqlidx, :value ); + END; + END-EXEC; + + EXEC SQL COMMIT; + +#ifdef PTHREADS + pthread_mutex_unlock(((OraParam *) (my->specParam))->dbLock); + } +#endif /* PTHREADS */ - EXEC SQL COMMIT; return 0; } @@ -521,14 +585,23 @@ int Param_storeString(const Param *my, const char *name, const char *idx, const } value = val; +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((OraParam *) (my->specParam))->dbLock)) { +#endif /* PTHREADS */ - EXEC SQL EXECUTE - BEGIN - daq.daq_oper_interface.store_param_string ( :sqlsetup, :sqlname, :sqlidx, :value ); - END; - END-EXEC; + EXEC SQL EXECUTE + BEGIN + daq.daq_oper_interface.store_param_string ( :sqlsetup, :sqlname, :sqlidx, :value ); + END; + END-EXEC; + + EXEC SQL COMMIT; + +#ifdef PTHREADS + pthread_mutex_unlock(((OraParam *) (my->specParam))->dbLock); + } +#endif /* PTHREADS */ - EXEC SQL COMMIT; return 0; } diff --git a/allParam/tcl/tclParam.c b/allParam/tcl/tclParam.c index 9e0c2e7..378a383 100644 --- a/allParam/tcl/tclParam.c +++ b/allParam/tcl/tclParam.c @@ -1,4 +1,4 @@ -static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/tcl/tclParam.c,v 1.27 2003-02-06 13:07:00 hadaq Exp $"; +static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/tcl/tclParam.c,v 1.28 2003-02-10 13:43:52 hadaq Exp $"; #define _POSIX_C_SOURCE 199509L #if HAVE_CONFIG_H @@ -9,6 +9,9 @@ static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuild #include #include +#ifdef PTHREADS +#include +#endif /* PTHREADS */ #include #include #include @@ -23,6 +26,9 @@ static void Param_strerror(Param *, const char *); typedef struct TclParamS { Tcl_Interp *interp; +#ifdef PTHREADS + pthread_mutex_t *interpLock; +#endif /* PTHREADS */ FILE *store; } TclParam; @@ -38,6 +44,11 @@ int conSetupParam(Param *my, const char *setup) my->strerror = NULL; my->specParam = malloc(sizeof(TclParam)); +#ifdef PTHREADS + ((TclParam *) (my->specParam))->interpLock = malloc(sizeof(pthread_mutex_t)); + pthread_mutex_init(((TclParam *) (my->specParam))->interpLock, NULL); +#endif /* PTHREADS */ + if (setup != NULL) { my->setup = malloc(strlen(setup) + 1); strcpy(my->setup, setup); @@ -49,16 +60,23 @@ int conSetupParam(Param *my, const char *setup) sprintf(paramFile, "%s_p.tcl", (my->setup == NULL) ? "default" : setup); sprintf(storageFile, "%s_s.tcl", (my->setup == NULL) ? "default" : setup); - ((TclParam *) (my->specParam))->interp = Tcl_CreateInterp(); - code = Tcl_EvalFile(((TclParam *) (my->specParam))->interp, paramFile); - if (code != TCL_OK) { - if (* ((TclParam *) (my->specParam))->interp->result != 0) { - Param_strerror(my, ((TclParam *) (my->specParam))->interp->result); - } else { - Param_strerror((Param *) my, "Tcl interpreter cannot read file correctly and does not deliver an error string."); +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((TclParam *) (my->specParam))->interpLock)) { +#endif /* PTHREADS */ + ((TclParam *) (my->specParam))->interp = Tcl_CreateInterp(); + code = Tcl_EvalFile(((TclParam *) (my->specParam))->interp, paramFile); + if (code != TCL_OK) { + if (* ((TclParam *) (my->specParam))->interp->result != 0) { + Param_strerror(my, ((TclParam *) (my->specParam))->interp->result); + } else { + Param_strerror((Param *) my, "Tcl interpreter cannot read file correctly and does not deliver an error string."); + } + retVal = -1; } - retVal = -1; +#ifdef PTHREADS + pthread_mutex_unlock(((TclParam *) (my->specParam))->interpLock); } +#endif /* PTHREADS */ if (NULL == (((TclParam *) (my->specParam))->store = fopen(storageFile, "a+"))) { retVal = -1; @@ -99,6 +117,11 @@ int conParam(Param *my) my->setup = NULL; my->specParam = malloc(sizeof(TclParam)); +#ifdef PTHREADS + ((TclParam *) (my->specParam))->interpLock = malloc(sizeof(pthread_mutex_t)); + pthread_mutex_init(((TclParam *) (my->specParam))->interpLock, NULL); +#endif /* PTHREADS */ + p = getenv("DAQSLOW_PARAM_FILE"); if (p == NULL) { p = "param.tcl"; @@ -113,16 +136,23 @@ int conParam(Param *my) storageFile = malloc(strlen(p) + 1); strcpy(storageFile, p); - ((TclParam *) (my->specParam))->interp = Tcl_CreateInterp(); - code = Tcl_EvalFile(((TclParam *) (my->specParam))->interp, paramFile); - if (code != TCL_OK) { - if (* ((TclParam *) (my->specParam))->interp->result != 0) { - Param_strerror(my, ((TclParam *) (my->specParam))->interp->result); - } else { - Param_strerror((Param *) my, "Tcl interpreter cannot read file correctly and does not deliver an error string."); +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((TclParam *) (my->specParam))->interpLock)) { +#endif /* PTHREADS */ + ((TclParam *) (my->specParam))->interp = Tcl_CreateInterp(); + code = Tcl_EvalFile(((TclParam *) (my->specParam))->interp, paramFile); + if (code != TCL_OK) { + if (* ((TclParam *) (my->specParam))->interp->result != 0) { + Param_strerror(my, ((TclParam *) (my->specParam))->interp->result); + } else { + Param_strerror((Param *) my, "Tcl interpreter cannot read file correctly and does not deliver an error string."); + } + retVal = -1; } - retVal = -1; +#ifdef PTHREADS + pthread_mutex_unlock(((TclParam *) (my->specParam))->interpLock); } +#endif /* PTHREADS */ if (NULL == (((TclParam *) (my->specParam))->store = fopen(storageFile, "a+"))) { return -1; @@ -151,14 +181,24 @@ int conParam(Param *my) void desParam(Param *my) { - Tcl_DeleteInterp(((TclParam *) (my->specParam))->interp); +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((TclParam *) (my->specParam))->interpLock)) { +#endif /* PTHREADS */ + Tcl_DeleteInterp(((TclParam *) (my->specParam))->interp); +#ifdef PTHREADS + pthread_mutex_unlock(((TclParam *) (my->specParam))->interpLock); + } +#endif /* PTHREADS */ fclose(((TclParam *) (my->specParam))->store); +#ifdef PTHREADS + pthread_mutex_destroy(((TclParam *) (my->specParam))->interpLock); + free(((TclParam *) (my->specParam))->interpLock); +#endif /* PTHREADS */ + free((TclParam *) (my->specParam)); free(my->basedir); - if(my->setup != NULL) { - free(my->setup); - } + free(my->setup); } int Param_getInt(const Param *my, const char *name, const char *idx, int *row, unsigned long int *val) @@ -233,21 +273,28 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int } *rows = 0; - if(Tcl_GetVar2(((TclParam *) (my->specParam))->interp, lname, lidx, 0) != 0) { - strcpy(val[0], Tcl_GetVar2(((TclParam *) (my->specParam))->interp, lname, lidx, 0)); - *rows = 1; - } else { - char index[PARAM_MAX_NAME_LEN]; - for (i = 0 ; i < maxrows ; i++) { - sprintf(index,"%s%d", lidx, i); - if(Tcl_GetVar2(((TclParam *) (my->specParam))->interp, lname, index, 0) != 0) { - strcpy(val[i], Tcl_GetVar2(((TclParam *) (my->specParam))->interp, lname, index, 0)); - (*rows)++; - } else { - i = maxrows; +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((TclParam *) (my->specParam))->interpLock)) { +#endif /* PTHREADS */ + if(Tcl_GetVar2(((TclParam *) (my->specParam))->interp, lname, lidx, 0) != 0) { + strcpy(val[0], Tcl_GetVar2(((TclParam *) (my->specParam))->interp, lname, lidx, 0)); + *rows = 1; + } else { + char index[PARAM_MAX_NAME_LEN]; + for (i = 0 ; i < maxrows ; i++) { + sprintf(index,"%s%d", lidx, i); + if(Tcl_GetVar2(((TclParam *) (my->specParam))->interp, lname, index, 0) != 0) { + strcpy(val[i], Tcl_GetVar2(((TclParam *) (my->specParam))->interp, lname, index, 0)); + (*rows)++; + } else { + i = maxrows; + } } } +#ifdef PTHREADS + pthread_mutex_unlock(((TclParam *) (my->specParam))->interpLock); } +#endif /* PTHREADS */ return retVal; } @@ -308,7 +355,14 @@ int Param_storeInt(const Param *my, const char *name, const char *idx, unsigned sprintf(buf, "set %s(%s)\t%lu\n", name, idx, value); fprintf(((TclParam *) (my->specParam))->store, buf); fflush(((TclParam *) (my->specParam))->store); - Tcl_Eval(((TclParam *) (my->specParam))->interp, buf); +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((TclParam *) (my->specParam))->interpLock)) { +#endif /* PTHREADS */ + Tcl_Eval(((TclParam *) (my->specParam))->interp, buf); +#ifdef PTHREADS + pthread_mutex_unlock(((TclParam *) (my->specParam))->interpLock); + } +#endif /* PTHREADS */ return 0; } @@ -318,7 +372,14 @@ int Param_storeString(const Param *my, const char *name, const char *idx, const sprintf(buf, "set %s(%s)\t\"%s\"\n", name, idx, value); fprintf(((TclParam *) (my->specParam))->store, buf); fflush(((TclParam *) (my->specParam))->store); - Tcl_Eval(((TclParam *) (my->specParam))->interp, buf); +#ifdef PTHREADS + if (0 == pthread_mutex_lock(((TclParam *) (my->specParam))->interpLock)) { +#endif /* PTHREADS */ + Tcl_Eval(((TclParam *) (my->specParam))->interp, buf); +#ifdef PTHREADS + pthread_mutex_unlock(((TclParam *) (my->specParam))->interpLock); + } +#endif /* PTHREADS */ return 0; } -- 2.43.0