The branch, v3-3-test has been updated
via e2cd00813c5221a03508249e5bb49e648befc734 (commit)
via 4955e1610af3086cc7e8d0344313a124b23a4e31 (commit)
from 962a92024dda7db06d07d6e736d79d25c5d8f40a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit e2cd00813c5221a03508249e5bb49e648befc734
Author: Volker Lendecke <[email protected]>
Date: Fri Apr 3 14:24:02 2009 -0700
Use cluster-aware procid_is_me instead of comparing pid's
commit 4955e1610af3086cc7e8d0344313a124b23a4e31
Author: Volker Lendecke <[email protected]>
Date: Fri Apr 3 14:03:43 2009 -0700
Use procid_str in debug messages for better cluster-debuggability
-----------------------------------------------------------------------
Summary of changes:
source/locking/brlock.c | 4 ++--
source/smbd/oplock.c | 28 +++++++++++++++-------------
2 files changed, 17 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/locking/brlock.c b/source/locking/brlock.c
index 032aaa5..cd9a203 100644
--- a/source/locking/brlock.c
+++ b/source/locking/brlock.c
@@ -41,11 +41,11 @@ static struct db_context *brlock_db;
static void print_lock_struct(unsigned int i, struct lock_struct *pls)
{
- DEBUG(10,("[%u]: smbpid = %u, tid = %u, pid = %u, ",
+ DEBUG(10,("[%u]: smbpid = %u, tid = %u, pid = %s, ",
i,
(unsigned int)pls->context.smbpid,
(unsigned int)pls->context.tid,
- (unsigned int)procid_to_pid(&pls->context.pid) ));
+ procid_str(debug_ctx(), &pls->context.pid) ));
DEBUG(10,("start = %.0f, size = %.0f, fnum = %d, %s %s\n",
(double)pls->start,
diff --git a/source/smbd/oplock.c b/source/smbd/oplock.c
index 37747c7..a07d05d 100644
--- a/source/smbd/oplock.c
+++ b/source/smbd/oplock.c
@@ -412,8 +412,9 @@ static void
process_oplock_async_level2_break_message(struct messaging_context *
/* De-linearize incoming message. */
message_to_share_mode_entry(&msg, (char *)data->data);
- DEBUG(10, ("Got oplock async level 2 break message from pid %d:
%s/%lu\n",
- (int)procid_to_pid(&src), file_id_string_tos(&msg.id),
msg.share_file_id));
+ DEBUG(10, ("Got oplock async level 2 break message from pid %s: "
+ "%s/%lu\n", procid_str(debug_ctx(), &src),
+ file_id_string_tos(&msg.id), msg.share_file_id));
fsp = initial_break_processing(msg.id, msg.share_file_id);
@@ -455,7 +456,7 @@ static void
process_oplock_async_level2_break_message(struct messaging_context *
}
/* Need to wait before sending a break message if we sent ourselves
this message. */
- if (procid_to_pid(&src) == sys_getpid()) {
+ if (procid_is_me(&src)) {
wait_before_sending_break();
}
@@ -507,8 +508,9 @@ static void process_oplock_break_message(struct
messaging_context *msg_ctx,
/* De-linearize incoming message. */
message_to_share_mode_entry(&msg, (char *)data->data);
- DEBUG(10, ("Got oplock break message from pid %d: %s/%lu\n",
- (int)procid_to_pid(&src), file_id_string_tos(&msg.id),
msg.share_file_id));
+ DEBUG(10, ("Got oplock break message from pid %s: %s/%lu\n",
+ procid_str(debug_ctx(), &src), file_id_string_tos(&msg.id),
+ msg.share_file_id));
fsp = initial_break_processing(msg.id, msg.share_file_id);
@@ -562,7 +564,7 @@ static void process_oplock_break_message(struct
messaging_context *msg_ctx,
}
/* Need to wait before sending a break message if we sent ourselves
this message. */
- if (procid_to_pid(&src) == sys_getpid()) {
+ if (procid_is_me(&src)) {
wait_before_sending_break();
}
@@ -621,8 +623,8 @@ static void process_kernel_oplock_break(struct
messaging_context *msg_ctx,
pull_file_id_16((char *)data->data, &id);
file_id = (unsigned long)IVAL(data->data, 16);
- DEBUG(10, ("Got kernel oplock break message from pid %d: %s/%u\n",
- (int)procid_to_pid(&src), file_id_string_tos(&id),
+ DEBUG(10, ("Got kernel oplock break message from pid %s: %s/%u\n",
+ procid_str(debug_ctx(), &src), file_id_string_tos(&id),
(unsigned int)file_id));
fsp = initial_break_processing(id, file_id);
@@ -713,9 +715,9 @@ static void process_oplock_break_response(struct
messaging_context *msg_ctx,
/* De-linearize incoming message. */
message_to_share_mode_entry(&msg, (char *)data->data);
- DEBUG(10, ("Got oplock break response from pid %d: %s/%lu mid %u\n",
- (int)procid_to_pid(&src), file_id_string_tos(&msg.id),
msg.share_file_id,
- (unsigned int)msg.op_mid));
+ DEBUG(10, ("Got oplock break response from pid %s: %s/%lu mid %u\n",
+ procid_str(debug_ctx(), &src), file_id_string_tos(&msg.id),
+ msg.share_file_id, (unsigned int)msg.op_mid));
/* Here's the hack from open.c, store the mid in the 'port' field */
schedule_deferred_open_smb_message(msg.op_mid);
@@ -742,8 +744,8 @@ static void process_open_retry_message(struct
messaging_context *msg_ctx,
/* De-linearize incoming message. */
message_to_share_mode_entry(&msg, (char *)data->data);
- DEBUG(10, ("Got open retry msg from pid %d: %s mid %u\n",
- (int)procid_to_pid(&src), file_id_string_tos(&msg.id),
+ DEBUG(10, ("Got open retry msg from pid %s: %s mid %u\n",
+ procid_str(debug_ctx(), &src), file_id_string_tos(&msg.id),
(unsigned int)msg.op_mid));
schedule_deferred_open_smb_message(msg.op_mid);
--
Samba Shared Repository
