From 195ec103d6c0f8470141014dbfe365996fa0f4a7 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Thu, 9 Jan 2003 06:26:04 +0000 Subject: [PATCH] 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) --- source3/smbd/process.c | 26 ++++++++++++++++++++++++++ source3/smbd/server.c | 30 ------------------------------ 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 03b1e007ba6..06cedea5735 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 6ed2cdac96f..0b2fa2a1bab 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -522,36 +522,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. ****************************************************************************/