[openrtm-commit:01609] r2671 - in branches/RELENG_1_1/OpenRTM-aist: . src/lib/rtm
openrtm @ openrtm.org
openrtm @ openrtm.org
2015年 10月 20日 (火) 11:40:00 JST
Author: n-ando
Date: 2015-10-20 11:40:00 +0900 (Tue, 20 Oct 2015)
New Revision: 2671
Modified:
branches/RELENG_1_1/OpenRTM-aist/
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp
Log:
[merge] r2648,2652,r2670 merged.
Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
- /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592,2605,2653
+ /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592,2605,2648,2652-2653,2670
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2015-10-20 02:30:42 UTC (rev 2670)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2015-10-20 02:40:00 UTC (rev 2671)
@@ -96,7 +96,17 @@
void InPortBase::init(coil::Properties& prop)
{
RTC_TRACE(("init()"));
+ RTC_PARANOID(("given properties:"));
+ RTC_DEBUG_STR((prop));
+
+ // merge properties to PortProfile.properties
m_properties << prop;
+ NVList nv;
+ NVUtil::copyFromProperties(nv, m_properties);
+ CORBA_SeqUtil::push_back_list(m_profile.properties, nv);
+ RTC_PARANOID(("updated properties:"));
+ RTC_DEBUG_STR((m_properties));
+
if (m_singlebuffer)
{
RTC_DEBUG(("single buffer mode."));
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h 2015-10-20 02:30:42 UTC (rev 2670)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPort.h 2015-10-20 02:40:00 UTC (rev 2671)
@@ -238,13 +238,13 @@
result = false;
const char* id(m_connectors[i]->profile().id.c_str());
- RTC::ConnectorProfile prof(findConnProfile(id));
if (ret == CONNECTION_LOST)
{
RTC_WARN(("connection_lost id: %s", id));
if (m_onConnectionLost != 0)
{
+ RTC::ConnectorProfile prof(findConnProfile(id));
(*m_onConnectionLost)(prof);
}
disconnect_ids.push_back(id);
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp 2015-10-20 02:30:42 UTC (rev 2670)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/OutPortBase.cpp 2015-10-20 02:40:00 UTC (rev 2671)
@@ -129,8 +129,11 @@
RTC_PARANOID(("given properties:"));
RTC_DEBUG_STR((prop));
+ // merge properties to PortProfile.properties
m_properties << prop;
-
+ NVList nv;
+ NVUtil::copyFromProperties(nv, m_properties);
+ CORBA_SeqUtil::push_back_list(m_profile.properties, nv);
RTC_PARANOID(("updated properties:"));
RTC_DEBUG_STR((m_properties));
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp 2015-10-20 02:30:42 UTC (rev 2670)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp 2015-10-20 02:40:00 UTC (rev 2671)
@@ -110,7 +110,21 @@
*/
void Logger::header(int level)
{
+ const char* color[] =
+ {
+ "\x1b[0m", // SLILENT (none)
+ "\x1b[0m\x1b[31m", // FATAL (red)
+ "\x1b[0m\x1b[35m", // ERROR (magenta)
+ "\x1b[0m\x1b[33m", // WARN (yellow)
+ "\x1b[0m\x1b[34m", // INFO (blue)
+ "\x1b[0m\x1b[32m", // DEBUG (green)
+ "\x1b[0m\x1b[36m", // TRACE (cyan)
+ "\x1b[0m\x1b[39m", // VERBOSE (default)
+ "\x1b[0m\x1b[37m" // PARANOID (white)
+ };
+ *this << color[level];
*this << getDate() + m_levelString[level] + m_name + ": ";
+ *this << "\x1b[0m";
}
/*!
More information about the openrtm-commit
mailing list