Permalink
Browse files

[ 1443861 ] sfcb does not support local clients

First batch of changes for local client support.
   Adapters now using socket-passing instead of predefined socket pairs
   Added localConnectServer support in msgqueue.c
   Added cimcClientSfcbLocal.c enabling local client support
   Reworked ConstClass to be more in line with sfcc/ConstClass
   Untangled header files

[ 1443864 ] Valgrind shows reachable memory problems
Fixed a number of leaking and reachable memory problems
  • Loading branch information...
1 parent 09387d5 commit 9b24443fc8055057f406f7496c733a3d01340d68 a3schuur committed Mar 6, 2006
Showing with 2,710 additions and 267 deletions.
  1. +12 −4 Makefile.am
  2. +1 −0 brokerUpc.c
  3. +3 −2 cimXmlGen.c
  4. +1 −2 cimXmlRequest.c
  5. +0 −1 cimXmlRequest.h
  6. +1,857 −0 cimcClientSfcbLocal.c
  7. +184 −0 cimcClientSfcbLocal.h
  8. +33 −1 classProvider.c
  9. +45 −16 constClass.c
  10. +35 −26 constClass.h
  11. +17 −2 control.c
  12. +2 −0 genericlist.c
  13. +1 −0 hashtable.c
  14. +7 −7 httpAdapter.c
  15. +1 −0 httpComm.c
  16. +0 −4 httpComm.h
  17. +1 −0 indCIMXMLExport.c
  18. +2 −0 indCIMXMLHandler.c
  19. +1 −1 instance.c
  20. +5 −3 internalProvider.c
  21. +4 −1 internalProvider.h
  22. +1 −2 interopProvider.c
  23. +207 −41 msgqueue.c
  24. +8 −3 msgqueue.h
  25. +1 −0 native.h
  26. +3 −5 objectpath.c
  27. +36 −12 providerDrv.c
  28. +92 −35 providerMgr.c
  29. +14 −14 providerMgr.h
  30. +24 −4 providerRegister.c
  31. +46 −9 providerRegister.h
  32. +2 −0 queryOperation.h
  33. +1 −1 queryStatement.c
  34. +1 −1 result.c
  35. +0 −1 selectexp.c
  36. +28 −1 sfcBroker.c
  37. +5 −0 string.c
  38. +23 −1 support.c
  39. +2 −0 support.h
  40. +0 −2 utilFactory.c
  41. +1 −1 utilStringBuffer.c
  42. +3 −64 utilft.h
View
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.50 2006/02/09 13:44:18 mihajlov Exp $
+# $Id: Makefile.am,v 1.51 2006/03/06 04:11:08 a3schuur Exp $
#
# Makefile.am
#
@@ -57,7 +57,8 @@ lib_LTLIBRARIES = \
libsfcBasicAuthentication.la \
libsfcCertificateAuthentication.la \
libsfcIndCIMXMLHandler.la \
- libsfcObjectImplSwapI32toP32.la
+ libsfcObjectImplSwapI32toP32.la \
+ libcimcClientSfcbLocal.la
else
lib_LTLIBRARIES = \
libsfcBrokerCore.la \
@@ -70,7 +71,8 @@ lib_LTLIBRARIES = \
libsfcHttpAdapter.la \
libsfcBasicAuthentication.la \
libsfcCertificateAuthentication.la \
- libsfcObjectImplSwapI32toP32.la
+ libsfcObjectImplSwapI32toP32.la \
+ libcimcClientSfcbLocal.la
endif
sbin_PROGRAMS = \
@@ -186,6 +188,10 @@ queryLexer.c: $(srcdir)/queryLexer.l
queryParser.c: $(srcdir)/queryParser.y
$(YACC) $(AM_YFLAGS) -p sfcQuery -o $@ $<
+libcimcClientSfcbLocal_la_SOURCES = \
+ cimcClientSfcbLocal.c
+libcimcClientSfcbLocal_la_LIBADD=-lsfcBrokerCore
+
libsfcHttpAdapter_la_SOURCES = \
httpAdapter.c \
httpComm.c
@@ -249,7 +255,9 @@ noinst_HEADERS=array.h httpComm.h control.h providerMgr.h \
cmpidt.h cmpift.h cmpiftx.h cmpimacs.h cmpimacsx.h cmpios.h \
fileRepository.h internalProvider.h \
selectexp.h queryOperation.h \
- sfcVersion.h mrwlock.h sqlStatement.h avltree.h
+ sfcVersion.h mrwlock.h sqlStatement.h avltree.h \
+ cimcClientSfcbLocal.h
+
man_MANS=$(MANFILES)
View
@@ -27,6 +27,7 @@
#include "native.h"
#include "utilft.h"
#include "providerMgr.h"
+#include "providerRegister.h"
#include "objectImpl.h"
#include "msgqueue.h"
#include "utilft.h"
View
@@ -22,6 +22,7 @@
+#include "cmpidt.h"
#include "cimXmlRequest.h"
#include "cimXmlParser.h"
#include "msgqueue.h"
@@ -697,7 +698,7 @@ int cls2xml(CMPIConstClass * cls, UtilStringBuffer * sb, unsigned int flags)
unsigned long quals;
UtilStringBuffer *qsb = UtilFactory->newStrinBuffer(1024);
- _SFCB_ENTER(TRACE_CIMXMLPROC, "cls2xml");
+ _SFCB_ENTER(TRACE_CIMXMLPROC, "cls2xml");
sb->ft->appendChars(sb, "<CLASS NAME=\"");
sb->ft->appendChars(sb, cls->ft->getCharClassName(cls));
@@ -717,7 +718,7 @@ int cls2xml(CMPIConstClass * cls, UtilStringBuffer * sb, unsigned int flags)
for (i = 0, m = ClClassGetPropertyCount(cl); i < m; i++) {
qsb->ft->reset(qsb);
- data = cls->ft->getPropertyAt(cls, i, &name, &quals, NULL);
+ data = getPropertyQualsAt(cls, i, &name, &quals, NULL);
if (flags & FL_includeQualifiers) quals2xml(quals << 8, qsb);
if (flags & FL_includeQualifiers)
for (q = 0, qm = ClClassGetPropQualifierCount(cl, i); q < qm; q++) {
View
@@ -22,6 +22,7 @@
+#include "cmpidt.h"
#include "cimXmlGen.h"
#include "cimXmlRequest.h"
#include "cimXmlParser.h"
@@ -69,9 +70,7 @@ extern MsgSegment setConstClassMsgSegment(CMPIConstClass * cl);
extern void closeProviderContext(BinRequestContext * ctx);
extern CMPIStatus arraySetElementNotTrackedAt(CMPIArray * array,
CMPICount index, CMPIValue * val, CMPIType type);
-extern QLStatement *parseQuery(int mode, char *query, char *lang, char *sns, int *rc);
extern CMPIConstClass initConstClass(ClClass *cl);
-const char *opGetClassNameChars(CMPIObjectPath * cop);
static char *cimMsg[] = {
"ok",
View
@@ -60,6 +60,5 @@ typedef struct cimXmlRequestContext {
extern RespSegments handleCimXmlRequest(CimXmlRequestContext * ctx);
extern int cleanupCimXmlRequest(RespSegments * rs);
-extern ExpSegments exportIndicationReq(CMPIInstance *ci, char *id);
#endif
Oops, something went wrong.

0 comments on commit 9b24443

Please sign in to comment.