rt: Rename rust_scheduler to rust_task_thread

src/rt/rust_util.h

@@ -13,24 +13,24 @@ ptr_vec<T>::ptr_vec(rust_task *task) :
     fill(0),
     data(new (task, "ptr_vec<T>") T*[alloc])
 {
-    I(task->sched, data);
-    DLOG(task->sched, mem, "new ptr_vec(data=0x%" PRIxPTR ") -> 0x%" PRIxPTR,
+    I(task->thread, data);
+    DLOG(task->thread, mem, "new ptr_vec(data=0x%" PRIxPTR ") -> 0x%" PRIxPTR,
          (uintptr_t)data, (uintptr_t)this);
 }
 
 template <typename T>
 ptr_vec<T>::~ptr_vec()
 {
-    I(task->sched, data);
-    DLOG(task->sched, mem, "~ptr_vec 0x%" PRIxPTR ", data=0x%" PRIxPTR,
+    I(task->thread, data);
+    DLOG(task->thread, mem, "~ptr_vec 0x%" PRIxPTR ", data=0x%" PRIxPTR,
          (uintptr_t)this, (uintptr_t)data);
-    I(task->sched, fill == 0);
+    I(task->thread, fill == 0);
     task->free(data);
 }
 
 template <typename T> T *&
 ptr_vec<T>::operator[](size_t offset) {
-    I(task->sched, data[offset]->idx == offset);
+    I(task->thread, data[offset]->idx == offset);
     return data[offset];
 }
 
@@ -38,14 +38,14 @@ template <typename T>
 void
 ptr_vec<T>::push(T *p)
 {
-    I(task->sched, data);
-    I(task->sched, fill <= alloc);
+    I(task->thread, data);
+    I(task->thread, fill <= alloc);
     if (fill == alloc) {
         alloc *= 2;
         data = (T **)task->realloc(data, alloc * sizeof(T*));
-        I(task->sched, data);
+        I(task->thread, data);
     }
-    I(task->sched, fill < alloc);
+    I(task->thread, fill < alloc);
     p->idx = fill;
     data[fill++] = p;
 }
@@ -68,13 +68,13 @@ template <typename T>
 void
 ptr_vec<T>::trim(size_t sz)
 {
-    I(task->sched, data);
+    I(task->thread, data);
     if (sz <= (alloc / 4) &&
         (alloc / 2) >= INIT_SIZE) {
         alloc /= 2;
-        I(task->sched, alloc >= fill);
+        I(task->thread, alloc >= fill);
         data = (T **)task->realloc(data, alloc * sizeof(T*));
-        I(task->sched, data);
+        I(task->thread, data);
     }
 }
 
@@ -83,9 +83,9 @@ void
 ptr_vec<T>::swap_delete(T *item)
 {
     /* Swap the endpoint into i and decr fill. */
-    I(task->sched, data);
-    I(task->sched, fill > 0);
-    I(task->sched, item->idx < fill);
+    I(task->thread, data);
+    I(task->thread, fill > 0);
+    I(task->thread, item->idx < fill);
     fill--;
     if (fill > 0) {
         T *subst = data[fill];
@@ -124,13 +124,13 @@ align_to(T size, size_t alignment) {
 
 // Initialization helper for ISAAC RNG
 
-template <typename sched_or_kernel>
+template <typename thread_or_kernel>
 static inline void
-isaac_init(sched_or_kernel *sched, randctx *rctx)
+isaac_init(thread_or_kernel *thread, randctx *rctx)
 {
         memset(rctx, 0, sizeof(randctx));
 
-        char *rust_seed = sched->env->rust_seed;
+        char *rust_seed = thread->env->rust_seed;
         if (rust_seed != NULL) {
             ub4 seed = (ub4) atoi(rust_seed);
             for (size_t i = 0; i < RANDSIZ; i ++) {
@@ -140,24 +140,24 @@ isaac_init(sched_or_kernel *sched, randctx *rctx)
         } else {
 #ifdef __WIN32__
             HCRYPTPROV hProv;
-            sched->win32_require
+            thread->win32_require
                 (_T("CryptAcquireContext"),
                  CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL,
                                      CRYPT_VERIFYCONTEXT|CRYPT_SILENT));
-            sched->win32_require
+            thread->win32_require
                 (_T("CryptGenRandom"),
                  CryptGenRandom(hProv, sizeof(rctx->randrsl),
                                 (BYTE*)(&rctx->randrsl)));
-            sched->win32_require
+            thread->win32_require
                 (_T("CryptReleaseContext"),
                  CryptReleaseContext(hProv, 0));
 #else
             int fd = open("/dev/urandom", O_RDONLY);
-            I(sched, fd > 0);
-            I(sched,
+            I(thread, fd > 0);
+            I(thread,
               read(fd, (void*) &rctx->randrsl, sizeof(rctx->randrsl))
               == sizeof(rctx->randrsl));
-            I(sched, close(fd) == 0);
+            I(thread, close(fd) == 0);
 #endif
         }