diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-08 08:52:25 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-08 08:52:25 +0000 |
commit | 1816a4a6a994f6437b6b741fa3a84bfb4c827c04 (patch) | |
tree | afaec6f3b0d521d6cf80e4927192021ad2ed6768 | |
parent | 847b46145229b083b8c7a09ef0f15b5fc1b32fd5 (diff) | |
download | ruby-1816a4a6a994f6437b6b741fa3a84bfb4c827c04.tar.gz |
revert r31474. we cann't call xmalloc under FGLOCK.
Thansk, nagachika-san.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31479 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | thread_pthread.c | 4 |
2 files changed, 2 insertions, 9 deletions
@@ -10,13 +10,6 @@ Sun May 8 16:56:19 2011 Tadayoshi Funaba <tadf@dotrb.org> * ext/date/date_core.c (date_s_test_*): use macros. -Sun May 8 10:54:06 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> - - * thread_pthread.c (add_signal_thread_list): use xmalloc instead - of malloc. - * thread_pthread.c (remove_signal_thread_list): use xfree instead - of free. - Sun May 8 10:24:16 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * thread_pthread.c: cleanup signal_thread_list related ifdef. diff --git a/thread_pthread.c b/thread_pthread.c index f8c19c0835..466fe36009 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -897,7 +897,7 @@ add_signal_thread_list(rb_thread_t *th) if (!th->native_thread_data.signal_thread_list) { FGLOCK(&signal_thread_list_lock, { struct signal_thread_list *list = - xmalloc(sizeof(struct signal_thread_list)); + malloc(sizeof(struct signal_thread_list)); if (list == 0) { fprintf(stderr, "[FATAL] failed to allocate memory\n"); @@ -932,7 +932,7 @@ remove_signal_thread_list(rb_thread_t *th) } th->native_thread_data.signal_thread_list = 0; list->th = 0; - xfree(list); /* ok */ + free(list); /* ok */ }); } } |