summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2003-01-09 06:26:04 +0000
committerHerb Lewis <herb@samba.org>2003-01-09 06:26:04 +0000
commit195ec103d6c0f8470141014dbfe365996fa0f4a7 (patch)
tree8308605893d99b782a03ec093a4badb345bcdf52 /source3
parenta2cce2f0757413a117f6f69568c0b392ecf3079c (diff)
downloadsamba-195ec103d6c0f8470141014dbfe365996fa0f4a7.tar.gz
samba-195ec103d6c0f8470141014dbfe365996fa0f4a7.tar.bz2
samba-195ec103d6c0f8470141014dbfe365996fa0f4a7.zip
Moved smbd process counting functions from smbd/server.c to smbd/process.c
so that bin/vfstest can link. merge from head (This used to be commit 9151cd7d64a1ee1277cbcfb3e7ed61c32c1037cf)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/process.c26
-rw-r--r--source3/smbd/server.c30
2 files changed, 26 insertions, 30 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 03b1e007ba..06cedea573 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -799,6 +799,32 @@ static int construct_reply(char *inbuf,char *outbuf,int size,int bufsize)
'hard' limit Samba overhead on resource constrained systems.
****************************************************************************/
+static BOOL process_count_update_successful = False;
+
+static int32 increment_smbd_process_count(void)
+{
+ int32 total_smbds;
+
+ if (lp_max_smbd_processes()) {
+ total_smbds = 0;
+ if (tdb_change_int32_atomic(conn_tdb_ctx(), "INFO/total_smbds", &total_smbds, -1) == -1)
+ return 1;
+ process_count_update_successful = True;
+ return total_smbds + 1;
+ }
+ return 1;
+}
+
+void decrement_smbd_process_count(void)
+{
+ int32 total_smbds;
+
+ if (lp_max_smbd_processes() && process_count_update_successful) {
+ total_smbds = 1;
+ tdb_change_int32_atomic(conn_tdb_ctx(), "INFO/total_smbds", &total_smbds, -1);
+ }
+}
+
static BOOL smbd_process_limit(void)
{
int32 total_smbds;
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 6ed2cdac96..0b2fa2a1ba 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -523,36 +523,6 @@ static BOOL dump_core(void)
#endif
/****************************************************************************
-update the current smbd process count
-****************************************************************************/
-
-static BOOL process_count_update_successful = False;
-
-int32 increment_smbd_process_count(void)
-{
- int32 total_smbds;
-
- if (lp_max_smbd_processes()) {
- total_smbds = 0;
- if (tdb_change_int32_atomic(conn_tdb_ctx(), "INFO/total_smbds", &total_smbds, -1) == -1)
- return 1;
- process_count_update_successful = True;
- return total_smbds + 1;
- }
- return 1;
-}
-
-static void decrement_smbd_process_count(void)
-{
- int32 total_smbds;
-
- if (lp_max_smbd_processes() && process_count_update_successful) {
- total_smbds = 1;
- tdb_change_int32_atomic(conn_tdb_ctx(), "INFO/total_smbds", &total_smbds, -1);
- }
-}
-
-/****************************************************************************
Exit the server.
****************************************************************************/