The branch, master has been updated
via 3dbfb25 s3:smb2_close: add missing TALLOC_FREE(subreq) in
smbd_smb2_request_close_done()
via fc96488 s3:smbd: readd
START_PROFILE(smbd_idle)/END_PROFILE(smbd_idle)
from 36353a9 tdb2: use ccan/err instead of err.h
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3dbfb2511186200a65efd407c0093e19a9e456ff
Author: Stefan Metzmacher <[email protected]>
Date: Fri Jun 8 10:29:44 2012 +0200
s3:smb2_close: add missing TALLOC_FREE(subreq) in
smbd_smb2_request_close_done()
metze
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Sat Jun 9 13:57:31 CEST 2012 on sn-devel-104
commit fc96488c64ccf3a3ce946f26dc851d374830c251
Author: Stefan Metzmacher <[email protected]>
Date: Fri Jun 8 14:07:51 2012 +0200
s3:smbd: readd START_PROFILE(smbd_idle)/END_PROFILE(smbd_idle)
metze
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/process.c | 15 +++++++++++++++
source3/smbd/smb2_close.c | 1 +
2 files changed, 16 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 30d0354..5e26826 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3159,6 +3159,19 @@ NTSTATUS smbXsrv_connection_init_tables(struct
smbXsrv_connection *conn,
return NT_STATUS_OK;
}
+static void smbd_tevent_trace_callback(enum tevent_trace_point point,
+ void *private_data)
+{
+ switch (point) {
+ case TEVENT_TRACE_BEFORE_WAIT:
+ START_PROFILE(smbd_idle);
+ break;
+ case TEVENT_TRACE_AFTER_WAIT:
+ END_PROFILE(smbd_idle);
+ break;
+ }
+}
+
/****************************************************************************
Process commands from the client
****************************************************************************/
@@ -3496,6 +3509,8 @@ void smbd_process(struct tevent_context *ev_ctx,
TALLOC_FREE(frame);
+ tevent_set_trace_callback(ev_ctx, smbd_tevent_trace_callback, NULL);
+
while (True) {
frame = talloc_stackframe_pool(8192);
diff --git a/source3/smbd/smb2_close.c b/source3/smbd/smb2_close.c
index 9a08c6f..3df408e 100644
--- a/source3/smbd/smb2_close.c
+++ b/source3/smbd/smb2_close.c
@@ -106,6 +106,7 @@ static void smbd_smb2_request_close_done(struct tevent_req
*subreq)
&out_allocation_size,
&out_end_of_file,
&out_file_attributes);
+ TALLOC_FREE(subreq);
if (!NT_STATUS_IS_OK(status)) {
error = smbd_smb2_request_error(req, status);
if (!NT_STATUS_IS_OK(error)) {
--
Samba Shared Repository
