code review 6501077: runtime: refactor goroutine blocking

src/pkg/runtime/time.goc

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // Time-related runtime and pieces of package time.
 
 package time
 
 #include "runtime.h"
 #include "defs_GOOS_GOARCH.h"
@@ skipping 37 matching lines @@
 // Ready the goroutine e.data.
 static void
 ready(int64 now, Eface e)
 {
         USED(now);
 
         runtime·ready(e.data);
 }
 
 // Put the current goroutine to sleep for ns nanoseconds.
-// The caller must have set g->status and g->waitreason.
 void
 runtime·tsleep(int64 ns, int8 *reason)
 {
         Timer t;
 
         if(ns <= 0)
                 return;
 
         t.when = runtime·nanotime() + ns;
         t.period = 0;
         t.f = ready;
         t.arg.data = g;
         runtime·lock(&timers);
         addtimer(&t);
-        runtime·park((void(*)(void*))runtime·unlock, &timers.Lock, reason);
+        runtime·park(runtime·unlock, &timers, reason);
 }
 
 // Add a timer to the heap and start or kick the timer proc
 // if the new timer is earlier than any of the others.
 static void
 addtimer(Timer *t)
 {
         int32 n;
         Timer **nt;
 
@@ skipping 96 matching lines @@
                         }
                         f = t->f;
                         arg = t->arg;
                         runtime·unlock(&timers);
                         f(now, arg);
                         runtime·lock(&timers);
                 }
                 if(delta < 0) {
                         // No timers left - put goroutine to sleep.
                         timers.rescheduling = true;
-                        runtime·park((void(*)(void*))runtime·unlock, &timers.Lock, "timer goroutine (idle)");
+                        runtime·park(runtime·unlock, &timers, "timer goroutine (idle)");
                         continue;
                 }
                 // At least one timer pending.  Sleep until then.
                 timers.sleeping = true;
                 runtime·noteclear(&timers.waitnote);
                 runtime·unlock(&timers);
                 runtime·entersyscall();
                 runtime·notetsleep(&timers.waitnote, delta);
                 runtime·exitsyscall();
         }
@@ skipping 39 matching lines @@
                 if(t[c]->when >= t[i]->when)
                         break;
                 tmp = t[i];
                 t[i] = t[c];
                 t[c] = tmp;
                 t[i]->i = i;
                 t[c]->i = c;
                 i = c;
         }
 }