Commit 639e0616 authored by Matteo Quintiliani's avatar Matteo Quintiliani

Added a parameter to NMXP_MEM_PRINT_PTR()


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@1254 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent c04f7776
...@@ -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.c,v 1.214 2009-05-19 13:43:56 mtheo Exp $ * $Id: nmxptool.c,v 1.215 2009-08-16 07:12:16 mtheo Exp $
* *
*/ */
...@@ -334,7 +334,7 @@ int main (int argc, char **argv) { ...@@ -334,7 +334,7 @@ int main (int argc, char **argv) {
/* Exit only on request */ /* Exit only on request */
while(EXIT_CONDITION) { while(EXIT_CONDITION) {
NMXP_MEM_PRINT_PTR(0); NMXP_MEM_PRINT_PTR(0, 1);
/* Get list of available channels and get a subset list of params.channels */ /* Get list of available channels and get a subset list of params.channels */
if( DAP_CONDITION(params) ) { if( DAP_CONDITION(params) ) {
...@@ -1096,7 +1096,7 @@ int main (int argc, char **argv) { ...@@ -1096,7 +1096,7 @@ int main (int argc, char **argv) {
params.channels = NULL; params.channels = NULL;
} }
NMXP_MEM_PRINT_PTR(1); NMXP_MEM_PRINT_PTR(1, 1);
main_ret = nmxptool_sigcondition_read(); main_ret = nmxptool_sigcondition_read();
nmxptool_sigocondition_destroy(); nmxptool_sigocondition_destroy();
...@@ -1323,7 +1323,7 @@ Channel Ind S SeqNo x-1 nIt lat LastSampleTime ...@@ -1323,7 +1323,7 @@ Channel Ind S SeqNo x-1 nIt lat LastSampleTime
/* Set sigcondition to received signal value */ /* Set sigcondition to received signal value */
static void ShutdownHandler(int sig) { static void ShutdownHandler(int sig) {
NMXP_MEM_PRINT_PTR(0); NMXP_MEM_PRINT_PTR(0, 1);
/* Safe Thread Synchronization */ /* Safe Thread Synchronization */
nmxptool_sigcondition_write(sig); nmxptool_sigcondition_write(sig);
...@@ -1344,7 +1344,7 @@ static void AlarmHandler(int sig) { ...@@ -1344,7 +1344,7 @@ static void AlarmHandler(int sig) {
nmxp_log(NMXP_LOG_WARN, NMXP_LOG_D_ANY, "%s received signal %d!\n", NMXP_LOG_STR(PACKAGE_NAME), sig); nmxp_log(NMXP_LOG_WARN, NMXP_LOG_D_ANY, "%s received signal %d!\n", NMXP_LOG_STR(PACKAGE_NAME), sig);
NMXP_MEM_PRINT_PTR(0); NMXP_MEM_PRINT_PTR(0, 1);
nmxptool_print_info_raw_stream(NULL); nmxptool_print_info_raw_stream(NULL);
} }
......
...@@ -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_listen.c,v 1.8 2008-11-07 22:44:10 mtheo Exp $ * $Id: nmxptool_listen.c,v 1.9 2009-08-16 07:12:16 mtheo Exp $
* *
*/ */
...@@ -231,7 +231,7 @@ int nmxptool_fd_command(int new_fd, int command) { ...@@ -231,7 +231,7 @@ int nmxptool_fd_command(int new_fd, int command) {
switch(command) { switch(command) {
case COMMAND_MEM: case COMMAND_MEM:
snprintf(str_tot_mem, 30, "%d\n", NMXP_MEM_PRINT_PTR(0)); snprintf(str_tot_mem, 30, "%d\n", NMXP_MEM_PRINT_PTR(0, 1));
nmxptool_send_ctrl(new_fd, str_tot_mem); nmxptool_send_ctrl(new_fd, str_tot_mem);
break; break;
......
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