Changeset c78c296 in rtems-libbsd

Timestamp:

Jul 15, 2016, 9:39:48 AM (4 years ago)

Author:

Christian Mauderer <Christian.Mauderer@…>

Branches:

4.11

Children:

87d0cda

Parents:

110dbd0

git-author:

Christian Mauderer <Christian.Mauderer@…> (07/15/16 09:39:48)

git-committer:

Sebastian Huber <sebastian.huber@…> (08/03/16 12:13:18)

Message:

rtemsbsd: Add call to program with a data restore

This adds the rtems_bsd_program_call_main_width_data_restore function.

Files:

• rtemsbsd/include/machine/rtems-bsd-program.h (modified) (1 diff)
• rtemsbsd/rtems/rtems-bsd-program.c (modified) (1 diff)
• testsuite/program01/test_main.c (modified) (4 diffs)

rtemsbsd/include/machine/rtems-bsd-program.h

@@ -54 +54 @@
     int argc, char **argv);
 
+int
+rtems_bsd_program_call_main_with_data_restore(const char *name,
+    int (*main)(int, char **), int argc, char **argv,
+    const void *data_buf, const size_t data_size);
+
 void
 rtems_bsd_program_exit(int exit_code) __dead2;

rtemsbsd/rtems/rtems-bsd-program.c

@@ -200 +200 @@
 }
 
+int
+rtems_bsd_program_call_main_with_data_restore(const char *name,
+    int (*main)(int, char **), int argc, char **argv,
+    const void *data_buf, const size_t data_size)
+{
+        int exit_code = EXIT_FAILURE;
+        void *savebuf;
+
+        savebuf = malloc(data_size, M_TEMP, 0);
+        if(savebuf == NULL) {
+                errno = ENOMEM;
+                exit_code = EXIT_FAILURE;
+        } else {
+                memcpy(savebuf, data_buf, data_size);
+                exit_code = rtems_bsd_program_call_main(name, main, argc,
+                    argv);
+                memcpy(data_buf, savebuf, data_size);
+                free(savebuf, M_TEMP);
+        }
+
+        return exit_code;
+}
+
 static struct mtx program_mtx;
 

testsuite/program01/test_main.c

@@ -171 +171 @@
 }
 
+#define OVERWRITE_CONTENT       "Some test pattern"
+#define OVERWRITE_AFTER_RESTORE "xxxxxtestxxxxxxxx"
+#define OVERWRITE_RESTORE_FIRST (5)
+#define OVERWRITE_RESTORE_SIZE (4)
+static const char overwrite_compare[] = OVERWRITE_AFTER_RESTORE;
+static char overwrite_me[] = OVERWRITE_CONTENT;
+
+static int
+overwrite_main(int argc, char **argv)
+{
+        size_t len = strlen(overwrite_me);
+        memset(overwrite_me, 'x', len);
+        assert(strcmp(overwrite_me, overwrite_compare) != 0);
+        errno = 0;
+        rtems_bsd_program_exit(1012);
+}
+
 static void
 test_bsd_program(void)
@@ -197 +214 @@
         rtems_workspace_greedy_free(greedy);
 
+        assert(rtems_resource_snapshot_check(&snapshot));
+
         errno = 0;
         exit_code = rtems_bsd_program_call_main(prog_name, NULL, 1, invalid_argv);
         assert(errno == EFAULT);
         assert(exit_code == EXIT_FAILURE);
+
+        assert(rtems_resource_snapshot_check(&snapshot));
 
         errno = EINVAL;
@@ -208 +229 @@
         assert(strcmp(rtems_bsd_program_get_name(), "?") == 0);
         assert(rtems_bsd_program_get_context() == NULL);
+
+        assert(rtems_resource_snapshot_check(&snapshot));
 
         errno = EINVAL;
@@ -218 +241 @@
 
         assert(rtems_resource_snapshot_check(&snapshot));
+
+        exit_code = rtems_bsd_program_call_main_with_data_restore(prog_name,
+            overwrite_main, some_argc, some_argv,
+            overwrite_me + OVERWRITE_RESTORE_FIRST, OVERWRITE_RESTORE_SIZE);
+        assert(errno == 0);
+        assert(exit_code == 1012);
+        assert(strcmp(rtems_bsd_program_get_name(), "?") == 0);
+        assert(rtems_bsd_program_get_context() == NULL);
+        assert(strcmp(overwrite_me, overwrite_compare) == 0);
+
+        assert(rtems_resource_snapshot_check(&snapshot));
 }