[Ocfs2-commits] mfasheh commits r1768 - trunk/src
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu Jan 13 19:00:48 CST 2005
Author: mfasheh
Date: 2005-01-13 19:00:46 -0600 (Thu, 13 Jan 2005)
New Revision: 1768
Modified:
trunk/src/vote.c
Log:
* make some logging conditional.
Modified: trunk/src/vote.c
===================================================================
--- trunk/src/vote.c 2005-01-13 21:20:28 UTC (rev 1767)
+++ trunk/src/vote.c 2005-01-14 01:00:46 UTC (rev 1768)
@@ -115,7 +115,7 @@
static void ocfs2_process_mount_request(ocfs_super *osb,
unsigned int node_num)
{
- printk("MOUNT vote from node %u\n", node_num);
+ LOG_TRACE_ARGS("MOUNT vote from node %u\n", node_num);
/* The other node only sends us this message when he has an EX
* on the superblock, so our recovery threads (if having been
* launched) are waiting on it.*/
@@ -126,7 +126,7 @@
static void ocfs2_process_umount_request(ocfs_super *osb,
unsigned int node_num)
{
- printk("UMOUNT vote from node %u\n", node_num);
+ LOG_TRACE_ARGS("UMOUNT vote from node %u\n", node_num);
ocfs_node_map_clear_bit(osb, &osb->mounted_map, node_num);
ocfs_node_map_set_bit(osb, &osb->umount_map, node_num);
}
@@ -216,9 +216,9 @@
generation = ntohl(hdr->h_generation);
node_num = ntohl(hdr->h_node_num);
- printk("ocfs2: processing vote: request = %u, blkno = %llu, "
- "generation = %u, node_num = %u\n", request, blkno, generation,
- node_num);
+ LOG_TRACE_ARGS("ocfs2: processing vote: request = %u, blkno = %llu, "
+ "generation = %u, node_num = %u\n", request, blkno,
+ generation, node_num);
vote_response = 0;
@@ -261,8 +261,8 @@
ocfs2_process_dentry_request(inode, rename);
break;
default:
- printk("ocfs2_process_vote: node %u, invalid request: %u\n",
- node_num, request);
+ LOG_ERROR_ARGS("node %u, invalid request: %u\n", node_num,
+ request);
vote_response = -EINVAL;
}
@@ -378,9 +378,9 @@
atomic_read(&osb->wake_vote_task));
atomic_set(&osb->wake_vote_task, 0);
-#ifdef VERBOSE_LOCKING_TRACE
- printk("(%u) vote_thread: awoken\n", current->pid);
-#endif
+
+ LOG_TRACE_STR("vote_thread: awoken");
+
ocfs2_vote_thread_do_work(osb);
spin_lock(&osb->vote_task_lock);
}
@@ -485,6 +485,8 @@
struct inode *remote_node;
int dequeued = 0;
+ LOG_ENTRY();
+
w = ocfs2_new_net_wait_ctxt(osb, response_id);
if (!w) {
status = -ENOMEM;
@@ -497,10 +499,11 @@
ocfs2_queue_net_wait_ctxt(osb, w);
i = ocfs_node_map_iterate(osb, &osb->mounted_map, 0);
- printk("node map iterate: starting at %d, i am %d\n", i, osb->node_num);
+
while (i != OCFS_INVALID_NODE_NUM) {
if (i != osb->node_num) {
- printk("trying to send request to node %i\n", i);
+ LOG_TRACE_ARGS("trying to send request to node %i\n",
+ i);
ocfs_node_map_set_bit(osb, &w->n_node_map, i);
remote_node = nm_get_node_by_num(i);
@@ -519,15 +522,15 @@
&remote_err);
iput(remote_node);
if (status == -ETIMEDOUT) {
- printk("ocfs2: remote node %d timed out!\n",
- i);
+ LOG_TRACE_ARGS("remote node %d timed out!\n",
+ i);
status = -EAGAIN;
goto bail;
}
if (remote_err < 0) {
status = remote_err;
- printk("ocfs2: remote error %d on node %d!\n",
- remote_err, i);
+ LOG_TRACE_ARGS("remote error %d on node %d!\n",
+ remote_err, i);
LOG_ERROR_STATUS(status);
goto bail;
}
@@ -538,9 +541,9 @@
}
i++;
i = ocfs_node_map_iterate(osb, &osb->mounted_map, i);
- printk("node map iterate: next is %d, i am %d\n", i, osb->node_num);
+ LOG_TRACE_ARGS("next is %d, i am %d\n", i, osb->node_num);
}
- printk("done sending, now waiting on responses...\n");
+ LOG_TRACE_STR("done sending, now waiting on responses...");
status = ocfs2_wait_on_vote_responses(osb, w);
if (status < 0) {
@@ -559,6 +562,7 @@
kfree(w);
}
+ LOG_EXIT_STATUS(status);
return status;
}
@@ -729,18 +733,18 @@
node_num = ntohl(resp->r_hdr.h_node_num);
response_status = ntohl(resp->r_response);
- printk("recieved response message:\n");
- printk("h_response_id = %u\n", ntohl(response_id));
- printk("h_request = %u\n", ntohl(resp->r_hdr.h_request));
- printk("h_blkno = %llu\n", be64_to_cpu(resp->r_hdr.h_blkno));
- printk("h_generation = %u\n", ntohl(resp->r_hdr.h_generation));
- printk("h_node_num = %u\n", node_num);
- printk("r_response = %d\n", response_status);
+ LOG_TRACE_STR("recieved response message:");
+ LOG_TRACE_ARGS("h_response_id = %u\n", response_id);
+ LOG_TRACE_ARGS("h_request = %u\n", ntohl(resp->r_hdr.h_request));
+ LOG_TRACE_ARGS("h_blkno = %llu\n", be64_to_cpu(resp->r_hdr.h_blkno));
+ LOG_TRACE_ARGS("h_generation = %u\n", ntohl(resp->r_hdr.h_generation));
+ LOG_TRACE_ARGS("h_node_num = %u\n", node_num);
+ LOG_TRACE_ARGS("r_response = %d\n", response_status);
spin_lock(&osb->net_response_lock);
w = __ocfs2_find_net_wait_ctxt(osb, response_id);
if (!w) {
- printk("request not found!\n");
+ LOG_TRACE_ARGS("request not found!\n");
goto bail;
}
@@ -777,12 +781,13 @@
INIT_LIST_HEAD(&work->w_list);
memcpy(&work->w_msg, msg->buf, sizeof(ocfs2_vote_msg));
- printk("scheduling vote request:\n");
- printk("h_response_id = %u\n", work->w_msg.v_hdr.h_response_id);
- printk("h_request = %u\n", work->w_msg.v_hdr.h_request);
- printk("h_blkno = %llu\n", work->w_msg.v_hdr.h_blkno);
- printk("h_generation = %u\n", work->w_msg.v_hdr.h_generation);
- printk("h_node_num = %u\n", work->w_msg.v_hdr.h_node_num);
+ LOG_TRACE_STR("scheduling vote request:\n");
+ LOG_TRACE_ARGS("h_response_id = %u\n",
+ work->w_msg.v_hdr.h_response_id);
+ LOG_TRACE_ARGS("h_request = %u\n", work->w_msg.v_hdr.h_request);
+ LOG_TRACE_ARGS("h_blkno = %llu\n", work->w_msg.v_hdr.h_blkno);
+ LOG_TRACE_ARGS("h_generation = %u\n", work->w_msg.v_hdr.h_generation);
+ LOG_TRACE_ARGS("h_node_num = %u\n", work->w_msg.v_hdr.h_node_num);
spin_lock(&osb->vote_task_lock);
list_add_tail(&work->w_list, &osb->vote_list);
@@ -870,7 +875,7 @@
/* TODO: net_unregister here! */
if (!list_empty(&osb->net_response_list))
- printk("ocfs2: net response list not empty!\n");
+ LOG_ERROR_STR("net response list not empty!\n");
kfree(osb->net_response_buf);
kfree(osb->net_vote_buf);
More information about the Ocfs2-commits
mailing list