You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2015/05/16 15:46:13 UTC
lucy-clownfish git commit: Fix merge of port_lfreg_to_c_ branch
Repository: lucy-clownfish
Updated Branches:
refs/heads/master 49782425c -> cb85921ee
Fix merge of port_lfreg_to_c_ branch
I accidentally merged version 1 of the branch. This commit applies
the diff to v2.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/cb85921e
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/cb85921e
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/cb85921e
Branch: refs/heads/master
Commit: cb85921eebaa548c9b15a83f4d63e0a8226be7f4
Parents: 4978242
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat May 16 15:43:50 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat May 16 15:43:50 2015 +0200
----------------------------------------------------------------------
compiler/common/charmonizer.c | 2 ++
runtime/common/charmonizer.c | 5 ++---
runtime/common/charmonizer.main | 3 ---
runtime/core/Clownfish/TestHarness/TestUtils.c | 7 +++++--
4 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/cb85921e/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.c b/compiler/common/charmonizer.c
index 5ab031b..7fd724c 100644
--- a/compiler/common/charmonizer.c
+++ b/compiler/common/charmonizer.c
@@ -6499,7 +6499,9 @@ chaz_Headers_probe_posix(void) {
"grp.h",
"pwd.h",
"regex.h",
+ "sched.h",
"sys/stat.h",
+ "sys/time.h",
"sys/times.h",
"sys/types.h",
"sys/utsname.h",
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/cb85921e/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/runtime/common/charmonizer.c b/runtime/common/charmonizer.c
index 16156a2..52e3ae6 100644
--- a/runtime/common/charmonizer.c
+++ b/runtime/common/charmonizer.c
@@ -6499,7 +6499,9 @@ chaz_Headers_probe_posix(void) {
"grp.h",
"pwd.h",
"regex.h",
+ "sched.h",
"sys/stat.h",
+ "sys/time.h",
"sys/times.h",
"sys/types.h",
"sys/utsname.h",
@@ -7902,9 +7904,6 @@ int main(int argc, const char **argv) {
/* Local definitions. */
chaz_ConfWriter_start_module("LocalDefinitions");
- if (chaz_HeadCheck_check_header("sys/time.h")) {
- chaz_ConfWriter_add_def("HAS_SYS_TIME_H", NULL);
- }
if (chaz_HeadCheck_defines_symbol("__sync_bool_compare_and_swap", "")) {
chaz_ConfWriter_add_def("HAS___SYNC_BOOL_COMPARE_AND_SWAP", NULL);
}
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/cb85921e/runtime/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/runtime/common/charmonizer.main b/runtime/common/charmonizer.main
index 35500fc..1f9a453 100644
--- a/runtime/common/charmonizer.main
+++ b/runtime/common/charmonizer.main
@@ -143,9 +143,6 @@ int main(int argc, const char **argv) {
/* Local definitions. */
chaz_ConfWriter_start_module("LocalDefinitions");
- if (chaz_HeadCheck_check_header("sys/time.h")) {
- chaz_ConfWriter_add_def("HAS_SYS_TIME_H", NULL);
- }
if (chaz_HeadCheck_defines_symbol("__sync_bool_compare_and_swap", "")) {
chaz_ConfWriter_add_def("HAS___SYNC_BOOL_COMPARE_AND_SWAP", NULL);
}
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/cb85921e/runtime/core/Clownfish/TestHarness/TestUtils.c
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/TestHarness/TestUtils.c b/runtime/core/Clownfish/TestHarness/TestUtils.c
index 03ce1f8..5c254bd 100644
--- a/runtime/core/Clownfish/TestHarness/TestUtils.c
+++ b/runtime/core/Clownfish/TestHarness/TestUtils.c
@@ -242,9 +242,12 @@ TestUtils_thread_join(Thread *thread) {
}
/******************************** pthreads *********************************/
-#elif !defined(CFISH_NOTHREADS) && defined(CHY_HAS_PTHREAD_H)
+#elif !defined(CFISH_NOTHREADS) \
+ && defined(CHY_HAS_PTHREAD_H) \
+ && defined(CHY_HAS_SCHED_H)
#include <pthread.h>
+#include <sched.h>
struct Thread {
pthread_t pthread;
@@ -287,7 +290,7 @@ TestUtils_thread_create(thread_routine_t routine, void *arg,
void
TestUtils_thread_yield() {
- pthread_yield();
+ sched_yield();
}
void