Use procid_str in debug messages for better cluster-debuggability

(cherry picked from commit d5bec253f7494dd74cce3acf59ddd417900e5ad3)

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index aa522ac7801ebc77f34c51f0760f9bfaa28be9ab..be2948c53113fd51218595c0d9e80b3ff02c6f7e 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/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/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 22870283fa5996d2e519096ca8ba319d7ea7f144..00e78dcaae496f7f854a5825b99f3df061121f24 100644 (file)
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -376,8 +376,9 @@ void process_oplock_async_level2_break_message(struct messaging_context *msg_ctx
        /* 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);
 
@@ -472,8 +473,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);
 
@@ -586,8 +588,8 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx,
        pull_file_id_24((char *)data->data, &id);
        file_id = (unsigned long)IVAL(data->data, 24);
 
-       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);
@@ -688,9 +690,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);
@@ -717,8 +719,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);