summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-10 08:29:46 (GMT)
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-10 08:29:46 (GMT)
commitb9a13f4962333f08338b9839d1bd9151665ac8aa (patch)
treeede8a4b579633be0a65c242c85e261d0b7ba8851
parenta2e497d5ede45bd4f4a57f494027020d7bd1733b (diff)
* thread_pthread.c (mutex_debug): use exit(EXIT_FAILURE) instad of
exit(1). * thread_pthread.c (add_signal_thread_list): ditto. * thread.c (rb_thread_call_with_gvl): ditto. * util.c (Bug): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--thread.c2
-rw-r--r--thread_pthread.c6
-rw-r--r--util.c2
4 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 54025b3..a7c8b9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Jul 10 17:28:01 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread_pthread.c (mutex_debug): use exit(EXIT_FAILURE) instad of
+ exit(1).
+ * thread_pthread.c (add_signal_thread_list): ditto.
+ * thread.c (rb_thread_call_with_gvl): ditto.
+ * util.c (Bug): ditto.
+
Sun Jul 10 15:58:12 2011 NARUSE, Yui <naruse@ruby-lang.org>
* ext/json: Merge json gem 1.5.4+ (f7f78896607b6f6226cd).
diff --git a/thread.c b/thread.c
index ac72d5d..2da37dc 100644
--- a/thread.c
+++ b/thread.c
@@ -1210,7 +1210,7 @@ rb_thread_call_with_gvl(void *(*func)(void *), void *data1)
*/
fprintf(stderr, "[BUG] rb_thread_call_with_gvl() is called by non-ruby thread\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
brb = (struct rb_blocking_region_buffer *)th->blocking_region_buffer;
diff --git a/thread_pthread.c b/thread_pthread.c
index b353a9e..0cdc220 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -170,9 +170,9 @@ mutex_debug(const char *msg, pthread_mutex_t *lock)
int r;
static pthread_mutex_t dbglock = PTHREAD_MUTEX_INITIALIZER;
- if ((r = pthread_mutex_lock(&dbglock)) != 0) {exit(1);}
+ if ((r = pthread_mutex_lock(&dbglock)) != 0) {exit(EXIT_FAILURE);}
fprintf(stdout, "%s: %p\n", msg, (void *)lock);
- if ((r = pthread_mutex_unlock(&dbglock)) != 0) {exit(1);}
+ if ((r = pthread_mutex_unlock(&dbglock)) != 0) {exit(EXIT_FAILURE);}
}
}
@@ -946,7 +946,7 @@ add_signal_thread_list(rb_thread_t *th)
if (list == 0) {
fprintf(stderr, "[FATAL] failed to allocate memory\n");
- exit(1);
+ exit(EXIT_FAILURE);
}
list->th = th;
diff --git a/util.c b/util.c
index 99532a1..d5cf670 100644
--- a/util.c
+++ b/util.c
@@ -837,7 +837,7 @@ ruby_getcwd(void)
#ifdef DEBUG
#include "stdio.h"
-#define Bug(x) {fprintf(stderr, "%s\n", (x)); exit(1);}
+#define Bug(x) {fprintf(stderr, "%s\n", (x)); exit(EXIT_FAILURE);}
#endif
#include "stdlib.h"