r22395: allow profiling level to be set on startup

(This used to be commit f8f51e8648224af6645dbd0c2f2bffc678b83dac)

2 files changed, 23 insertions, 6 deletions

diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index 686d130b56..b7a2ea23be 100644
--- a/source3/profile/profile.c
+++ b/source3/profile/profile.c
@@ -42,14 +42,10 @@ BOOL do_profile_flag = False;
 BOOL do_profile_times = False;
 
 /****************************************************************************
-receive a set profile level message
+Set a profiling level.
 ****************************************************************************/
-void profile_message(int msg_type, struct process_id src,
-		     void *buf, size_t len, void *private_data)
+void set_profile_level(int level, struct process_id src)
 {
-        int level;
-
-	memcpy(&level, buf, sizeof(int));
 #ifdef WITH_PROFILE
 	switch (level) {
 	case 0:		/* turn off profiling */
@@ -95,6 +91,17 @@ void profile_message(int msg_type, struct process_id src,
 }
 
 /****************************************************************************
+receive a set profile level message
+****************************************************************************/
+void profile_message(int msg_type, struct process_id src, void *buf, size_t len, void *private_data)
+{
+        int level;
+
+	memcpy(&level, buf, sizeof(int));
+	set_profile_level(level, src);
+}
+
+/****************************************************************************
 receive a request profile level message
 ****************************************************************************/
 void reqprofile_message(int msg_type, struct process_id src,
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 348d3354d7..f1efcd41e9 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -863,6 +863,7 @@ extern void build_options(BOOL screen);
 	static BOOL no_process_group = False;
 	static BOOL log_stdout = False;
 	static char *ports = NULL;
+	static char *profile_level = NULL;
 	int opt;
 	poptContext pc;
 
@@ -875,6 +876,7 @@ extern void build_options(BOOL screen);
 	{"log-stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout" },
 	{"build-options", 'b', POPT_ARG_NONE, NULL, 'b', "Print build options" },
 	{"port", 'p', POPT_ARG_STRING, &ports, 0, "Listen on the specified ports"},
+	{"profiling-level", 'P', POPT_ARG_STRING, &profile_level, 0, "Set profiling level","PROFILE_LEVEL"},
 	POPT_COMMON_SAMBA
 	POPT_COMMON_DYNCONFIG
 	POPT_TABLEEND
@@ -997,6 +999,14 @@ extern void build_options(BOOL screen);
 		DEBUG(0,("ERROR: failed to setup profiling\n"));
 		return -1;
 	}
+	if (profile_level != NULL) {
+		int pl = atoi(profile_level);
+		struct process_id src;
+
+		DEBUG(1, ("setting profiling level: %s\n",profile_level));
+		src.pid = getpid();
+		set_profile_level(pl, src);
+	}
 #endif
 
 	DEBUG(3,( "loaded services\n"));