Changeset 368ee04 in mainline for uspace/lib/c/generic/elf/elf_mod.c

Timestamp:

2017-04-05T18:10:39Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (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 from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/lib/c/generic/elf/elf_mod.c (modified) (10 diffs)

uspace/lib/c/generic/elf/elf_mod.c

@@ -44 +44 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
+#include <vfs/vfs.h>
 #include <sys/types.h>
 #include <align.h>
@@ -50 +52 @@
 #include <as.h>
 #include <elf/elf.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <smc.h>
 #include <loader/pcb.h>
 #include <entry_point.h>
+#include <str_error.h>
+#include <stdlib.h>
 
 #include <elf/elf_load.h>
@@ -82 +84 @@
  * pointed to by @a info.
  *
- * @param file_name Path to the ELF file.
+ * @param file      ELF file.
  * @param so_bias   Bias to use if the file is a shared object.
  * @param info      Pointer to a structure for storing information
@@ -90 +92 @@
  *
  */
-int elf_load_file(const char *file_name, size_t so_bias, eld_flags_t flags,
-    elf_finfo_t *info)
+int elf_load_file(int file, size_t so_bias, eld_flags_t flags, elf_finfo_t *info)
 {
         elf_ld_t elf;
 
-        int fd;
-        int rc;
-
-        fd = open(file_name, O_RDONLY);
-        if (fd < 0) {
-                DPRINTF("failed opening file\n");
-                return -1;
-        }
-
-        elf.fd = fd;
+        int ofile = vfs_clone(file, -1, true);
+        int rc = vfs_open(ofile, MODE_READ);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        elf.fd = ofile;
         elf.info = info;
         elf.flags = flags;
@@ -110 +108 @@
         rc = elf_load_module(&elf, so_bias);
 
-        close(fd);
-
+        vfs_put(ofile);
+        return rc;
+}
+
+int elf_load_file_name(const char *path, size_t so_bias, eld_flags_t flags,
+    elf_finfo_t *info)
+{
+        int file = vfs_lookup(path, 0);
+        int rc = elf_load_file(file, so_bias, flags, info);
+        vfs_put(file);
         return rc;
 }
@@ -129 +135 @@
         elf_header_t header_buf;
         elf_header_t *header = &header_buf;
+        aoff64_t pos = 0;
         int i, rc;
 
-        rc = read(elf->fd, header, sizeof(elf_header_t));
+        rc = vfs_read(elf->fd, &pos, header, sizeof(elf_header_t));
         if (rc != sizeof(elf_header_t)) {
                 DPRINTF("Read error.\n"); 
@@ -189 +196 @@
                 elf_segment_header_t segment_hdr;
 
-                /* Seek to start of segment header */
-                lseek(elf->fd, header->e_phoff
-                        + i * sizeof(elf_segment_header_t), SEEK_SET);
-
-                rc = read(elf->fd, &segment_hdr,
+                pos = header->e_phoff + i * sizeof(elf_segment_header_t);
+                rc = vfs_read(elf->fd, &pos, &segment_hdr,
                     sizeof(elf_segment_header_t));
                 if (rc != sizeof(elf_segment_header_t)) {
@@ -211 +215 @@
                 elf_section_header_t section_hdr;
 
-                /* Seek to start of section header */
-                lseek(elf->fd, header->e_shoff
-                    + i * sizeof(elf_section_header_t), SEEK_SET);
-
-                rc = read(elf->fd, &section_hdr,
+                pos = header->e_shoff + i * sizeof(elf_section_header_t);
+                rc = vfs_read(elf->fd, &pos, &section_hdr,
                     sizeof(elf_section_header_t));
                 if (rc != sizeof(elf_section_header_t)) {
@@ -327 +328 @@
         uintptr_t seg_addr;
         size_t mem_sz;
+        aoff64_t pos;
         ssize_t rc;
 
@@ -384 +386 @@
          * Load segment data
          */
-        rc = lseek(elf->fd, entry->p_offset, SEEK_SET);
+        pos = entry->p_offset;
+        rc = vfs_read(elf->fd, &pos, seg_ptr, entry->p_filesz);
         if (rc < 0) {
-                printf("seek error\n");
+                DPRINTF("read error\n");
                 return EE_INVALID;
-        }
-
-/*      rc = read(fd, (void *)(entry->p_vaddr + bias), entry->p_filesz);
-        if (rc < 0) { printf("read error\n"); return EE_INVALID; }*/
-
-        /* Long reads are not possible yet. Load segment piecewise. */
-
-        unsigned left, now;
-        uint8_t *dp;
-
-        left = entry->p_filesz;
-        dp = seg_ptr;
-
-        while (left > 0) {
-                now = 16384;
-                if (now > left) now = left;
-
-                rc = read(elf->fd, dp, now);
-
-                if (rc != (ssize_t) now) { 
-                        DPRINTF("Read error.\n");
-                        return EE_INVALID;
-                }
-
-                left -= now;
-                dp += now;
         }