Changeset 9286475 in mainline

Timestamp:

2018-10-11T13:52:08Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

8fefd8b

Parents:

63a045c

Message:

Set task name to full path instead of just the base name

This eliminates the guesswork it takes to determine path to the binary.
It is a stopgap measure. Eventually we want a better solution.

Files:

• abi/include/abi/sysinfo.h (modified) (1 diff)
• uspace/app/taskdump/taskdump.c (modified) (1 diff)
• uspace/lib/c/generic/loader.c (modified) (2 diffs)

abi/include/abi/sysinfo.h

@@ -46 +46 @@
 
 /** Maximum name sizes */
-#define TASK_NAME_BUFLEN  20
+#define TASK_NAME_BUFLEN  64
 #define EXC_NAME_BUFLEN   20
 

uspace/app/taskdump/taskdump.c

@@ -405 +405 @@
 static void autoload_syms(void)
 {
-        char *file_name;
-        errno_t rc;
-        int ret;
-
         assert(app_name != NULL);
         assert(app_symtab == NULL);
 
-        ret = asprintf(&file_name, "/app/%s", app_name);
-        if (ret < 0) {
-                printf("Memory allocation failure.\n");
-                exit(1);
-        }
-
-        rc = symtab_load(file_name, &app_symtab);
-        if (rc == EOK) {
-                printf("Loaded symbol table from %s\n", file_name);
-                free(file_name);
+        if (app_name[0] != '/') {
+                printf("Task name is not path. Can't autoload symbol table.\n");
                 return;
         }
 
-        free(file_name);
-
-        ret = asprintf(&file_name, "/srv/%s", app_name);
-        if (ret < 0) {
-                printf("Memory allocation failure.\n");
-                exit(1);
-        }
-
-        rc = symtab_load(file_name, &app_symtab);
-        if (rc == EOK) {
-                printf("Loaded symbol table from %s\n", file_name);
-                free(file_name);
+        errno_t rc = symtab_load(app_name, &app_symtab);
+        if (rc != EOK) {
+                printf("Failed autoloading symbol table: %s\n",
+                    str_error_name(rc));
                 return;
         }
 
-        ret = asprintf(&file_name, "/drv/%s/%s", app_name, app_name);
-        if (ret < 0) {
-                printf("Memory allocation failure.\n");
-                exit(1);
-        }
-
-        rc = symtab_load(file_name, &app_symtab);
-        if (rc == EOK) {
-                printf("Loaded symbol table from %s\n", file_name);
-                free(file_name);
-                return;
-        }
-
-        free(file_name);
-        printf("Failed autoloading symbol table.\n");
+        printf("Loaded symbol table from %s\n", app_name);
 }
 

uspace/lib/c/generic/loader.c

@@ -189 +189 @@
 errno_t loader_set_program_path(loader_t *ldr, const char *path)
 {
-        const char *name = str_rchr(path, '/');
-        if (name == NULL) {
-                name = path;
-        } else {
-                name++;
-        }
+        size_t abslen;
+        char *abspath = vfs_absolutize(path, &abslen);
+        if (!abspath)
+                return ENOMEM;
 
         int fd;
@@ -202 +200 @@
         }
 
-        rc = loader_set_program(ldr, name, fd);
+        rc = loader_set_program(ldr, path, fd);
         vfs_put(fd);
         return rc;