Commit d634cd65 authored by Matteo Quintiliani's avatar Matteo Quintiliani

Optimization for earthworm support


git-svn-id: file:///home/quintiliani/svncopy/nmxptool/trunk@361 3cd66e75-5955-46cb-a940-c26e5fc5497d
parent bfc8e4f3
...@@ -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.70 2007-09-28 09:51:25 mtheo Exp $ * $Id: nmxptool.c,v 1.71 2007-09-28 12:57:21 mtheo Exp $
* *
*/ */
...@@ -23,7 +23,10 @@ ...@@ -23,7 +23,10 @@
#include "config.h" #include "config.h"
#include "nmxptool_getoptlong.h" #include "nmxptool_getoptlong.h"
#ifdef HAVE_EARTHWORMOBJS
#include "nmxptool_ew.h" #include "nmxptool_ew.h"
#endif
#ifdef HAVE_LIBMSEED #ifdef HAVE_LIBMSEED
#include <libmseed.h> #include <libmseed.h>
...@@ -630,6 +633,11 @@ int main (int argc, char **argv) { ...@@ -630,6 +633,11 @@ int main (int argc, char **argv) {
free(channelList_subset); free(channelList_subset);
} }
#ifdef HAVE_EARTHWORMOBJS
tport_detach(&regionOut);
logit("t","%s terminated\n", argv[0]);
#endif
return 0; return 0;
} /* End MAIN */ } /* End MAIN */
......
...@@ -24,14 +24,10 @@ ...@@ -24,14 +24,10 @@
#include <kom.h> #include <kom.h>
#include <transport.h> #include <transport.h>
#include <trace_buf.h> #include <trace_buf.h>
#endif
#include "nmxptool_ew.h" #include "nmxptool_ew.h"
#ifdef HAVE_EARTHWORMOBJS
#define MAXMESSAGELEN 160 /* Maximum length of a status or error */ #define MAXMESSAGELEN 160 /* Maximum length of a status or error */
/* message. */ /* message. */
#define MAXRINGNAMELEN 28 /* Maximum length of a ring name. */ #define MAXRINGNAMELEN 28 /* Maximum length of a ring name. */
...@@ -63,6 +59,11 @@ int heartbeatInt; /* Heartbeat interval (seconds) */ ...@@ -63,6 +59,11 @@ int heartbeatInt; /* Heartbeat interval (seconds) */
int logSwitch; /* 1 -> write log, 0 -> no log */ int logSwitch; /* 1 -> write log, 0 -> no log */
/* 2 -> write module log but not stderr/stdout */ /* 2 -> write module log but not stderr/stdout */
int nmxptool_nxm2ew(NMXP_DATA_PROCESS *pd) {
int ret = 0;
return ret;
}
#endif #endif
...@@ -14,6 +14,17 @@ ...@@ -14,6 +14,17 @@
#ifndef NMXPTOOL_EW_H #ifndef NMXPTOOL_EW_H
#define NMXPTOOL_EW_H 1 #define NMXPTOOL_EW_H 1
#include "nmxp.h"
/* Earthworm includes */
#include <earthworm.h>
#include <kom.h>
#include <transport.h>
#include <trace_buf.h>
extern SHM_INFO regionOut; /* Shared memory region */
int nmxptool_nxm2ew(NMXP_DATA_PROCESS *pd);
#endif #endif
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