From a0a2e7c02956ff7a0ea42cf112548dbaa81c97a7 Mon Sep 17 00:00:00 2001 From: nshankar Date: Fri, 19 Jan 2007 18:53:24 +0000 Subject: Fri Jan 19 18:52:36 UTC 2007 Nishanth Shankaran --- ChangeLog | 14 ++++++ Monitor/Central_Monitor/Interface.idl | 25 ----------- Monitor/Central_Monitor/Interface_stub_export.h | 58 ------------------------- Monitor/Central_Monitor/Interface_svnt_export.h | 58 ------------------------- Monitor/Central_Monitor/Monitor.idl | 20 ++++----- Monitor/Central_Monitor/Monitor.mpc | 58 ++++++++++++------------- Monitor/Local_Monitor/Local_Monitor.h | 2 +- Monitor/Local_Monitor/Local_Monitor.mpc | 2 +- 8 files changed, 54 insertions(+), 183 deletions(-) delete mode 100644 Monitor/Central_Monitor/Interface.idl delete mode 100644 Monitor/Central_Monitor/Interface_stub_export.h delete mode 100644 Monitor/Central_Monitor/Interface_svnt_export.h diff --git a/ChangeLog b/ChangeLog index 34fac6c6703..af5c42dac46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Fri Jan 19 18:52:36 UTC 2007 Nishanth Shankaran + + * Monitor/Central_Monitor/Monitor.idl: + * Monitor/Central_Monitor/Monitor.mpc: + * Monitor/Local_Monitor/Local_Monitor.h: + * Monitor/Local_Monitor/Local_Monitor.mpc: Updated these files to + fix compilation errors on linux. + + * Monitor/Central_Monitor/Interface.idl: + * Monitor/Central_Monitor/Interface_stub_export.h: + * Monitor/Central_Monitor/Interface_svnt_export.h: + + Removed these files. + Fri Jan 19 17:53:23 UTC 2007 Nishanth Shankaran * Monitor/Central_Monitor/Interface.idl: diff --git a/Monitor/Central_Monitor/Interface.idl b/Monitor/Central_Monitor/Interface.idl deleted file mode 100644 index 8c4308fd451..00000000000 --- a/Monitor/Central_Monitor/Interface.idl +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef RACE_MONITOR_INTERFACE_IDL -#define RACE_MONITOR_INTERFACE_IDL - -module CIAO -{ - module RACE - { - typedef sequence Delays; - - interface Execution_Time_Monitor - { - exception IdNotFound - { - }; - - oneway void push_delays (in string id, in Delays delay); - - Delays get_delays (in string id) raises (IdNotFound); - }; - - }; - -}; - -#endif /*RACE_MONITOR_INTERFACE_IDL*/ diff --git a/Monitor/Central_Monitor/Interface_stub_export.h b/Monitor/Central_Monitor/Interface_stub_export.h deleted file mode 100644 index 4905ff57eff..00000000000 --- a/Monitor/Central_Monitor/Interface_stub_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl INTERFACE_STUB -// ------------------------------ -#ifndef INTERFACE_STUB_EXPORT_H -#define INTERFACE_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (INTERFACE_STUB_HAS_DLL) -# define INTERFACE_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && INTERFACE_STUB_HAS_DLL */ - -#if !defined (INTERFACE_STUB_HAS_DLL) -# define INTERFACE_STUB_HAS_DLL 1 -#endif /* ! INTERFACE_STUB_HAS_DLL */ - -#if defined (INTERFACE_STUB_HAS_DLL) && (INTERFACE_STUB_HAS_DLL == 1) -# if defined (INTERFACE_STUB_BUILD_DLL) -# define INTERFACE_STUB_Export ACE_Proper_Export_Flag -# define INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* INTERFACE_STUB_BUILD_DLL */ -# define INTERFACE_STUB_Export ACE_Proper_Import_Flag -# define INTERFACE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* INTERFACE_STUB_BUILD_DLL */ -#else /* INTERFACE_STUB_HAS_DLL == 1 */ -# define INTERFACE_STUB_Export -# define INTERFACE_STUB_SINGLETON_DECLARATION(T) -# define INTERFACE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* INTERFACE_STUB_HAS_DLL == 1 */ - -// Set INTERFACE_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (INTERFACE_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define INTERFACE_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define INTERFACE_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !INTERFACE_STUB_NTRACE */ - -#if (INTERFACE_STUB_NTRACE == 1) -# define INTERFACE_STUB_TRACE(X) -#else /* (INTERFACE_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define INTERFACE_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (INTERFACE_STUB_NTRACE == 1) */ - -#endif /* INTERFACE_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/Monitor/Central_Monitor/Interface_svnt_export.h b/Monitor/Central_Monitor/Interface_svnt_export.h deleted file mode 100644 index a9d743497b8..00000000000 --- a/Monitor/Central_Monitor/Interface_svnt_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl INTERFACE_SVNT -// ------------------------------ -#ifndef INTERFACE_SVNT_EXPORT_H -#define INTERFACE_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (INTERFACE_SVNT_HAS_DLL) -# define INTERFACE_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && INTERFACE_SVNT_HAS_DLL */ - -#if !defined (INTERFACE_SVNT_HAS_DLL) -# define INTERFACE_SVNT_HAS_DLL 1 -#endif /* ! INTERFACE_SVNT_HAS_DLL */ - -#if defined (INTERFACE_SVNT_HAS_DLL) && (INTERFACE_SVNT_HAS_DLL == 1) -# if defined (INTERFACE_SVNT_BUILD_DLL) -# define INTERFACE_SVNT_Export ACE_Proper_Export_Flag -# define INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* INTERFACE_SVNT_BUILD_DLL */ -# define INTERFACE_SVNT_Export ACE_Proper_Import_Flag -# define INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* INTERFACE_SVNT_BUILD_DLL */ -#else /* INTERFACE_SVNT_HAS_DLL == 1 */ -# define INTERFACE_SVNT_Export -# define INTERFACE_SVNT_SINGLETON_DECLARATION(T) -# define INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* INTERFACE_SVNT_HAS_DLL == 1 */ - -// Set INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (INTERFACE_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define INTERFACE_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define INTERFACE_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !INTERFACE_SVNT_NTRACE */ - -#if (INTERFACE_SVNT_NTRACE == 1) -# define INTERFACE_SVNT_TRACE(X) -#else /* (INTERFACE_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (INTERFACE_SVNT_NTRACE == 1) */ - -#endif /* INTERFACE_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/Monitor/Central_Monitor/Monitor.idl b/Monitor/Central_Monitor/Monitor.idl index 9c1a6719c0b..a8b071677fe 100644 --- a/Monitor/Central_Monitor/Monitor.idl +++ b/Monitor/Central_Monitor/Monitor.idl @@ -2,24 +2,24 @@ #define RACE_MONITOR_IDL #include -#include "RACE/Monitor/Central_Monitor/Interface.idl" +//#include "RACE/Monitor/Central_Monitor/Interface.idl" module CIAO { module RACE { -// typedef sequence Delays; + typedef sequence Delays; -// interface Execution_Time_Monitor -// { -// exception IdNotFound -// { -// }; + interface Execution_Time_Monitor + { + exception IdNotFound + { + }; -// oneway void push_delays (in string id, in Delays delay); + oneway void push_delays (in string id, in Delays delay); -// Delays get_delays (in string id) raises (IdNotFound); -// }; + Delays get_delays (in string id) raises (IdNotFound); + }; component Central_Monitor { diff --git a/Monitor/Central_Monitor/Monitor.mpc b/Monitor/Central_Monitor/Monitor.mpc index 8c13d200169..85b421cea59 100644 --- a/Monitor/Central_Monitor/Monitor.mpc +++ b/Monitor/Central_Monitor/Monitor.mpc @@ -1,47 +1,45 @@ -project(Monitor_Interface_stub): taolib_with_idl { +// project(Monitor_Interface_stub): taolib_with_idl { - sharedname = Monitor_Interface_stub - idlflags -= -GT - idlflags += -St \ - -Wb,stub_export_macro=INTERFACE_STUB_Export \ - -Wb,stub_export_include=Interface_stub_export.h \ - -Wb,skel_export_macro=INTERFACE_SVNT_Export \ - -Wb,skel_export_include=Interface_svnt_export.h - dynamicflags = INTERFACE_STUB_BUILD_DLL +// sharedname = Monitor_Interface_stub +// idlflags -= -GT +// idlflags += -St \ +// -Wb,stub_export_macro=INTERFACE_STUB_Export \ +// -Wb,stub_export_include=Interface_stub_export.h \ +// -Wb,skel_export_macro=INTERFACE_SVNT_Export \ +// -Wb,skel_export_include=Interface_svnt_export.h +// dynamicflags = INTERFACE_STUB_BUILD_DLL - IDL_Files { - Interface.idl - } +// IDL_Files { +// Interface.idl +// } - Source_Files { - InterfaceC.cpp - } -} -project(Monitor_Interface_svnt): taolib_with_idl, portableserver { +// Source_Files { +// InterfaceC.cpp +// } +// } +// project(Monitor_Interface_svnt): taolib_with_idl, portableserver { - after += Monitor_Interface_stub - sharedname = Monitor_Interface_svnt - libs += Monitor_Interface_stub +// after += Monitor_Interface_stub +// sharedname = Monitor_Interface_svnt +// libs += Monitor_Interface_stub - dynamicflags = INTERFACE_SVNT_BUILD_DLL +// dynamicflags = INTERFACE_SVNT_BUILD_DLL - IDL_Files { - } +// IDL_Files { +// } - Source_Files { - InterfaceS.cpp - } -} +// Source_Files { +// InterfaceS.cpp +// } +// } project(Monitor_stub): ciao_client_dnc { - after += Monitor_stub sharedname = Monitor_stub idlflags += -Wb,stub_export_macro=MONITOR_STUB_Export \ -Wb,stub_export_include=Monitor_stub_export.h \ -Wb,skel_export_macro=MONITOR_SVNT_Export \ -Wb,skel_export_include=Monitor_svnt_export.h - libs += Monitor_Interface_stub dynamicflags = MONITOR_STUB_BUILD_DLL IDL_Files { @@ -56,7 +54,7 @@ project(Monitor_stub): ciao_client_dnc { project(Monitor_svnt) : ciao_servant_dnc { after += Monitor_stub sharedname = Monitor_svnt - libs += Monitor_Interface_stub Monitor_Interface_svnt Monitor_stub + libs += Monitor_stub idlflags += -Wb,export_macro=MONITOR_SVNT_Export \ -Wb,export_include=Monitor_svnt_export.h diff --git a/Monitor/Local_Monitor/Local_Monitor.h b/Monitor/Local_Monitor/Local_Monitor.h index 24a000427fa..4971b80545d 100644 --- a/Monitor/Local_Monitor/Local_Monitor.h +++ b/Monitor/Local_Monitor/Local_Monitor.h @@ -6,7 +6,7 @@ #include "ace/Mutex.h" #include "ace/High_Res_Timer.h" #include "orbsvcs/Naming/Naming_Server.h" -#include "RACE/Monitor/Central_Monitor/InterfaceC.h" +#include "RACE/Monitor/Central_Monitor/MonitorC.h" #include "Local_Monitor_export.h" namespace CIAO diff --git a/Monitor/Local_Monitor/Local_Monitor.mpc b/Monitor/Local_Monitor/Local_Monitor.mpc index 0f4c36e733e..8be736fee6e 100644 --- a/Monitor/Local_Monitor/Local_Monitor.mpc +++ b/Monitor/Local_Monitor/Local_Monitor.mpc @@ -1,7 +1,7 @@ project(Local_Monitor): ciao_client_dnc, naming, ciao_race_default, portableserver{ sharedname = Local_Monitor after += Monitor_stub - libs += Monitor_Interface_stub Monitor_stub + libs += Monitor_stub dynamicflags = LOCAL_MONITOR_BUILD_DLL -- cgit v1.2.1