Changeset 6a44ee4 in mainline for uspace/app/taskdump/elf_core.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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.

File:

• uspace/app/taskdump/elf_core.c (modified) (5 diffs)

uspace/app/taskdump/elf_core.c

@@ -62 +62 @@
 #include "include/elf_core.h"
 
-static off64_t align_foff_up(off64_t foff, uintptr_t vaddr, size_t page_size);
-static int write_all(int fd, void *data, size_t len);
-static int write_mem_area(int fd, as_area_info_t *area, int phoneid);
+static off64_t align_foff_up(off64_t, uintptr_t, size_t);
+static int write_all(int, void *, size_t);
+static int write_mem_area(int, as_area_info_t *, async_sess_t *);
 
 #define BUFFER_SIZE 0x1000
@@ -71 +71 @@
 /** Save ELF core file.
  *
- * @param file_name     Name of file to save to.
- * @param ainfo         Array of @a n memory area info structures.
- * @param n             Number of memory areas.
- * @param phoneid       Debugging phone.
- *
- * @return              EOK on sucess, ENOENT if file cannot be created,
- *                      ENOMEM on out of memory, EIO on write error.
- */
-int elf_core_save(const char *file_name, as_area_info_t *ainfo, unsigned int n, int phoneid)
+ * @param file_name Name of file to save to.
+ * @param ainfo     Array of @a n memory area info structures.
+ * @param n         Number of memory areas.
+ * @param sess      Debugging session.
+ *
+ * @return EOK on sucess.
+ * @return ENOENT if file cannot be created.
+ * @return ENOMEM on out of memory.
+ * @return EIO on write error.
+ *
+ */
+int elf_core_save(const char *file_name, as_area_info_t *ainfo, unsigned int n,
+    async_sess_t *sess)
 {
         elf_header_t elf_hdr;
@@ -189 +193 @@
                         return EIO;
                 }
-                if (write_mem_area(fd, &ainfo[i], phoneid) != EOK) {
+                if (write_mem_area(fd, &ainfo[i], sess) != EOK) {
                         printf("Failed writing memory data.\n");
                         free(p_hdr);
@@ -215 +219 @@
 /** Write memory area from application to core file.
  *
- * @param fd            File to write to.
- * @param area          Memory area info structure.
- * @param phoneid       Debugging phone.
- *
- * @return              EOK on success, EIO on failure.
- */
-static int write_mem_area(int fd, as_area_info_t *area, int phoneid)
+ * @param fd   File to write to.
+ * @param area Memory area info structure.
+ * @param sess Debugging session.
+ *
+ * @return EOK on success, EIO on failure.
+ *
+ */
+static int write_mem_area(int fd, as_area_info_t *area, async_sess_t *sess)
 {
         size_t to_copy;
@@ -233 +238 @@
         while (total < area->size) {
                 to_copy = min(area->size - total, BUFFER_SIZE);
-                rc = udebug_mem_read(phoneid, buffer, addr, to_copy);
+                rc = udebug_mem_read(sess, buffer, addr, to_copy);
                 if (rc < 0) {
                         printf("Failed reading task memory.\n");