bmi-flow-logging.patch:
------------
This patch just adds a little bit more gossip logging output to BMI and
the flow protocol. In particular, it adds tag information to messages
about BMI operations, and adds pointer information to the flow protocol
to help match posts and completions of flows in log files.
server-freopen.patch
-------------
This patch just removes duplicate calls to fdreopen(stdin/stdout/stderr)
that were being performed on server startup when the server is run in
the background. The first set should be sufficient.
-Phil
Index: pvfs2_src/src/io/bmi/bmi.c
===================================================================
--- pvfs2_src/src/io/bmi/bmi.c (revision 2088)
+++ pvfs2_src/src/io/bmi/bmi.c (revision 2089)
@@ -516,8 +516,8 @@
int ret = -1;
gossip_debug(GOSSIP_BMI_DEBUG_OFFSETS,
- "BMI_post_recv: addr: %ld, offset: 0x%lx, size: %ld\n",
- (long)src, (long)buffer, (long)expected_size);
+ "BMI_post_recv: addr: %ld, offset: 0x%lx, size: %ld, tag: %d\n",
+ (long)src, (long)buffer, (long)expected_size, (int)tag);
*id = 0;
@@ -554,8 +554,8 @@
int ret = -1;
gossip_debug(GOSSIP_BMI_DEBUG_OFFSETS,
- "BMI_post_send: addr: %ld, offset: 0x%lx, size: %ld\n",
- (long)dest, (long)buffer, (long)size);
+ "BMI_post_send: addr: %ld, offset: 0x%lx, size: %ld, tag: %d\n",
+ (long)dest, (long)buffer, (long)size, (int)tag);
*id = 0;
@@ -592,8 +592,8 @@
int ret = -1;
gossip_debug(GOSSIP_BMI_DEBUG_OFFSETS,
- "BMI_post_sendunexpected: addr: %ld, offset: 0x%lx, size: %ld\n",
- (long)dest, (long)buffer, (long)size);
+ "BMI_post_sendunexpected: addr: %ld, offset: 0x%lx, size: %ld, tag: %d\n",
+ (long)dest, (long)buffer, (long)size, (int)tag);
*id = 0;
@@ -1428,8 +1428,8 @@
int i;
gossip_debug(GOSSIP_BMI_DEBUG_OFFSETS,
- "BMI_post_send_list: addr: %ld, count: %d, total_size: %ld\n",
- (long)dest, list_count, (long)total_size);
+ "BMI_post_send_list: addr: %ld, count: %d, total_size: %ld, tag: %d\n",
+ (long)dest, list_count, (long)total_size, (int)tag);
for(i=0; i<list_count; i++)
{
@@ -1495,8 +1495,8 @@
int i;
gossip_debug(GOSSIP_BMI_DEBUG_OFFSETS,
- "BMI_post_recv_list: addr: %ld, count: %d, total_size: %ld\n",
- (long)src, list_count, (long)total_expected_size);
+ "BMI_post_recv_list: addr: %ld, count: %d, total_size: %ld, tag: %d\n",
+ (long)src, list_count, (long)total_expected_size, (int)tag);
for(i=0; i<list_count; i++)
{
@@ -1561,8 +1561,8 @@
gossip_debug(GOSSIP_BMI_DEBUG_OFFSETS,
"BMI_post_sendunexpected_list: addr: %ld, count: %d, "
- "total_size: %ld\n", (long)dest, list_count,
- (long)total_size);
+ "total_size: %ld, tag: %d\n", (long)dest, list_count,
+ (long)total_size, (int)tag);
for(i=0; i<list_count; i++)
{
Index: pvfs2_src/src/io/flow/flowproto-bmi-trove/flowproto-multiqueue.c
===================================================================
--- pvfs2_src/src/io/flow/flowproto-bmi-trove/flowproto-multiqueue.c (revision 2088)
+++ pvfs2_src/src/io/flow/flowproto-bmi-trove/flowproto-multiqueue.c (revision 2089)
@@ -503,6 +503,9 @@
struct fp_private_data *flow_data = NULL;
int i;
+ gossip_debug(GOSSIP_FLOW_PROTO_DEBUG, "flowproto posting %p\n",
+ flow_d);
+
assert((flow_d->src.endpoint_id == BMI_ENDPOINT &&
flow_d->dest.endpoint_id == TROVE_ENDPOINT) ||
(flow_d->src.endpoint_id == TROVE_ENDPOINT &&
@@ -682,6 +685,8 @@
return(-ENOSYS);
}
+ gossip_debug(GOSSIP_FLOW_PROTO_DEBUG, "flowproto posted %p\n",
+ flow_d);
return (0);
}
Index: pvfs2_src/src/server/pvfs2-server.c
===================================================================
--- pvfs2_src/src/server/pvfs2-server.c (revision 2336)
+++ pvfs2_src/src/server/pvfs2-server.c (revision 2337)
@@ -857,14 +857,6 @@
gossip_debug(GOSSIP_SERVER_DEBUG,
"Initialization completed successfully.\n");
- /* make sure that stdin/stdout/stderr are disconnected */
- if (s_server_options.server_background)
- {
- freopen("/dev/null", "r", stdin);
- freopen("/dev/null", "w", stdout);
- freopen("/dev/null", "w", stderr);
- }
-
return ret;
}
_______________________________________________
Pvfs2-developers mailing list
[email protected]
http://www.beowulf-underground.org/mailman/listinfo/pvfs2-developers
