s3: VFS: Remove SMB_VFS_FCHMOD_ACL().

[amitay/samba.git] / source3 / include / smbprofile.h

diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h
index b32d938306188a3ac6a984198ab644e591fd2ed1..327c16ac2d93162b0935709b17a56d89a17c658f 100644 (file)
--- a/source3/include/smbprofile.h
+++ b/source3/include/smbprofile.h
@@ -32,6 +32,8 @@ struct tevent_context;
        SMBPROFILE_STATS_COUNT(connect) \
        SMBPROFILE_STATS_COUNT(disconnect) \
        SMBPROFILE_STATS_BASIC(idle) \
+       SMBPROFILE_STATS_TIME(cpu_user) \
+       SMBPROFILE_STATS_TIME(cpu_system) \
        SMBPROFILE_STATS_COUNT(request) \
        SMBPROFILE_STATS_BASIC(push_sec_ctx) \
        SMBPROFILE_STATS_BASIC(set_sec_ctx) \
@@ -52,10 +54,8 @@ struct tevent_context;
        SMBPROFILE_STATS_BASIC(syscall_open) \
        SMBPROFILE_STATS_BASIC(syscall_createfile) \
        SMBPROFILE_STATS_BASIC(syscall_close) \
-       SMBPROFILE_STATS_BYTES(syscall_read) \
        SMBPROFILE_STATS_BYTES(syscall_pread) \
        SMBPROFILE_STATS_BYTES(syscall_asys_pread) \
-       SMBPROFILE_STATS_BYTES(syscall_write) \
        SMBPROFILE_STATS_BYTES(syscall_pwrite) \
        SMBPROFILE_STATS_BYTES(syscall_asys_pwrite) \
        SMBPROFILE_STATS_BASIC(syscall_lseek) \
@@ -63,7 +63,6 @@ struct tevent_context;
        SMBPROFILE_STATS_BYTES(syscall_recvfile) \
        SMBPROFILE_STATS_BASIC(syscall_rename) \
        SMBPROFILE_STATS_BASIC(syscall_rename_at) \
-       SMBPROFILE_STATS_BASIC(syscall_fsync) \
        SMBPROFILE_STATS_BASIC(syscall_asys_fsync) \
        SMBPROFILE_STATS_BASIC(syscall_stat) \
        SMBPROFILE_STATS_BASIC(syscall_fstat) \
@@ -102,8 +101,6 @@ struct tevent_context;
        SMBPROFILE_STATS_BASIC(get_nt_acl) \
        SMBPROFILE_STATS_BASIC(fget_nt_acl) \
        SMBPROFILE_STATS_BASIC(fset_nt_acl) \
-       SMBPROFILE_STATS_BASIC(chmod_acl) \
-       SMBPROFILE_STATS_BASIC(fchmod_acl) \
        SMBPROFILE_STATS_SECTION_END \
        \
        SMBPROFILE_STATS_SECTION_START(statcache, "Stat Cache") \
@@ -531,7 +528,7 @@ static inline bool smbprofile_dump_pending(void)
 
 void smbprofile_dump(void);
 
-void smbprofile_cleanup(pid_t pid);
+void smbprofile_cleanup(pid_t pid, pid_t dst);
 void smbprofile_stats_accumulate(struct profile_stats *acc,
                                 const struct profile_stats *add);
 void smbprofile_collect(struct profile_stats *stats);
@@ -563,6 +560,8 @@ static inline uint64_t profile_timestamp(void)
 #define END_PROFILE_BYTES(x) \
        SMBPROFILE_BYTES_ASYNC_END(__profasync_##x)
 
+#define PROFILE_TIMESTAMP(x) clock_gettime_mono(x)
+
 #else /* WITH_PROFILE */
 
 #define SMBPROFILE_COUNT_INCREMENT(_name, _area, _v)
@@ -593,6 +592,8 @@ static inline uint64_t profile_timestamp(void)
 #define END_PROFILE(x)
 #define END_PROFILE_BYTES(x)
 
+#define PROFILE_TIMESTAMP(x) (*(x)=(struct timespec){0})
+
 static inline bool smbprofile_dump_pending(void)
 {
        return false;
@@ -608,7 +609,7 @@ static inline void smbprofile_dump(void)
        return;
 }
 
-static inline void smbprofile_cleanup(pid_t pid)
+static inline void smbprofile_cleanup(pid_t pid, pid_t dst)
 {
        return;
 }
@@ -616,8 +617,9 @@ static inline void smbprofile_cleanup(pid_t pid)
 #endif /* WITH_PROFILE */
 
 /* The following definitions come from profile/profile.c  */
+struct server_id;
 
-void set_profile_level(int level, struct server_id src);
+void set_profile_level(int level, const struct server_id *src);
 
 struct messaging_context;
 bool profile_setup(struct messaging_context *msg_ctx, bool rdonly);