s3: only include smb profiling where needed.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Apr 14 01:31:39 CEST 2011 on sn-devel-104

source3/include/includes.h

@@ -567,9 +567,6 @@ enum flush_reason_enum {
 #include "proto.h"
 #endif
 
-/* We need this after proto.h to reference GetTimeOfDay(). */
-#include "smbprofile.h"
-
 /* String routines */
 
 #include "srvstr.h"

source3/include/proto.h

@@ -2647,11 +2647,6 @@ void set_server_role(void);
 uint32 get_int_param( const char* param );
 char* get_string_param( const char* param );
 
-/* The following definitions come from profile/profile.c  */
-
-void set_profile_level(int level, struct server_id src);
-bool profile_setup(struct messaging_context *msg_ctx, bool rdonly);
-
 /* The following definitions come from librpc/rpc/rpc_common.c  */
 struct ndr_interface_table;
 bool smb_register_ndr_interface(const struct ndr_interface_table *interface);

source3/include/smbprofile.h

@@ -966,4 +966,9 @@ static inline uint64_t profile_timestamp(void)
 #define END_PROFILE(x)
 #endif /* WITH_PROFILE */
 
+/* The following definitions come from profile/profile.c  */
+
+void set_profile_level(int level, struct server_id src);
+bool profile_setup(struct messaging_context *msg_ctx, bool rdonly);
+
 #endif

source3/modules/vfs_crossrename.c

@@ -19,7 +19,7 @@
 #include "smbd/smbd.h"
 #include "system/filesys.h"
 #include "transfer_file.h"
-
+#include "smbprofile.h"
 
 #define MODULE "crossrename"
 static SMB_OFF_T module_sizelimit;

source3/modules/vfs_default.c

@@ -23,6 +23,7 @@
 #include "system/filesys.h"
 #include "smbd/smbd.h"
 #include "ntioctl.h"
+#include "smbprofile.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS

source3/nmbd/nmbd_elections.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "nmbd/nmbd.h"
+#include "smbprofile.h"
 
 /* Election parameters. */
 extern time_t StartupTime;

source3/nmbd/nmbd_incomingdgrams.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/svcctl.h"
 #include "nmbd/nmbd.h"
+#include "smbprofile.h"
 
 extern bool found_lm_clients;
 

source3/nmbd/nmbd_synclists.c

@@ -31,6 +31,7 @@
 #include "../librpc/gen_ndr/svcctl.h"
 #include "nmbd/nmbd.h"
 #include "libsmb/clirap.h"
+#include "smbprofile.h"
 
 struct sync_record {
 	struct sync_record *next, *prev;

source3/profile/profile.c

@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "system/shmem.h"
 #include "messages.h"
+#include "smbprofile.h"
 
 #ifdef WITH_PROFILE
 #define IPC_PERMS ((S_IRUSR | S_IWUSR) | S_IRGRP | S_IROTH)

source3/smbd/fileio.c

@@ -23,6 +23,7 @@
 #include "printing.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "smbprofile.h"
 
 static bool setup_write_cache(files_struct *, SMB_OFF_T);
 

source3/smbd/ipc.c

@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "smbprofile.h"
 
 #define NERR_notsupported 50
 

source3/smbd/message.c

@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "smbprofile.h"
 
 extern userdom_struct current_user_info;
 

source3/smbd/negprot.c

@@ -25,6 +25,7 @@
 #include "serverid.h"
 #include "auth.h"
 #include "messages.h"
+#include "smbprofile.h"
 
 extern fstring remote_proto;
 

source3/smbd/nttrans.c

@@ -28,6 +28,7 @@
 #include "passdb/lookup_sid.h"
 #include "auth.h"
 #include "ntioctl.h"
+#include "smbprofile.h"
 
 extern const struct generic_mapping file_generic_mapping;
 

source3/smbd/process.c

@@ -31,6 +31,7 @@
 #include "passdb.h"
 #include "auth.h"
 #include "messages.h"
+#include "smbprofile.h"
 
 extern bool global_machine_password_needs_changing;
 

source3/smbd/reply.c

@@ -38,6 +38,7 @@
 #include "libcli/security/security.h"
 #include "libsmb/nmblib.h"
 #include "auth.h"
+#include "smbprofile.h"
 
 /****************************************************************************
  Ensure we check the path in *exactly* the same way as W2K for a findfirst/findnext

source3/smbd/sec_ctx.c

@@ -22,6 +22,7 @@
 #include "smbd/globals.h"
 #include "libcli/security/security_token.h"
 #include "auth.h"
+#include "smbprofile.h"
 
 extern struct current_user current_user;
 

source3/smbd/server.c

@@ -40,6 +40,7 @@
 #include "passdb.h"
 #include "auth.h"
 #include "messages.h"
+#include "smbprofile.h"
 
 extern void start_epmd(struct tevent_context *ev_ctx,
 		       struct messaging_context *msg_ctx);

source3/smbd/sesssetup.c

@@ -33,6 +33,7 @@
 #include "../lib/util/asn1.h"
 #include "auth.h"
 #include "messages.h"
+#include "smbprofile.h"
 
 /* For split krb5 SPNEGO blobs. */
 struct pending_auth_data {

source3/smbd/smb2_server.c

@@ -24,6 +24,7 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../lib/tsocket/tsocket.h"
+#include "smbprofile.h"
 
 #define OUTVEC_ALLOC_SIZE (SMB2_HDR_BODY + 9)
 

source3/smbd/statcache.c

@@ -24,6 +24,7 @@
 #include "memcache.h"
 #include "smbd/smbd.h"
 #include "messages.h"
+#include "smbprofile.h"
 
 /****************************************************************************
  Stat cache code used in unix_convert.

source3/smbd/trans2.c

@@ -34,6 +34,7 @@
 #include "libcli/security/security.h"
 #include "trans2.h"
 #include "auth.h"
+#include "smbprofile.h"
 
 #define DIR_ENTRY_SAFETY_MARGIN 4096
 

source3/utils/status_profile.c

@@ -19,6 +19,7 @@
  */
 
 #include "includes.h"
+#include "smbprofile.h"
 
 bool status_profile_dump(bool be_verbose);
 bool status_profile_rates(bool be_verbose);