Menu
▾
▴
[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-257-g93cfece
|
From: Chris B. <buc...@us...> - 2012-05-16 18:48:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".
The branch, master has been updated
via 93cfecefeae968e8ffafb80aea1f8e885f934573 (commit)
from ee5dac7462c8b026e62f197ddcb53a89b8177ced (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 93cfecefeae968e8ffafb80aea1f8e885f934573
Author: buccella <buc...@li...>
Date: Wed May 16 14:48:41 2012 -0400
[ 2966659 ] Cleanup https daemon remnants
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 410a2e3..7cc6870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-16 Chris Buccella <buc...@li...>
+
+ * control.c, msgqueue.c, msgqueue.h, sfcBroker.c:
+ [ 2966659 ] Cleanup https daemon remnants
+
2012-05-14 Chris Buccella <buc...@li...>
* indCIMXMLHandler.c, instance.c, internalProvider.c, queryOperation.h,
diff --git a/NEWS b/NEWS
index ef43ca7..9879903 100644
--- a/NEWS
+++ b/NEWS
@@ -63,6 +63,8 @@ New features:
Bugs fixed:
+- 2966659 Cleanup https daemon remnants
+
Everything in 1.3.10, plus:
- 3130727 CMPIPropertyMIFT.setProperty() missing objectpath keys
diff --git a/control.c b/control.c
index ab20a3a..d394a3c 100644
--- a/control.c
+++ b/control.c
@@ -65,7 +65,6 @@ Control init[] = {
{"httpProcs", 1, "8"},
{"httpsPort", 1, "5989"},
{"enableHttps", 2, "false"},
- {"httpsProcs", 1, "8"},
{"httpLocalOnly", 2, "false"},
{"httpUserSFCB", 2, "true"},
{"httpUser", 0, ""},
diff --git a/msgqueue.c b/msgqueue.c
index 0ab0ee0..53ba7ac 100644
--- a/msgqueue.c
+++ b/msgqueue.c
@@ -44,8 +44,7 @@ ComSockets *sPairs;
int ptBase,
htBase,
stBase,
- htMax,
- stMax;
+ htMax;
int currentProc = 0;
int noProvPause = 0;
char *provPauseStr = NULL;
@@ -123,7 +122,7 @@ semSetValue(int semid, int semnum, int value)
}
int
-initSem(int https, int shttps, int provs)
+initSem(int https, int provs)
{
union semun sun;
int i;
@@ -150,10 +149,6 @@ initSem(int https, int shttps, int provs)
semctl(sfcbSem, HTTP_GUARD_ID, SETVAL, sun);
sun.val = https;
semctl(sfcbSem, HTTP_PROCS_ID, SETVAL, sun);
- sun.val = 1;
- semctl(sfcbSem, SHTTP_GUARD_ID, SETVAL, sun);
- sun.val = shttps;
- semctl(sfcbSem, SHTTP_PROCS_ID, SETVAL, sun);
for (i = 0; i < provs; i++) {
sun.val = 1;
@@ -635,10 +630,10 @@ spSendCtlResult(int *to, int *from, short code, unsigned long count,
}
void
-initSocketPairs(int provs, int https, int shttps)
+initSocketPairs(int provs, int https)
{
int i,
- t = (provs * 2); // +https+shttps;
+ t = (provs * 2); // +https;
sPairs = (ComSockets *) malloc(sizeof(ComSockets) * t);
mlogf(M_INFO, M_SHOW, "--- initSocketPairs: %d\n", t);
@@ -647,9 +642,7 @@ initSocketPairs(int provs, int https, int shttps)
}
ptBase = provs;
htBase = ptBase + provs;
- stBase = htBase + https;
htMax = https;
- stMax = shttps;
}
void
diff --git a/msgqueue.h b/msgqueue.h
index 0949d30..869cbcb 100644
--- a/msgqueue.h
+++ b/msgqueue.h
@@ -139,7 +139,7 @@ extern int spSendResult(int *to, int *from, void *data,
unsigned long size);
extern unsigned long getInode(int fd);
-extern void initSocketPairs(int provs, int https, int shttps);
+extern void initSocketPairs(int provs, int https);
extern int semAcquireUnDo(int semid, int semnum);
extern int semAcquire(int semid, int semnum);
@@ -148,7 +148,7 @@ extern int semReleaseUnDo(int semid, int semnum);
extern int semMultiRelease(int semid, int semnum, int n);
extern int semGetValue(int semid, int semnum);
extern int semSetValue(int semid, int semnum, int value);
-extern int initSem(int https, int shttps, int provs);
+extern int initSem(int https, int provs);
extern int provProcSem;
extern int provWorkSem;
@@ -168,13 +168,12 @@ extern char *httpPauseStr;
*/
#define HTTP_GUARD_ID 0
#define HTTP_PROCS_ID 1
-#define SHTTP_GUARD_ID 2
-#define SHTTP_PROCS_ID 3
+
/*
* PROV_PROC_BASE_ID must be updated if the number of id's in the above
* block changes.
*/
-#define PROV_PROC_BASE_ID 4
+#define PROV_PROC_BASE_ID 2
/*
* constants for calculating per process ids
@@ -198,9 +197,7 @@ extern char *httpPauseStr;
extern ComSockets *sPairs;
extern int ptBase,
htBase,
- stBase,
- htMax,
- stMax;
+ htMax;
extern void stopLocalConnectServer();
extern void localConnectServer();
diff --git a/sfcBroker.c b/sfcBroker.c
index e4789e7..77951d0 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -603,7 +603,6 @@ main(int argc, char *argv[])
httpLocalOnly = 0;
int syslogLevel = LOG_ERR;
long dSockets,
- sSockets,
pSockets;
char *pauseStr;
@@ -818,8 +817,6 @@ main(int argc, char *argv[])
if (getControlNum("httpProcs", (long *) &dSockets))
dSockets = 10;
- if (getControlNum("httpsProcs", (long *) &sSockets))
- sSockets = 10;
if (getControlNum("provProcs", (long *) &pSockets))
pSockets = 16;
@@ -868,10 +865,10 @@ main(int argc, char *argv[])
startHttp = 1;
}
- initSem(dSockets, sSockets, pSockets);
+ initSem(dSockets, pSockets);
initProvProcCtl(pSockets);
init_sfcBroker();
- initSocketPairs(pSockets, dSockets, sSockets);
+ initSocketPairs(pSockets, dSockets);
setSignal(SIGQUIT, handleSigquit, 0);
setSignal(SIGINT, handleSigquit, 0);
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
