T322: multihoptest: Clean up page table cap late to avoid deleting receiver's copy

Closes T322.

Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>

diff --git a/usr/tests/multihoptest/multihoptest.c b/usr/tests/multihoptest/multihoptest.c
index 287a6ea..ea9f1cd 100644 (file)
--- a/usr/tests/multihoptest/multihoptest.c
+++ b/usr/tests/multihoptest/multihoptest.c
@@ -131,9 +131,6 @@ static void send_cont(void *arg)
         err = cap_destroy(myst->cap1);
         assert(err_is_ok(err));
 
-        err = cap_destroy(myst->cap2);
-        assert(err_is_ok(err));
-
         // send a "buffer"
         err = test_buf__tx(b, txcont, (uint8_t *) longstr, strlen(longstr));
         break;
@@ -141,6 +138,12 @@ static void send_cont(void *arg)
     case 4:
         // here is where we would deallocate the buffer, if it wasn't static
         printf("%s all done!\n", get_role_name());
+
+        // Clean up page table cap late as it is not moveable and deleting it
+        // to early will delete the receiver's copy as well! -SG,2016-11-07
+        err = cap_destroy(myst->cap2);
+        assert(err_is_ok(err));
+
         return;
 
     default:
@@ -199,7 +202,6 @@ static void rx_str(struct test_binding *b, uint32_t arg, char *s)
 static void rx_caps(struct test_binding *b, uint32_t arg, struct capref cap1,
         struct capref cap2)
 {
-
     // make sure we received the correct argument(s)
     if (arg != 69) {
         USER_PANIC("received wrong argument in \"caps\" message!\n");