Commit def7c3c8 authored by Matteo Quintiliani's avatar Matteo Quintiliani

Added option timing_quality


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@1294 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent b19c7cc1
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy * Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it * quintiliani@ingv.it
* *
* $Id: nmxptool_getoptlong.c,v 1.113 2009-08-16 08:58:21 mtheo Exp $ * $Id: nmxptool_getoptlong.c,v 1.114 2009-09-24 04:20:49 mtheo Exp $
* *
*/ */
...@@ -54,6 +54,7 @@ const NMXPTOOL_PARAMS NMXPTOOL_PARAMS_DEFAULT = ...@@ -54,6 +54,7 @@ const NMXPTOOL_PARAMS NMXPTOOL_PARAMS_DEFAULT =
DEFAULT_MAX_TIME_TO_RETRIEVE, DEFAULT_MAX_TIME_TO_RETRIEVE,
DEFAULT_NETWORKDELAY, DEFAULT_NETWORKDELAY,
DEFAULT_LISTEN_PORT, DEFAULT_LISTEN_PORT,
DEFAULT_TIMING_QUALITY,
0, 0,
0, 0,
0, 0,
...@@ -379,6 +380,12 @@ Other arguments:\n\ ...@@ -379,6 +380,12 @@ Other arguments:\n\
#endif #endif
#endif #endif
nmxp_log(NMXP_LOG_NORM_NO, NMXP_LOG_D_ANY, "\
-Q, --timing_quality=TQ This value is used for the functions send_raw*().\n\
TQ is %d or in [%d..%d] (default %d).\n",
DEFAULT_TIMING_QUALITY, DEFAULT_TIMING_QUALITY_MINIMUM, DEFAULT_TIMING_QUALITY_MAXIMUM,
DEFAULT_TIMING_QUALITY);
#ifndef HAVE_WINDOWS_H #ifndef HAVE_WINDOWS_H
nmxp_log(NMXP_LOG_NORM_NO, NMXP_LOG_D_ANY, "\ nmxp_log(NMXP_LOG_NORM_NO, NMXP_LOG_D_ANY, "\
-E, --testport=PORT Accept 'telnet' connection on PORT\n\ -E, --testport=PORT Accept 'telnet' connection on PORT\n\
...@@ -576,6 +583,7 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params) ...@@ -576,6 +583,7 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params)
{"slinkms", required_argument, NULL, 'K'}, {"slinkms", required_argument, NULL, 'K'},
#endif #endif
#endif #endif
{"timing_quality", required_argument, NULL, 'Q'},
#ifndef HAVE_WINDOWS_H #ifndef HAVE_WINDOWS_H
{"socketport", required_argument, NULL, 'E'}, {"socketport", required_argument, NULL, 'E'},
#endif #endif
...@@ -596,6 +604,8 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params) ...@@ -596,6 +604,8 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params)
strcat(optstr, "o:"); strcat(optstr, "o:");
#endif #endif
strcat(optstr, "Q:");
#ifdef HAVE___SRC_SEEDLINK_PLUGIN_C #ifdef HAVE___SRC_SEEDLINK_PLUGIN_C
strcat(optstr, "k:"); strcat(optstr, "k:");
#endif #endif
...@@ -800,6 +810,9 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params) ...@@ -800,6 +810,9 @@ int nmxptool_getopt_long(int argc, char **argv, NMXPTOOL_PARAMS *params)
break; break;
#endif #endif
#endif #endif
case 'Q':
params->timing_quality = atoi(optarg);
break;
#ifndef HAVE_WINDOWS_H #ifndef HAVE_WINDOWS_H
case 'E': case 'E':
...@@ -1012,7 +1025,8 @@ void nmxptool_log_params(NMXPTOOL_PARAMS *params) { ...@@ -1012,7 +1025,8 @@ void nmxptool_log_params(NMXPTOOL_PARAMS *params) {
nmxp_log(NMXP_LOG_NORM_NO, NMXP_LOG_D_EXTRA, "\ nmxp_log(NMXP_LOG_NORM_NO, NMXP_LOG_D_EXTRA, "\
double buffered_time: %f\n\ double buffered_time: %f\n\
char type_writeseed: %c\n\ char type_writeseed: %d\n\
int timing_quality: %d\n\
int flag_listchannels: %d\n\ int flag_listchannels: %d\n\
int flag_listchannelsnaqs: %d\n\ int flag_listchannelsnaqs: %d\n\
int flag_request_channelinfo: %d\n\ int flag_request_channelinfo: %d\n\
...@@ -1025,6 +1039,7 @@ void nmxptool_log_params(NMXPTOOL_PARAMS *params) { ...@@ -1025,6 +1039,7 @@ void nmxptool_log_params(NMXPTOOL_PARAMS *params) {
", ",
params->buffered_time, params->buffered_time,
params->type_writeseed, params->type_writeseed,
params->timing_quality,
params->flag_listchannels, params->flag_listchannels,
params->flag_listchannelsnaqs, params->flag_listchannelsnaqs,
params->flag_request_channelinfo, params->flag_request_channelinfo,
...@@ -1159,6 +1174,13 @@ int nmxptool_check_params(NMXPTOOL_PARAMS *params) { ...@@ -1159,6 +1174,13 @@ int nmxptool_check_params(NMXPTOOL_PARAMS *params) {
nmxp_log(NMXP_LOG_WARN, NMXP_LOG_D_ANY, "<timeoutrecv> ignored since not defined --stc=-1.\n"); nmxp_log(NMXP_LOG_WARN, NMXP_LOG_D_ANY, "<timeoutrecv> ignored since not defined --stc=-1.\n");
} }
if( params->timing_quality != DEFAULT_TIMING_QUALITY &&
( params->timing_quality < DEFAULT_TIMING_QUALITY_MINIMUM || params->timing_quality > DEFAULT_TIMING_QUALITY_MAXIMUM) ) {
ret = -1;
nmxp_log(NMXP_LOG_NORM_NO, NMXP_LOG_D_ANY, "<timing_quality> could be %d or within [%d .. %d].\n",
DEFAULT_TIMING_QUALITY, DEFAULT_TIMING_QUALITY_MINIMUM, DEFAULT_TIMING_QUALITY_MAXIMUM);
}
if(params->usec == 0 && params->n_channel == 0) { if(params->usec == 0 && params->n_channel == 0) {
/* Do nothing */ /* Do nothing */
} else if(params->usec < DEFAULT_USEC_MINIMUM || params->usec > DEFAULT_USEC_MAXIMUM) { } else if(params->usec < DEFAULT_USEC_MINIMUM || params->usec > DEFAULT_USEC_MAXIMUM) {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Istituto Nazionale di Geofisica e Vulcanologia - Italy * Istituto Nazionale di Geofisica e Vulcanologia - Italy
* quintiliani@ingv.it * quintiliani@ingv.it
* *
* $Id: nmxptool_getoptlong.h,v 1.104 2009-02-16 07:50:46 mtheo Exp $ * $Id: nmxptool_getoptlong.h,v 1.105 2009-09-24 04:20:50 mtheo Exp $
* *
*/ */
...@@ -76,6 +76,10 @@ ...@@ -76,6 +76,10 @@
#define DEFAULT_LISTEN_PORT -1 #define DEFAULT_LISTEN_PORT -1
#define DEFAULT_TIMING_QUALITY -1
#define DEFAULT_TIMING_QUALITY_MINIMUM 0
#define DEFAULT_TIMING_QUALITY_MAXIMUM 100
/*! \brief Struct that stores information about parameter of the program */ /*! \brief Struct that stores information about parameter of the program */
typedef struct { typedef struct {
char *hostname; char *hostname;
...@@ -106,6 +110,7 @@ typedef struct { ...@@ -106,6 +110,7 @@ typedef struct {
int32_t max_data_to_retrieve; int32_t max_data_to_retrieve;
int networkdelay; /* sleep 'networkdelay' seconds before reconnect */ int networkdelay; /* sleep 'networkdelay' seconds before reconnect */
int listen_port; /* */ int listen_port; /* */
int timing_quality; /* timing quality parameter for functions send_raw*() */
int flag_listchannels; int flag_listchannels;
int flag_listchannelsnaqs; int flag_listchannelsnaqs;
int flag_request_channelinfo; int flag_request_channelinfo;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment