Project

General

Profile

バグ #2637

KEK版OpenRTMのパッチを反映させる

Added by n-ando almost 8 years ago. Updated almost 8 years ago.

Status:
終了
Priority:
通常
Assignee:
n-ando
Target version:
-
Start date:
04/15/2013
Due date:
% Done:

100%

Estimated time:

Description

以下のKEK版パッチが存在する

  • OpenRTM-aist-r1971-InPort.h.patch
  • OpenRTM-aist-r1971-Makefile.am.patch
  • OpenRTM-aist-r1971-RingBuffer.h.patch
  • OpenRTM-aist-r1971-Routing.cpp.patch
  • OpenRTM-aist-r1971-SimpleService-Makefile.am.patch
  • OpenRTM-aist-r1971-coil-posix-Condition.h.patch

対象はOpenRTM-aist-1.0.0-RELEASE
これらについて調査し、本家のコードにパッチを当てる。

Associated revisions

Revision 2381 (diff)
Added by n-ando almost 8 years ago

[compat,header] Now InPort has getStatus()/getStatusList() functions. refs #2637

Revision 2381 (diff)
Added by n-ando almost 8 years ago

[compat,header] Now InPort has getStatus()/getStatusList() functions. refs #2637

Revision 2382 (diff)
Added by n-ando almost 8 years ago

[compat,bugfix] pclose() is not called in Linux code. refs #2637

Revision 2382 (diff)
Added by n-ando almost 8 years ago

[compat,bugfix] pclose() is not called in Linux code. refs #2637

Revision 2383 (diff)
Added by n-ando almost 8 years ago

[compat] Condition::wait() wait time calculation became more precise. refs #2637

Revision 2383 (diff)
Added by n-ando almost 8 years ago

[compat] Condition::wait() wait time calculation became more precise. refs #2637

History

#1 Updated by n-ando almost 8 years ago

  • % Done changed from 0 to 10

OpenRTM-aist-r1971-InPort.h.patch

OutPort同様、InPortにもgetStatus()/getStatusList()関数を持たせる修正。
r2381にてtrunkにコミット。

#2 Updated by n-ando almost 8 years ago

  • % Done changed from 10 to 20

OpenRTM-aist-r1971-Makefile.am.patch

トップレベルのMakefile.amにて、docs以下をビルドしないように修正

-SUBDIRS = build src utils examples etc docs win32
+SUBDIRS = build src utils examples etc win32

実際、docs以下はmake dist時しかdoxygenが呼び出されない。
OpenRTM-aistにおいてmake dist時にドキュメント生成をしない、という選択肢はないので現状のまま。

#3 Updated by n-ando almost 8 years ago

  • % Done changed from 20 to 30

OpenRTM-aist-r1971-RingBuffer.h.patch

  • advanceWptr() の if文の括弧：trunk->済,
  • write() の Guard前後の中括弧とempty: trunk->済, RELEASE_1_1_0->済、RELENG_1_0->済
  • read() の Guard前後の中括弧とfull: trunk->済, RELEASE_1_1_0->済、RELENG_1_0->済

ただし、パッチにはないwrite()にGuard eguard(m_empty.mutex);がread()にGuard fguard(m_full.mutex);が追加されている。

#4 Updated by n-ando almost 8 years ago

OpenRTM-aist-r1971-Routing.cpp.patch

Routing.cpp でLinux用のコード中でpcloseを呼び忘れている箇所あり。r2382にて修正。

#5 Updated by n-ando almost 8 years ago

  • % Done changed from 30 to 40

#6 Updated by n-ando almost 8 years ago

  • % Done changed from 40 to 50

OpenRTM-aist-r1971-SimpleService-Makefile.am.patch

ALL_SRC =                    \
-       $(IDL_SOURCES)       \
         $(PROVIDER_COMP_SRC) \
         $(CONSUMER_COMP_SRC)

ALL_SRCからIDL_SOURCESを削除。RELENG_1_0, RELEASE_1_1_0, trunkいずれも修正済み

#7 Updated by n-ando almost 8 years ago

  • % Done changed from 50 to 100

OpenRTM-aist-r1971-coil-posix-Condition.h.patch

タイムアウト時間の計算をより正確になるように修正。 r2383

#8 Updated by n-ando almost 8 years ago

  • Status changed from 新規 to 終了

Also available in: Atom PDF