summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2011-04-06 12:54:25 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2011-04-06 12:54:25 +0000
commit91268fa8050d42e0d1d5a4a0e1419b3afd935fd6 (patch)
treec2ca8cad1c1a7ba61f30b0494c680a4f341db2b8
parent5b7e1c6409e5fc0e8f25f7bc3e994a6cbf708f31 (diff)
downloadATCD-91268fa8050d42e0d1d5a4a0e1419b3afd935fd6.tar.gz
Wed Apr 6 12:53:57 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* dance/Logger/Logger_Service.h: * dance/Logger/Logger_Service.cpp: * tools/Logger_Backend/ndds/Log_Backend.cpp: * tools/Logger_Backend/ndds/Log_Record.idl: * tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml: Deleted trailing whitespace.
-rw-r--r--DAnCE/ChangeLog18
-rw-r--r--DAnCE/dance/Logger/Logger_Service.cpp8
-rw-r--r--DAnCE/dance/Logger/Logger_Service.h2
-rw-r--r--DAnCE/tools/Logger_Backend/ndds/Log_Backend.cpp14
-rw-r--r--DAnCE/tools/Logger_Backend/ndds/Log_Record.idl2
-rw-r--r--DAnCE/tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml2
6 files changed, 28 insertions, 18 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index f160a0212dc..1559cc54484 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,8 +1,18 @@
+Wed Apr 6 12:53:57 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
+
+ * dance/Logger/Logger_Service.h:
+ * dance/Logger/Logger_Service.cpp:
+ * tools/Logger_Backend/ndds/Log_Backend.cpp:
+ * tools/Logger_Backend/ndds/Log_Record.idl:
+ * tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml:
+
+ Deleted trailing whitespace.
+
Wed Apr 6 01:17:10 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* MPC/config/dance_deployment_stub.mpb:
- Link in the logger, as it's used by some files in this project.
+ Link in the logger, as it's used by some files in this project.
* dance/ExecutionManager/Execution_Manager.cpp:
* dance/LocalityManager/Daemon/Locality_Manager_Task.cpp:
@@ -11,11 +21,11 @@ Wed Apr 6 01:17:10 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
Initialize the ORB before the logger, so dynamic services from
svc.conf are available to the logger.
-
+
* dance/Logger/Logger_Service.h:
* dance/Logger/Logger_Service.cpp:
- Log backends can now be loaded from dynamic services from svc.conf.
+ Log backends can now be loaded from dynamic services from svc.conf.
DANCE_LOG_BACKEND will specify the name of the dynamic service. See
the below svc.conf file for an example.
@@ -24,7 +34,7 @@ Wed Apr 6 01:17:10 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml:
* tools/Logger_Backend/ndds/svc.conf:
- Bugfixes, expanded capabilities.
+ Bugfixes, expanded capabilities.
Tue Apr 5 13:27:22 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
diff --git a/DAnCE/dance/Logger/Logger_Service.cpp b/DAnCE/dance/Logger/Logger_Service.cpp
index a3354498ae1..7c04e79c9d7 100644
--- a/DAnCE/dance/Logger/Logger_Service.cpp
+++ b/DAnCE/dance/Logger/Logger_Service.cpp
@@ -90,15 +90,15 @@ namespace DAnCE
ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER);
ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
}
-
+
if (this->backend_.length () > 0)
{
ACE_Log_Msg_Backend* logger_be =
ACE_Dynamic_Service<ACE_Log_Msg_Backend>::instance(this->backend_.c_str ());
-
+
// backend->open ("");
-
+
if (logger_be == 0)
{
DANCE_ERROR (DANCE_LOG_EMERGENCY,
@@ -110,7 +110,7 @@ namespace DAnCE
}
ACE_Log_Msg::msg_backend (logger_be);
-
+
ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER);
ACE_LOG_MSG->set_flags (ACE_Log_Msg::CUSTOM);
}
diff --git a/DAnCE/dance/Logger/Logger_Service.h b/DAnCE/dance/Logger/Logger_Service.h
index b70323a5d9b..aa12248166a 100644
--- a/DAnCE/dance/Logger/Logger_Service.h
+++ b/DAnCE/dance/Logger/Logger_Service.h
@@ -16,7 +16,7 @@ namespace DAnCE
static int Initializer (void);
private:
void parse_args (int argc, ACE_TCHAR **argv);
-
+
ACE_TString filename_;
ACE_TString backend_;
bool trace_;
diff --git a/DAnCE/tools/Logger_Backend/ndds/Log_Backend.cpp b/DAnCE/tools/Logger_Backend/ndds/Log_Backend.cpp
index 07cf0512616..5e10000f027 100644
--- a/DAnCE/tools/Logger_Backend/ndds/Log_Backend.cpp
+++ b/DAnCE/tools/Logger_Backend/ndds/Log_Backend.cpp
@@ -34,9 +34,9 @@ namespace DAnCE
opts.long_option (ACE_TEXT ("domain"), 'd', ACE_Get_Opt::ARG_REQUIRED);
opts.long_option (ACE_TEXT ("qos-file"), 'q', ACE_Get_Opt::ARG_REQUIRED);
opts.long_option (ACE_TEXT ("node-name"), 'n', ACE_Get_Opt::ARG_REQUIRED);
-
+
int c = 0;
-
+
while ((c = opts ()) != -1)
{
switch (c)
@@ -48,22 +48,22 @@ namespace DAnCE
case 'd':
this->domain_ = ACE_OS::atoi (opts.opt_arg ());
break;
-
+
case 'q':
this->qos_file_ = opts.opt_arg ();
break;
-
+
case 'n':
this->node_ = opts.opt_arg ();
break;
-
+
default:
ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unknown option for NDDS_Log_Backend: %s\n"),
opts.last_option ()));
}
}
-
+
return this->open (ACE_TEXT (""));
}
@@ -113,7 +113,7 @@ namespace DAnCE
}
DDS_ReturnCode_t retval;
-
+
retval = Log_RecordTypeSupport::register_type (this->participant_,
Log_RecordTypeSupport::get_type_name ());
diff --git a/DAnCE/tools/Logger_Backend/ndds/Log_Record.idl b/DAnCE/tools/Logger_Backend/ndds/Log_Record.idl
index 7fc63d01a3a..27a35244efc 100644
--- a/DAnCE/tools/Logger_Backend/ndds/Log_Record.idl
+++ b/DAnCE/tools/Logger_Backend/ndds/Log_Record.idl
@@ -16,7 +16,7 @@ module DAnCE
string node;
/// The process ID of the node.
- long pid;
+ long pid;
/// The log priority of the message
unsigned long priority;
diff --git a/DAnCE/tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml b/DAnCE/tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml
index 9f2486cf61f..74e033166eb 100644
--- a/DAnCE/tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml
+++ b/DAnCE/tools/Logger_Backend/ndds/USER_QOS_PROFILES.xml
@@ -17,7 +17,7 @@
<kind>KEEP_LAST_HISTORY_QOS</kind>
<depth>50</depth>
</history>
-
+
<durability>
<kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
</durability>