Changeset 7bdcc45 in mainline for kernel/generic/src/proc

Timestamp:

2010-12-16T16:38:49Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/generic/src/proc

Files:

• program.c (modified) (3 diffs)
• scheduler.c (modified) (1 diff)
• task.c (modified) (8 diffs)
• thread.c (modified) (8 diffs)

kernel/generic/src/proc/program.c

@@ -145 +145 @@
                 
                 program_loader = image_addr;
-                LOG("Registered program loader at 0x%" PRIp,
-                    image_addr);
+                LOG("Registered program loader at %p",
+                    (void *) image_addr);
                 
                 return EOK;
@@ -210 +210 @@
  *
  */
-unative_t sys_program_spawn_loader(char *uspace_name, size_t name_len)
+sysarg_t sys_program_spawn_loader(char *uspace_name, size_t name_len)
 {
         /* Cap length of name and copy it from userspace. */
@@ -219 +219 @@
         int rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         namebuf[name_len] = 0;

kernel/generic/src/proc/scheduler.c

@@ -727 +727 @@
                 irq_spinlock_lock(&cpus[cpu].lock, true);
                 
-                printf("cpu%u: address=%p, nrdy=%ld, needs_relink=%" PRIs "\n",
+                printf("cpu%u: address=%p, nrdy=%" PRIua ", needs_relink=%zu\n",
                     cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy),
                     cpus[cpu].needs_relink);

kernel/generic/src/proc/task.c

@@ -151 +151 @@
         atomic_set(&task->refcount, 0);
         atomic_set(&task->lifecount, 0);
-        atomic_set(&task->active_calls, 0);
         
         irq_spinlock_initialize(&task->lock, "task_t_lock");
@@ -291 +290 @@
 }
 
-/** Syscall for reading task ID from userspace.
- *
- * @param uspace_task_id Userspace address of 8-byte buffer
- *                       where to store current task ID.
+#ifdef __32_BITS__
+
+/** Syscall for reading task ID from userspace (32 bits)
+ *
+ * @param uspace_taskid Pointer to user-space buffer
+ *                      where to store current task ID.
  *
  * @return Zero on success or an error code from @ref errno.h.
  *
  */
-unative_t sys_task_get_id(task_id_t *uspace_task_id)
+sysarg_t sys_task_get_id(sysarg64_t *uspace_taskid)
 {
         /*
@@ -305 +306 @@
          * the lifespan of the task.
          */
-        return (unative_t) copy_to_uspace(uspace_task_id, &TASK->taskid,
+        return (sysarg_t) copy_to_uspace(uspace_taskid, &TASK->taskid,
             sizeof(TASK->taskid));
 }
+
+#endif  /* __32_BITS__ */
+
+#ifdef __64_BITS__
+
+/** Syscall for reading task ID from userspace (64 bits)
+ *
+ * @return Current task ID.
+ *
+ */
+sysarg_t sys_task_get_id(void)
+{
+        /*
+         * No need to acquire lock on TASK because taskid remains constant for
+         * the lifespan of the task.
+         */
+        return TASK->taskid;
+}
+
+#endif  /* __64_BITS__ */
 
 /** Syscall for setting the task name.
@@ -319 +340 @@
  *
  */
-unative_t sys_task_set_name(const char *uspace_name, size_t name_len)
+sysarg_t sys_task_set_name(const char *uspace_name, size_t name_len)
 {
         int rc;
@@ -331 +352 @@
         rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         namebuf[name_len] = '\0';
@@ -478 +499 @@
 #ifdef __32_BITS__
         if (*additional)
-                printf("%-8" PRIu64 " %9lu %7lu", task->taskid,
-                    atomic_get(&task->refcount), atomic_get(&task->active_calls));
+                printf("%-8" PRIu64 " %9" PRIua, task->taskid,
+                    atomic_get(&task->refcount));
         else
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %10p %10p"
@@ -489 +510 @@
 #ifdef __64_BITS__
         if (*additional)
-                printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c %9lu %7lu",
-                    task->taskid, ucycles, usuffix, kcycles, ksuffix,
-                    atomic_get(&task->refcount), atomic_get(&task->active_calls));
+                printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c "
+                    "%9" PRIua, task->taskid, ucycles, usuffix, kcycles,
+                    ksuffix, atomic_get(&task->refcount));
         else
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %18p %18p\n",
@@ -501 +522 @@
                 for (i = 0; i < IPC_MAX_PHONES; i++) {
                         if (task->phones[i].callee)
-                                printf(" %" PRIs ":%p", i, task->phones[i].callee);
+                                printf(" %zu:%p", i, task->phones[i].callee);
                 }
                 printf("\n");

kernel/generic/src/proc/thread.c

@@ -755 +755 @@
  *
  */
-unative_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
+sysarg_t sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name,
     size_t name_len, thread_id_t *uspace_thread_id)
 {
@@ -764 +764 @@
         int rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         namebuf[name_len] = 0;
@@ -779 +779 @@
         if (rc != 0) {
                 free(kernel_uarg);
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         }
         
@@ -804 +804 @@
                                 free(kernel_uarg);
                                 
-                                return (unative_t) rc;
+                                return (sysarg_t) rc;
                          }
                 }
@@ -827 +827 @@
                 free(kernel_uarg);
         
-        return (unative_t) ENOMEM;
+        return (sysarg_t) ENOMEM;
 }
 
@@ -833 +833 @@
  *
  */
-unative_t sys_thread_exit(int uspace_status)
+sysarg_t sys_thread_exit(int uspace_status)
 {
         thread_exit();
@@ -849 +849 @@
  *
  */
-unative_t sys_thread_get_id(thread_id_t *uspace_thread_id)
+sysarg_t sys_thread_get_id(thread_id_t *uspace_thread_id)
 {
         /*
@@ -856 +856 @@
          *
          */
-        return (unative_t) copy_to_uspace(uspace_thread_id, &THREAD->tid,
+        return (sysarg_t) copy_to_uspace(uspace_thread_id, &THREAD->tid,
             sizeof(THREAD->tid));
 }
 
 /** Syscall wrapper for sleeping. */
-unative_t sys_thread_usleep(uint32_t usec)
+sysarg_t sys_thread_usleep(uint32_t usec)
 {
         thread_usleep(usec);