Menu
▾
▴
sblim-commit
Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv9691
Modified Files:
cimcClientSfcbLocal.c httpAdapter.c indCIMXMLHandler.c
interopProvider.c providerDrv.c trace.h ChangeLog NEWS
Log Message:
[ 3574936 ] --disable-debug still allocates trace variables
Index: providerDrv.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerDrv.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- providerDrv.c 8 Aug 2012 21:30:52 -0000 1.119
+++ providerDrv.c 6 Oct 2012 01:19:15 -0000 1.120
@@ -1224,8 +1224,8 @@
_SFCB_ENTER(TRACE_PROVIDERDRV, "getClass");
- char *cn=CMGetClassName(path,NULL)->hdl;
- char *ns=CMGetNameSpace(path,NULL)->hdl;
+ _SFCB_TRACE_VAR(char *cn=CMGetClassName(path,NULL)->hdl);
+ _SFCB_TRACE_VAR(char *ns=CMGetNameSpace(path,NULL)->hdl);
_SFCB_TRACE(1, ("--- Namespace %s ClassName %s",ns,cn));
if (req->hdr.flags & FL_localOnly) flgs|=CMPI_FLAG_LocalOnly;
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.802
retrieving revision 1.803
diff -u -d -r1.802 -r1.803
--- ChangeLog 3 Oct 2012 19:21:15 -0000 1.802
+++ ChangeLog 6 Oct 2012 01:19:15 -0000 1.803
@@ -1,3 +1,9 @@
+2012-10-05 Chris Buccella <buc...@li...>
+
+ * cimcClientSfcbLocal.c, httpAdapter.c, indCIMXMLHandler.c,
+ interopProvider.c, providerDrv.c, trace.h:
+ [ 3574936 ] --disable-debug still allocates trace variables
+
2012-10-03 Chris Buccella <buc...@li...>
* interopProvider.c, queryStatement.c:
Index: interopProvider.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/interopProvider.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- interopProvider.c 3 Oct 2012 19:21:15 -0000 1.68
+++ interopProvider.c 6 Oct 2012 01:19:15 -0000 1.69
@@ -53,6 +53,7 @@
extern void setStatus(CMPIStatus *st, CMPIrc rc, char *msg);
extern int testNameSpace(char *ns, CMPIStatus *st);
extern void memLinkObjectPath(CMPIObjectPath *op);
+extern void sfcbIndAuditLog(char *operation, char *objinfo);
/* ------------------------------------------------------------------------- */
@@ -1445,8 +1446,8 @@
i = subscriptionHt->ft->getNext(subscriptionHt,i,
(void**)&suName, (void**)&su)) {
if ((void*)su->fi==filterId) {
- CMPIString *str=CDToString(_broker,su->ha->hop,NULL);
- CMPIString *ns=CMGetNameSpace(su->ha->hop,NULL);
+ _SFCB_TRACE_VAR(CMPIString *str=CDToString(_broker,su->ha->hop,NULL));
+ _SFCB_TRACE_VAR(CMPIString *ns=CMGetNameSpace(su->ha->hop,NULL));
_SFCB_TRACE(1,("--- invoke handler %s %s",(char*)ns->hdl,(char*)str->hdl));
CMAddArg(hin,"subscription",&su->sci,CMPI_instance);
@@ -1495,8 +1496,8 @@
CMPIInstance *ci=in->ft->getArg(in,"handler",&st).value.inst;
CMPIObjectPath *op=in->ft->getArg(in,"key",&st).value.ref;
- CMPIString *str=CDToString(_broker,op,NULL);
- CMPIString *ns=CMGetNameSpace(op,NULL);
+ _SFCB_TRACE_VAR(CMPIString *str=CDToString(_broker,op,NULL));
+ _SFCB_TRACE_VAR(CMPIString *ns=CMGetNameSpace(op,NULL));
_SFCB_TRACE(1,("--- _addHandler %s %s",(char*)ns->hdl,(char*)str->hdl));
addHandler(ci,op);
sfcbIndAuditLog("CreateHandler-> ",
@@ -1526,8 +1527,8 @@
else if (strcasecmp(methodName, "_updateHandler") == 0) {
CMPIInstance *ci=in->ft->getArg(in,"handler",&st).value.inst;
CMPIObjectPath *op=in->ft->getArg(in,"key",&st).value.ref;
- CMPIString *str=CDToString(_broker,op,NULL);
- CMPIString *ns=CMGetNameSpace(op,NULL);
+ _SFCB_TRACE_VAR(CMPIString *str=CDToString(_broker,op,NULL));
+ _SFCB_TRACE_VAR(CMPIString *ns=CMGetNameSpace(op,NULL));
_SFCB_TRACE(1,("--- _updateHandler %s %s",(char*)ns->hdl,(char*)str->hdl));
updateHandler(ci,op);
}
Index: indCIMXMLHandler.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/indCIMXMLHandler.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- indCIMXMLHandler.c 19 Jul 2012 17:21:22 -0000 1.56
+++ indCIMXMLHandler.c 6 Oct 2012 01:19:15 -0000 1.57
@@ -393,8 +393,8 @@
CMSetProperty(ciLocal, "LastSequenceNumber", &zarro, CMPI_sint64);
}
- CMPIString *str=CDToString(_broker,copLocal,NULL);
- CMPIString *ns=CMGetNameSpace(copLocal,NULL);
+ _SFCB_TRACE_VAR(CMPIString *str=CDToString(_broker,copLocal,NULL));
+ _SFCB_TRACE_VAR(CMPIString *ns=CMGetNameSpace(copLocal,NULL));
_SFCB_TRACE(1,("--- handler %s %s",(char*)ns->hdl,(char*)str->hdl));
in=CMNewArgs(_broker,NULL);
@@ -1014,7 +1014,6 @@
CMRelease(ind);
}
else {
- printf("--- ClassProvider: Invalid request %s\n", methodName);
st.rc = CMPI_RC_ERR_METHOD_NOT_FOUND;
}
Index: httpAdapter.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- httpAdapter.c 8 Aug 2012 20:35:35 -0000 1.108
+++ httpAdapter.c 6 Oct 2012 01:19:15 -0000 1.109
@@ -787,16 +787,20 @@
RespSegments response;
static RespSegments nullResponse = { NULL, 0, 0, NULL, { {0, NULL} } };
unsigned long len;
- int hl, rc,uset=0;
+ int hl, rc;
char *hdr, *path;
int discardInput=0;
MsgSegment msgs[2];
- struct rusage us,ue;
- struct timeval sv, ev;
CimXmlRequestContext ctx;
int breakloop;
int hcrFlags = 0; /* flags to pass to handleCimRequest() */
+#ifdef SFCB_DEBUG
+ int uset=0;
+ struct rusage us,ue;
+ struct timeval sv, ev;
+#endif
+
_SFCB_ENTER(TRACE_HTTPDAEMON, "doHttpRequest");
if (pauseCodec("http")) for (breakloop=0;breakloop==0;) {
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.717
retrieving revision 1.718
diff -u -d -r1.717 -r1.718
--- NEWS 3 Oct 2012 19:21:15 -0000 1.717
+++ NEWS 6 Oct 2012 01:19:15 -0000 1.718
@@ -18,6 +18,7 @@
- 3546279 Core dump in providerDrv on Qualifier not found
- 3574169 revert interop2 stageschema
- 3573507 CreateInstance for IndicationFilter doesn't accept DMTF:CQL
+- 3574936 --disable-debug still allocates trace variables
Changes in 1.3.15
=================
Index: trace.h
===================================================================
RCS file: /cvsroot/sblim/sfcb/trace.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- trace.h 11 Apr 2012 22:55:17 -0000 1.17
+++ trace.h 6 Oct 2012 01:19:15 -0000 1.18
@@ -27,6 +27,9 @@
#ifdef SFCB_DEBUG
+/* to wrap variables used only in trace statements */
+#define _SFCB_TRACE_VAR(f) f;
+
#define _SFCB_TRACE(LEVEL,STR) \
if ((*_ptr_sfcb_trace_mask & __traceMask) && (LEVEL<=_sfcb_debug) && (LEVEL>0) ) \
_sfcb_trace(LEVEL,__FILE__,__LINE__,_sfcb_format_trace STR);
@@ -84,6 +87,7 @@
#else
#define _SFCB_TRACE_FUNCTION(n,f)
+#define _SFCB_TRACE_VAR(f)
#define _SFCB_TRACE(LEVEL,STR)
#define _SFCB_ENTER(n,f)
#define _SFCB_EXIT() { return; }
Index: cimcClientSfcbLocal.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimcClientSfcbLocal.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- cimcClientSfcbLocal.c 21 Jun 2012 16:46:59 -0000 1.48
+++ cimcClientSfcbLocal.c 6 Oct 2012 01:19:15 -0000 1.49
@@ -1178,6 +1178,7 @@
_SFCB_RETURN(NULL);
}
+#ifdef SFCB_DEBUG
static CMPIValue convertFromStringValue(
CMPIValue strcval,
CMPIType strctype,
@@ -1298,6 +1299,7 @@
_SFCB_RETURN(newcval);
} // convertFromStringValue
+#endif
static CMPIArgs * convertFromStringArguments(
CMPIConstClass *cls,
@@ -1402,7 +1404,7 @@
goto addacopy;
}
// convert the string value to defined type
- CMPIValue newcval = convertFromStringValue(cdata.value, cdata.type, cparam.type, prc);
+ _SFCB_TRACE_VAR(CMPIValue newcval = convertFromStringValue(cdata.value, cdata.type, cparam.type, prc));
if (prc && (prc->rc != CMPI_RC_OK)) {
if (0 != vmpt) {
goto error2;
@@ -1411,7 +1413,7 @@
prc->rc = CMPI_RC_OK;
goto addacopy;
}
- CMPIStatus lrc = CMAddArg(argsnew, (char*)name->hdl, &newcval, cparam.type);
+ _SFCB_TRACE_VAR(CMPIStatus lrc = CMAddArg(argsnew, (char*)name->hdl, &newcval, cparam.type));
_SFCB_TRACE(4,("--- IN argument: %s updated with ptype: %u status: %u",(char*)name->hdl,cparam.type,lrc.rc));
continue;
}
|
Thanks for helping keep SourceForge clean.
X