summaryrefslogtreecommitdiffstats
path: root/source3/utils
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2014-09-30 15:08:20 +0000
committerJeremy Allison <jra@samba.org>2014-10-03 19:55:09 +0200
commit17c7f454813be526876ac750ceb6fd1422577495 (patch)
tree55424c1f26bd52aa6f236f0921ffa4c0a2bc1362 /source3/utils
parenta33b445a7d7567b27f5247cb6060edbbeecf4d52 (diff)
downloadsamba-17c7f454813be526876ac750ceb6fd1422577495.tar.gz
samba-17c7f454813be526876ac750ceb6fd1422577495.tar.xz
samba-17c7f454813be526876ac750ceb6fd1422577495.zip
profiling: Only compile utils/status_profile.c if profiling is enabled
This conditional compile avoids some #ifdef WITH_PROFILE, which makes the code more readable Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/status_profile.c21
-rw-r--r--source3/utils/status_profile_dummy.c33
2 files changed, 33 insertions, 21 deletions
diff --git a/source3/utils/status_profile.c b/source3/utils/status_profile.c
index 0923bae249..153fba6211 100644
--- a/source3/utils/status_profile.c
+++ b/source3/utils/status_profile.c
@@ -24,7 +24,6 @@
bool status_profile_dump(bool be_verbose);
bool status_profile_rates(bool be_verbose);
-#ifdef WITH_PROFILE
static void profile_separator(const char * title)
{
char line[79 + 1];
@@ -39,14 +38,12 @@ static void profile_separator(const char * title)
line[sizeof(line) - 1] = '\0';
d_printf("%s\n", line);
}
-#endif
/*******************************************************************
dump the elements of the profile structure
******************************************************************/
bool status_profile_dump(bool verbose)
{
-#ifdef WITH_PROFILE
if (!profile_setup(NULL, True)) {
fprintf(stderr,"Failed to initialise profile memory\n");
return False;
@@ -437,16 +434,9 @@ bool status_profile_dump(bool verbose)
d_printf("smb2_break_count: %u\n", profile_p->smb2_break_count);
d_printf("smb2_break_time: %u\n", profile_p->smb2_break_time);
-#else /* WITH_PROFILE */
-
- fprintf(stderr, "Profile data unavailable\n");
-#endif /* WITH_PROFILE */
-
return True;
}
-#ifdef WITH_PROFILE
-
/* Convert microseconds to milliseconds. */
#define usec_to_msec(s) ((s) / 1000)
/* Convert microseconds to seconds. */
@@ -566,14 +556,3 @@ bool status_profile_rates(bool verbose)
return True;
}
-
-#else /* WITH_PROFILE */
-
-bool status_profile_rates(bool verbose)
-{
- fprintf(stderr, "Profile data unavailable\n");
- return False;
-}
-
-#endif /* WITH_PROFILE */
-
diff --git a/source3/utils/status_profile_dummy.c b/source3/utils/status_profile_dummy.c
new file mode 100644
index 0000000000..c58f696efa
--- /dev/null
+++ b/source3/utils/status_profile_dummy.c
@@ -0,0 +1,33 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Samba internal messaging functions
+ * Copyright (C) 2013 by Volker Lendecke
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes.h"
+#include "smbprofile.h"
+
+bool status_profile_dump(bool be_verbose)
+{
+ fprintf(stderr, "Profile data unavailable\n");
+ return true;
+}
+
+bool status_profile_rates(bool be_verbose)
+{
+ fprintf(stderr, "Profile data unavailable\n");
+ return true;
+}