This patch just adds a new command line argument to pvfs2-client
(--logstamp) that allows you to set the type of timestamp that gets
prefixed to each log message. It accepts the same values as the
pvfs2-server config files do (none, usec, or datetime).
-Phil
---------------------
PatchSet 337
Date: 2005/12/07 21:37:58
Author: dmethe
Branch: HEAD
Tag: (none)
Log:
Added command line options for --logstamp. Changed init script to use datetime as logstamp
Members:
src/apps/kernel/linux/pvfs2-client-core.c:1.25->1.26
src/apps/kernel/linux/pvfs2-client.c:1.12->1.13
Index: src/apps/kernel/linux/pvfs2-client-core.c
diff -u src/apps/kernel/linux/pvfs2-client-core.c:1.25 src/apps/kernel/linux/pvfs2-client-core.c:1.26
--- src/apps/kernel/linux/pvfs2-client-core.c:1.25 Tue Dec 6 13:46:30 2005
+++ src/apps/kernel/linux/pvfs2-client-core.c Wed Dec 7 14:37:58 2005
@@ -94,6 +94,8 @@
unsigned int perf_time_interval_secs;
unsigned int perf_history_size;
char* gossip_mask;
+ int logstamp_type;
+ int logstamp_type_set;
} options_t;
/*
@@ -2557,6 +2559,10 @@
debug_mask = PVFS_debug_eventlog_to_mask(s_opts.gossip_mask);
}
+ if(s_opts.logstamp_type_set)
+ {
+ gossip_set_logstamp(s_opts.logstamp_type);
+ }
/*
initialize pvfs system interface
@@ -2747,6 +2753,8 @@
printf("--acache-reclaim-percentage=LIMIT acache reclaim percentage\n");
printf("--perf-time-interval-secs=SECONDS length of perf counter intervals\n");
printf("--perf-history-size=VALUE number of perf counter intervals to maintain\n");
+ printf("--logfile=VALUE override the default log file\n");
+ printf("--logstamp=none|usec|datetime overrides the default log message's time stamp\n");
printf("--gossip-mask=MASK_LIST gossip logging mask\n");
}
@@ -2765,6 +2773,7 @@
{"acache-hard-limit",1,0,0},
{"acache-soft-limit",1,0,0},
{"logfile",1,0,0},
+ {"logstamp",1,0,0},
{0,0,0,0}
};
@@ -2792,6 +2801,28 @@
{
goto do_logfile;
}
+ else if (strcmp("logstamp", cur_option) == 0)
+ {
+ if(strcmp(optarg, "none") == 0)
+ {
+ opts->logstamp_type = GOSSIP_LOGSTAMP_NONE;
+ }
+ else if(strcmp(optarg, "usec") == 0)
+ {
+ opts->logstamp_type = GOSSIP_LOGSTAMP_USEC;
+ }
+ else if(strcmp(optarg, "datetime") == 0)
+ {
+ opts->logstamp_type = GOSSIP_LOGSTAMP_DATETIME;
+ }
+ else
+ {
+ fprintf(stderr, "Error: invalid logstamp value. See usage below\n\n");
+ print_help(argv[0]);
+ exit(EXIT_FAILURE);
+ }
+ opts->logstamp_type_set = 1;
+ }
else if (strcmp("acache-hard-limit", cur_option) == 0)
{
ret = sscanf(optarg, "%u", &opts->acache_hard_limit);
Index: src/apps/kernel/linux/pvfs2-client.c
diff -u src/apps/kernel/linux/pvfs2-client.c:1.12 src/apps/kernel/linux/pvfs2-client.c:1.13
--- src/apps/kernel/linux/pvfs2-client.c:1.12 Tue Nov 29 12:46:08 2005
+++ src/apps/kernel/linux/pvfs2-client.c Wed Dec 7 14:37:58 2005
@@ -45,6 +45,7 @@
char *gossip_mask;
char *path;
char *logfile;
+ char *logstamp;
} options_t;
static void client_sig_handler(int signum);
@@ -303,6 +304,12 @@
arg_list[arg_index+1] = opts->gossip_mask;
arg_index+=2;
}
+ if(opts->logstamp)
+ {
+ arg_list[arg_index] = "--logstamp";
+ arg_list[arg_index+1] = opts->logstamp;
+ arg_index+=2;
+ }
ret = execvp(opts->path, arg_list);
@@ -358,6 +365,7 @@
{"perf-history-size",1,0,0},
{"gossip-mask",1,0,0},
{"path",1,0,0},
+ {"logstamp",1,0,0},
{0,0,0,0}
};
@@ -399,6 +407,10 @@
{
goto do_logfile;
}
+ else if (strcmp("logstamp", cur_option) == 0)
+ {
+ opts->logstamp = optarg;
+ }
else if (strcmp("acache-hard-limit", cur_option) == 0)
{
opts->acache_hard_limit = optarg;
_______________________________________________
Pvfs2-developers mailing list
[email protected]
http://www.beowulf-underground.org/mailman/listinfo/pvfs2-developers
