Changeset 368ee04 in mainline for uspace/app/taskdump/elf_core.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/app/taskdump/elf_core.c (modified) (15 diffs)

uspace/app/taskdump/elf_core.c

@@ -54 +54 @@
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <mem.h>
 #include <stdint.h>
@@ -63 +61 @@
 #include <macros.h>
 #include <libarch/istate.h>
+#include <vfs/vfs.h>
 
 #include "elf_core.h"
 
 static off64_t align_foff_up(off64_t, uintptr_t, size_t);
-static int align_pos(int, size_t);
-static int write_mem_area(int, as_area_info_t *, async_sess_t *);
+static int write_mem_area(int, aoff64_t *, as_area_info_t *, async_sess_t *);
 
 #define BUFFER_SIZE 0x1000
@@ -97 +95 @@
         elf_note_t note;
         size_t word_size;
+        aoff64_t pos = 0;
 
         int fd;
@@ -124 +123 @@
         }
 
-        fd = open(file_name, O_CREAT | O_WRONLY, 0644);
+        fd = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MAY_CREATE,
+            MODE_WRITE);
         if (fd < 0) {
                 printf("Failed opening file.\n");
@@ -207 +207 @@
         }
 
-        rc = write(fd, &elf_hdr, sizeof(elf_hdr));
+        rc = vfs_write(fd, &pos, &elf_hdr, sizeof(elf_hdr));
         if (rc != sizeof(elf_hdr)) {
                 printf("Failed writing ELF header.\n");
@@ -215 +215 @@
 
         for (i = 0; i < n_ph; ++i) {
-                rc = write(fd, &p_hdr[i], sizeof(p_hdr[i]));
+                rc = vfs_write(fd, &pos, &p_hdr[i], sizeof(p_hdr[i]));
                 if (rc != sizeof(p_hdr[i])) {
                         printf("Failed writing program header.\n");
@@ -223 +223 @@
         }
 
-        if (lseek(fd, p_hdr[0].p_offset, SEEK_SET) == (off64_t) -1) {
-                printf("Failed writing memory data.\n");
-                free(p_hdr);
-                return EIO;
-        }
+        pos = p_hdr[0].p_offset;
 
         /*
@@ -236 +232 @@
         note.type = NT_PRSTATUS;
 
-        rc = write(fd, &note, sizeof(elf_note_t));
+        rc = vfs_write(fd, &pos, &note, sizeof(elf_note_t));
         if (rc != sizeof(elf_note_t)) {
                 printf("Failed writing note header.\n");
@@ -243 +239 @@
         }
 
-        rc = write(fd, "CORE", note.namesz);
+        rc = vfs_write(fd, &pos, "CORE", note.namesz);
         if (rc != (ssize_t) note.namesz) {
                 printf("Failed writing note header.\n");
@@ -250 +246 @@
         }
 
-        rc = align_pos(fd, word_size);
-        if (rc != EOK) {
-                printf("Failed writing note header.\n");
-                free(p_hdr);
-                return EIO;
-        }
-
-        rc = write(fd, &pr_status, sizeof(elf_prstatus_t));
+        pos = ALIGN_UP(pos, word_size);
+
+        rc = vfs_write(fd, &pos, &pr_status, sizeof(elf_prstatus_t));
         if (rc != sizeof(elf_prstatus_t)) {
                 printf("Failed writing register data.\n");
@@ -265 +256 @@
 
         for (i = 1; i < n_ph; ++i) {
-                if (lseek(fd, p_hdr[i].p_offset, SEEK_SET) == (off64_t) -1) {
-                        printf("Failed writing memory data.\n");
-                        free(p_hdr);
-                        return EIO;
-                }
-                if (write_mem_area(fd, &ainfo[i - 1], sess) != EOK) {
+                pos = p_hdr[i].p_offset;
+                if (write_mem_area(fd, &pos, &ainfo[i - 1], sess) != EOK) {
                         printf("Failed writing memory data.\n");
                         free(p_hdr);
@@ -297 +284 @@
  *
  * @param fd   File to write to.
+ * @param pos  Pointer to the position to write to.
  * @param area Memory area info structure.
  * @param sess Debugging session.
@@ -303 +291 @@
  *
  */
-static int write_mem_area(int fd, as_area_info_t *area, async_sess_t *sess)
+static int write_mem_area(int fd, aoff64_t *pos, as_area_info_t *area,
+    async_sess_t *sess)
 {
         size_t to_copy;
@@ -321 +310 @@
                 }
 
-                rc = write(fd, buffer, to_copy);
+                rc = vfs_write(fd, pos, buffer, to_copy);
                 if (rc != (ssize_t) to_copy) {
                         printf("Failed writing memory contents.\n");
@@ -334 +323 @@
 }
 
-static int align_pos(int fd, size_t align)
-{
-        off64_t cur_pos;
-        size_t rem, adv;
-
-        cur_pos = lseek(fd, 0, SEEK_CUR);
-        if (cur_pos < 0)
-                return -1;
-
-        rem = cur_pos % align;
-        adv = align - rem;
-
-        cur_pos = lseek(fd, adv, SEEK_CUR);
-        if (cur_pos < 0)
-                return -1;
-
-        return EOK;
-}
-
 /** @}
  */