WebSVN – HelenOS – Diff – /branches/network/kernel/generic/src/proc/program.c

 /** Create a program using an existing address space.
+ *
  * @param as        Address space containing a binary program image.
  * @param entry_addr    Program entry-point address in program address space.
+ * @param name      Name to set for the program's task.
  * @param p     Buffer for storing program information.
  */
-void program_create(as_t *as, uintptr_t entry_addr, program_t *p)
+void program_create(as_t *as, uintptr_t entry_addr, char *name, program_t *p)
+{
     as_area_t *a;
     uspace_arg_t *kernel_uarg;
     kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0);
     kernel_uarg->uspace_stack = (void *) USTACK_ADDRESS;
     kernel_uarg->uspace_thread_function = NULL;
     kernel_uarg->uspace_thread_arg = NULL;
     kernel_uarg->uspace_uarg = NULL;
-    p->task = task_create(as, "app");
+    p->task = task_create(as, name);
     ASSERT(p->task);
     /*
      * Create the data as_area.
      */
  * If the image belongs to a program loader, it is registered as such,
  * (and *task is set to NULL). Otherwise a task is created from the
  * executable image. The task is returned in *task.
+ *
  * @param image_addr    Address of an executable program image.
+ * @param name      Name to set for the program's task.
  * @param p     Buffer for storing program info. If image_addr
  *          points to a loader image, p->task will be set to
  *          NULL and EOK will be returned.
+ *
  * @return EOK on success or negative error code.
  */
-int program_create_from_image(void *image_addr, program_t *p)
+int program_create_from_image(void *image_addr, char *name, program_t *p)
+{
     as_t *as;
     unsigned int rc;
     as = as_create(0);
         printf("Registered program loader at 0x%" PRIp "\n",
             image_addr);
         return EOK;
+    }
-    program_create(as, ((elf_header_t *) image_addr)->e_entry, p);
+    program_create(as, ((elf_header_t *) image_addr)->e_entry, name, p);
     return EOK;
+}
 /** Create a task from the program loader image.
+ *
  * @param p Buffer for storing program info.
+ * @param name  Name to set for the program's task.
+ *
  * @return EOK on success or negative error code.
  */
-int program_create_loader(program_t *p)
+int program_create_loader(program_t *p, char *name)
+{
     as_t *as;
     unsigned int rc;
     void *loader;
     if (rc != EE_OK) {
         as_destroy(as);
         return ENOENT;
+    }
-    program_create(as, ((elf_header_t *) program_loader)->e_entry, p);
+    program_create(as, ((elf_header_t *) program_loader)->e_entry,
+        name, p);
     return EOK;
+}
 /** Make program ready.
     thread_ready(p->main_thread);
+}
 /** Syscall for creating a new loader instance from userspace.
+ *
- * Creates a new task from the program loader image, connects a phone
+ * Creates a new task from the program loader image and sets
- * to it and stores the phone id into the provided buffer.
+ * the task name.
+ *
- * @param uspace_phone_id Userspace address where to store the phone id.
+ * @param name          Name to set on the new task (typically the same
+ *              as the command used to execute it).
+ *
  * @return 0 on success or an error code from @ref errno.h.
  */
-unative_t sys_program_spawn_loader(int *uspace_phone_id)
+unative_t sys_program_spawn_loader(char *uspace_name, size_t name_len)
+{
     program_t p;
-    int fake_id;
     int rc;
-    int phone_id;
-    fake_id = 0;
+    char namebuf[TASK_NAME_BUFLEN];
-    /* Before we even try creating the task, see if we can write the id */
+    /* Cap length of name and copy it from userspace. */
-    rc = (unative_t) copy_to_uspace(uspace_phone_id, &fake_id,
-        sizeof(fake_id));
-    if (rc != 0)
-        return rc;
-    phone_id = phone_alloc();
+    if (name_len > TASK_NAME_BUFLEN - 1)
-    if (phone_id < 0)
-        return ELIMIT;
+        name_len = TASK_NAME_BUFLEN - 1;
-    rc = program_create_loader(&p);
+    rc = copy_from_uspace(namebuf, uspace_name, name_len);
     if (rc != 0)
-        return rc;
+        return (unative_t) rc;
+    namebuf[name_len] = '\0';
-    phone_connect(phone_id, &p.task->answerbox);
+    /* Spawn the new task. */
-    /* No need to aquire lock before task_ready() */
+    rc = program_create_loader(&p, namebuf);
-    rc = (unative_t) copy_to_uspace(uspace_phone_id, &phone_id,
-        sizeof(phone_id));
-    if (rc != 0) {
+    if (rc != 0)
-        /* Ooops */
-        ipc_phone_hangup(&TASK->phones[phone_id]);
-        task_kill(p.task->taskid);
         return rc;
-    }
     // FIXME: control the capabilities
     cap_set(p.task, cap_get(TASK));
     program_ready(&p);

Subversion Repositories HelenOS

(root)/branches/network/kernel/generic/src/proc/program.c – Rev 3386 → 4153