Merge branch 'caps_next'

[barrelfish] / usr / monitor / capops / delete.c

diff --git a/usr/monitor/capops/delete.c b/usr/monitor/capops/delete.c
index 444027b..57909c3 100644 (file)
--- a/usr/monitor/capops/delete.c
+++ b/usr/monitor/capops/delete.c
@@ -178,6 +178,18 @@ delete_remote_result__send(struct intermon_binding *b, struct intermon_msg_queue
     errval_t err;
     struct delete_remote_result_msg_st *msg_st = (struct delete_remote_result_msg_st*)e;
     err = intermon_capops_delete_remote_result__tx(b, NOP_CONT, msg_st->status, msg_st->st);
+
+    if (err_no(err) == FLOUNDER_ERR_TX_BUSY) {
+        DEBUG_CAPOPS("%s: got FLOUNDER_ERR_TX_BUSY; requeueing msg.\n", __FUNCTION__);
+        struct intermon_state *inter_st = (struct intermon_state *)b->st;
+        // requeue send request at front and return
+        err = intermon_enqueue_send_at_front(b, &inter_st->queue, b->waitset,
+                                             (struct msg_queue_elem *)e);
+        GOTO_IF_ERR(err, handle_err);
+        return;
+    }
+
+handle_err:
     PANIC_IF_ERR(err, "failed to send delete_remote_result msg");
     free(msg_st);
 }