Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update semaphore and EcexutionContext. #970

Merged
merged 2 commits into from
Apr 8, 2016

Conversation

snozawa
Copy link
Contributor

@snozawa snozawa commented Apr 7, 2016

2つのコミットをまとめました。

以上よろしくお願いいたします。

…cpp,h], rtc/StateHolder/StateHolder.[cpp,h]] Use semaphore.h instead of interprocess_semaphore because we do not use interprocess_semaphore specific functionality. On old OS, interprocess_semaphore cannot be used (boost version <= 1.35.0). This commit is related with the discussion : fkanehiro#969
@k-okada
Copy link
Contributor

k-okada commented Apr 7, 2016

Refer to this link for build results (access rights to CI server needed):
http://jenkins.jsk.imi.i.u-tokyo.ac.jp:8080/job/hrpsys-qnx/2578/

Build Log
last 10 lines

[...truncated 8466 lines...]
    at org.jenkinsci.plugins.ghprb.GhprbRepository.createCommitStatus(GhprbRepository.java:122)
    at org.jenkinsci.plugins.ghprb.GhprbBuilds.onCompleted(GhprbBuilds.java:118)
    at org.jenkinsci.plugins.ghprb.GhprbBuildListener.onCompleted(GhprbBuildListener.java:27)
    at org.jenkinsci.plugins.ghprb.GhprbBuildListener.onCompleted(GhprbBuildListener.java:12)
    at hudson.model.listeners.RunListener.fireCompleted(RunListener.java:202)
    at hudson.model.Run.execute(Run.java:1783)
    at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
    at hudson.model.ResourceController.execute(ResourceController.java:98)
    at hudson.model.Executor.run(Executor.java:410)

Test FAILed.

…rocessing time if ENABLE_DEBUG_PRINT is true. Update print message for processing time. Move QNX ifdef for fprintf to header file.
@k-okada
Copy link
Contributor

k-okada commented Apr 7, 2016

Refer to this link for build results (access rights to CI server needed):
http://jenkins.jsk.imi.i.u-tokyo.ac.jp:8080/job/hrpsys-qnx/2579/

Build Log
last 10 lines

[...truncated 7156 lines...]
    at org.jenkinsci.plugins.ghprb.GhprbRepository.createCommitStatus(GhprbRepository.java:122)
    at org.jenkinsci.plugins.ghprb.GhprbBuilds.onCompleted(GhprbBuilds.java:118)
    at org.jenkinsci.plugins.ghprb.GhprbBuildListener.onCompleted(GhprbBuildListener.java:27)
    at org.jenkinsci.plugins.ghprb.GhprbBuildListener.onCompleted(GhprbBuildListener.java:12)
    at hudson.model.listeners.RunListener.fireCompleted(RunListener.java:202)
    at hudson.model.Run.execute(Run.java:1783)
    at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
    at hudson.model.ResourceController.execute(ResourceController.java:98)
    at hudson.model.Executor.run(Executor.java:410)

Test FAILed.

@snozawa
Copy link
Contributor Author

snozawa commented Apr 7, 2016

すいません、一度閉じsます

@snozawa snozawa closed this Apr 7, 2016
@snozawa
Copy link
Contributor Author

snozawa commented Apr 8, 2016

一旦OPENしますが、まだマージなさらないようお願いいたします。

@snozawa snozawa reopened this Apr 8, 2016
@k-okada
Copy link
Contributor

k-okada commented Apr 8, 2016

Refer to this link for build results (access rights to CI server needed):
http://jenkins.jsk.imi.i.u-tokyo.ac.jp:8080/job/hrpsys-qnx/2580/

Build Log
last 10 lines

[...truncated 8586 lines...]
    at org.jenkinsci.plugins.ghprb.GhprbRepository.createCommitStatus(GhprbRepository.java:122)
    at org.jenkinsci.plugins.ghprb.GhprbBuilds.onCompleted(GhprbBuilds.java:118)
    at org.jenkinsci.plugins.ghprb.GhprbBuildListener.onCompleted(GhprbBuildListener.java:27)
    at org.jenkinsci.plugins.ghprb.GhprbBuildListener.onCompleted(GhprbBuildListener.java:12)
    at hudson.model.listeners.RunListener.fireCompleted(RunListener.java:202)
    at hudson.model.Run.execute(Run.java:1783)
    at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
    at hudson.model.ResourceController.execute(ResourceController.java:98)
    at hudson.model.Executor.run(Executor.java:410)

Test FAILed.

@snozawa
Copy link
Contributor Author

snozawa commented Apr 8, 2016

こちら確認おわりましたので、お手すきのときにmergeをお願いできますと助かります。

@fkanehiro fkanehiro merged commit 93ea359 into fkanehiro:master Apr 8, 2016
@snozawa snozawa deleted the update_sem_ec branch April 8, 2016 05:08
@snozawa
Copy link
Contributor Author

snozawa commented Apr 8, 2016

ありがとうございました。

(以下ロボット体内で前つかってたdiffのメモ)

diff --git a/lib/util/Hrpsys.h b/lib/util/Hrpsys.h
index af98c12..9717ddc 100644
--- a/lib/util/Hrpsys.h
+++ b/lib/util/Hrpsys.h
@@ -7,6 +7,9 @@
  * $Id$
  */

+#ifndef __HRPSYS_H__
+#define __HRPSYS_H__
+
 #ifdef __QNX__
 #include <cmath>
 #include <cstdlib>
@@ -34,3 +37,29 @@ using std::cos;
 using std::atan2;
 using std::sqrt;
 #endif
+#if BOOST_VERSION > 014200
+#include <boost/interprocess/sync/interprocess_semaphore.hpp>
+#else
+#include <semaphore.h>
+namespace boost {
+  namespace interprocess {
+    class interprocess_semaphore {
+    public:
+      sem_t s;
+      interprocess_semaphore(int n) {
+        sem_init(&s, 0, 0);
+      }
+      ~interprocess_semaphore() {
+      }
+      int wait() {
+        sem_wait(&s);
+      }
+      int post() {
+        sem_post(&s);
+      }
+    };
+  };
+};
+#endif
+
+#endif //__HRPSYS_H__

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants