From patchwork Thu Dec 1 23:50:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Go patch committed: Remove temporary function Date: Thu, 01 Dec 2011 13:50:49 -0000 From: Ian Taylor X-Patchwork-Id: 128780 Message-Id: To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com I added the function runtime_cond_wait to libgo temporarily during the conversion to multiplexing goroutines. It is no longer needed and this patch removes it. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r 2ce500c576dc libgo/runtime/runtime.h --- a/libgo/runtime/runtime.h Thu Dec 01 10:55:24 2011 -0800 +++ b/libgo/runtime/runtime.h Thu Dec 01 15:41:16 2011 -0800 @@ -337,6 +337,3 @@ #ifdef __rtems__ void __wrap_rtems_task_variable_add(void **); #endif - -/* Temporary. */ -void runtime_cond_wait(pthread_cond_t*, pthread_mutex_t*); diff -r 2ce500c576dc libgo/runtime/thread.c --- a/libgo/runtime/thread.c Thu Dec 01 10:55:24 2011 -0800 +++ b/libgo/runtime/thread.c Thu Dec 01 15:41:16 2011 -0800 @@ -90,27 +90,3 @@ if(sigaltstack(&ss, nil) < 0) *(int *)0xf1 = 0xf1; } - -// Temporary functions, which will be removed when we stop using -// condition variables. - -void -runtime_cond_wait(pthread_cond_t* cond, pthread_mutex_t* mutex) -{ - int i; - - runtime_entersyscall(); - - i = pthread_cond_wait(cond, mutex); - if(i != 0) - runtime_throw("pthread_cond_wait"); - i = pthread_mutex_unlock(mutex); - if(i != 0) - runtime_throw("pthread_mutex_unlock"); - - runtime_exitsyscall(); - - i = pthread_mutex_lock(mutex); - if(i != 0) - runtime_throw("pthread_mutex_lock"); -}