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

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 1e4800d327d97ac151501853e4b91ef35cf955fa..5d6e554ede258ee9d81b08f027214fc8157b35ad 100644 (file)
--- a/source3/include/includes.h
+++ b/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"

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5b96bdfbeb45d742ea3f87ca9d84888336fccee2..be2915f4c57e88e1b0e4e7dd07f12a1fe27a09cf 100644 (file)
--- a/source3/include/proto.h
+++ b/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);

diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h
index 3041f6c87ec03146abfa6d0dd00262957c5c315a..4f5b6002fc93c54d1c7daf7a82a6150d21694e25 100644 (file)
--- a/source3/include/smbprofile.h
+++ b/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

diff --git a/source3/modules/vfs_crossrename.c b/source3/modules/vfs_crossrename.c
index ffb807da487217d108225d5b05c8ae070be8215b..8f7c5f042bbd38b2489babce3a2da645faa56f05 100644 (file)
--- a/source3/modules/vfs_crossrename.c
+++ b/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;

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index e7c6f7ebebe275e4e3c4b57f8029219a3bf37570..859b212048608b742e172d30707c90582a14fab2 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/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

diff --git a/source3/nmbd/nmbd_elections.c b/source3/nmbd/nmbd_elections.c
index 4c9c9d9151d0ba5a6dad83730f2aa64943ae30a8..899c273fe08955f8861e8f15f0cc53c538df0b94 100644 (file)
--- a/source3/nmbd/nmbd_elections.c
+++ b/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;

diff --git a/source3/nmbd/nmbd_incomingdgrams.c b/source3/nmbd/nmbd_incomingdgrams.c
index cc657e39625e56826ea63aa1a17c9fea11f72d3a..6993e183583531e63e422b2801475dc5e51ec39d 100644 (file)
--- a/source3/nmbd/nmbd_incomingdgrams.c
+++ b/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;
 

diff --git a/source3/nmbd/nmbd_synclists.c b/source3/nmbd/nmbd_synclists.c
index 2fd510cedd870a1c8513690c42bc5f31fe2a003d..fc2b25edcae1219f7fd84d49990e9a735698ae93 100644 (file)
--- a/source3/nmbd/nmbd_synclists.c
+++ b/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;

diff --git a/source3/profile/profile.c b/source3/profile/profile.c
index 9a3bb625083557b102f17347b030f979e7a1757b..6c47c988ffea354c708d9a159bbf2060d06b58dd 100644 (file)
--- a/source3/profile/profile.c
+++ b/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)

diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index 460eeac33a5aaec53595870b98205eb5aafb1a41..16d8853b54cefb705fce09b826e94599c49564f7 100644 (file)
--- a/source3/smbd/fileio.c
+++ b/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);
 

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 3fd42954f9f82be59ea1f48af8515cc958147549..4f2fea52658947c4a1637a2d8bc998afac02a7a3 100644 (file)
--- a/source3/smbd/ipc.c
+++ b/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
 

diff --git a/source3/smbd/message.c b/source3/smbd/message.c
index 1a6e9c8b13c7f5cb432b6f2d9818b88db0e7e4cf..34997a13dc51675224a6fa426b80249a17b5231c 100644 (file)
--- a/source3/smbd/message.c
+++ b/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;
 

diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index d307c210c28db53e787b231e38c661a2bf97a9a6..6877ccc861f0806d3b30131e8bae1e14d91fd7c5 100644 (file)
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -25,6 +25,7 @@
 #include "serverid.h"
 #include "auth.h"
 #include "messages.h"
+#include "smbprofile.h"
 
 extern fstring remote_proto;
 

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 2dd5715c89cc57f7a1f3b50674fb17ddb29ce84a..e1358c6e5545d737859ef27f7757d68f7095039e 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/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;
 

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index f290e1d82b09962f750b978f2614a062b92c043f..93f29e57b64a4eb5a0c44f2c82d06ec0f2d2a541 100644 (file)
--- a/source3/smbd/process.c
+++ b/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;
 

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index cc02ae29dc313f7daca23b63cb2215db06b27517..96595223a60ad2b08f6a5b77d43d873bff3ef359 100644 (file)
--- a/source3/smbd/reply.c
+++ b/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

diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c
index 8da1db41f43d09f8333e437907b990521522073d..f8c8847a60cbe0511835837cd69264a573c765dd 100644 (file)
--- a/source3/smbd/sec_ctx.c
+++ b/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;
 

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 1948077c1f887705b32f5fb176ac42030c2f76a8..d3c6c1884f01acc5baf45b27cd77d7c4bc931f21 100644 (file)
--- a/source3/smbd/server.c
+++ b/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);

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 5067201a65221174776fad246ccdc027c2ff70d9..3cf6758e2965b12c7f86af72d3d5034263ad90c8 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/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 {

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 50505e773028e3592e31267a6796111facb9dd77..0004e7ca8caf781cc831f491979a258f26ce4a99 100644 (file)
--- a/source3/smbd/smb2_server.c
+++ b/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)
 

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index 40174c803486951b4dbc1445079bf78f392535c6..5c74b928550312956dd1ed61318d8c95b033d7bd 100644 (file)
--- a/source3/smbd/statcache.c
+++ b/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.

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index fe06538246a7225a6cb83642483a563558568a1b..507ae9ba93a3de7922469451b9ec56663aa24427 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/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
 

diff --git a/source3/utils/status_profile.c b/source3/utils/status_profile.c
index 198dac69a19c0fa76726f412f48703e2d3e4a28a..c0eeb7a923a85b36eaa7e2a936fa978050d1527b 100644 (file)
--- a/source3/utils/status_profile.c
+++ b/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);