summaryrefslogtreecommitdiff
path: root/thread_pthread.c
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-08 08:52:25 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-08 08:52:25 +0000
commit1816a4a6a994f6437b6b741fa3a84bfb4c827c04 (patch)
treeafaec6f3b0d521d6cf80e4927192021ad2ed6768 /thread_pthread.c
parent847b46145229b083b8c7a09ef0f15b5fc1b32fd5 (diff)
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
Diffstat (limited to 'thread_pthread.c')
-rw-r--r--thread_pthread.c4
1 files changed, 2 insertions, 2 deletions
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 */
});
}
}