Merge branch 'milestone/monitoring' into jennifer/request_id

[trust_router.git] / tid / tids.c

diff --git a/tid/tids.c b/tid/tids.c
index a11f48b..9b9d51f 100644 (file)
--- a/tid/tids.c
+++ b/tid/tids.c
@@ -80,6 +80,12 @@ static TID_RESP *tids_create_response(TALLOC_CTX *mem_ctx, TID_REQ *req)
       goto cleanup;
     }
   }
+  if (req->request_id) {
+    if (NULL == (resp->request_id = tr_dup_name(req->request_id))) {
+      tr_crit("tids_create_response: Error allocating fields in response.");
+      goto cleanup;
+    }
+  }
 
   success=1;
 
@@ -442,6 +448,17 @@ int tids_accept(TIDS_INSTANCE *tids, int listen)
   return 0;
 }
 
+/**
+ * Clean up any finished TID request processes
+ *
+ * This is called by the main process after forking each TID request. If you want to be
+ * sure finished processes are cleaned up promptly even during a lull in TID requests,
+ * this can be called from the main thread of the main process. It is not thread-safe,
+ * so should not be used from sub-threads. It should not be called by child processes -
+ * this would probably be harmless but ineffective.
+ *
+ * @param tids
+ */
 void tids_sweep_procs(TIDS_INSTANCE *tids)
 {
   guint ii;