DynamoRIO · derekbruening · Aug 28, 2025 · Aug 28, 2025 · Aug 28, 2025 · Aug 28, 2025
diff --git a/api/docs/release.dox b/api/docs/release.dox
@@ -136,9 +136,15 @@ changes:
 The changes between version \DR_VERSION and 11.3.0 include the following minor
 compatibility changes:
 
- - Added drmgr_register_filter_syscall_event() and
-   drmgr_register_filter_syscall_event_user_data() which are required to be used
-   instead of dr_register_filter_syscall_event() when using drmgr.
+ - Added drmgr_register_exit_event(), drmgr_unregister_exit_event(),
+   drmgr_register_exit_event_user_data(), and drmgr_unregister_exit_event_user_data(),
+   which are required to be used instead of dr_register_exit_event() when using drmgr
+   and provide priorities and user data to the exit event.
+ - Added drmgr_register_filter_syscall_event(), drmgr_unregister_filter_syscall_event(),
+   drmgr_register_filter_syscall_event_user_data(), and
+   drmgr_unregister_filter_syscall_event_user_data(), which are required to be used
+   instead of dr_register_filter_syscall_event() when using drmgr and provide
+   priorities and user data to the filter event.
  - Added a separate cache replacement policy object to `caching_device_t`. `init` now
    takes an `std::unique_ptr<cache_replacement_policy_t>` that defines the replacement
    policy. It can be created manually or by using `create_cache_replacement_policy`.

diff --git a/api/samples/bbbuf.c b/api/samples/bbbuf.c
@@ -151,7 +151,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
     DR_ASSERT(buf);
 
     /* register events */
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_thread_init_event(event_thread_init) ||
         !drmgr_register_bb_instrumentation_event(NULL, event_app_instruction, NULL))
         DR_ASSERT(false);

diff --git a/api/samples/bbcount.c b/api/samples/bbcount.c
@@ -144,7 +144,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
         DR_ASSERT(false);
 
     /* register events */
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_bb_instrumentation_event(NULL, event_app_instruction, NULL))
         DR_ASSERT(false);
 

diff --git a/api/samples/bbsize.c b/api/samples/bbsize.c
@@ -74,7 +74,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
     drmgr_init();
     stats_mutex = dr_mutex_create();
     drmgr_register_bb_instrumentation_event(event_bb_analysis, NULL, NULL);
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
 #ifdef SHOW_RESULTS
     if (dr_is_notify_on()) {
 #    ifdef WINDOWS

diff --git a/api/samples/callstack.cpp b/api/samples/callstack.cpp
@@ -174,7 +174,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
         drsym_init(0) != DRSYM_SUCCESS ||
         !drmgr_register_module_load_event(dynamorio::samples::module_load_event))
         DR_ASSERT(false);
-    dr_register_exit_event(dynamorio::samples::event_exit);
+    drmgr_register_exit_event(dynamorio::samples::event_exit);
     // Improve performance as we only need basic wrapping support.
     drwrap_set_global_flags(
         static_cast<drwrap_global_flags_t>(DRWRAP_NO_FRILLS | DRWRAP_FAST_CLEANCALLS));

diff --git a/api/samples/cbr.c b/api/samples/cbr.c
@@ -501,5 +501,5 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
 
     if (!drmgr_register_bb_instrumentation_event(NULL, event_app_instruction, NULL))
         DR_ASSERT_MSG(false, "fail to register event_app_instruction!");
-    dr_register_exit_event(dr_exit);
+    drmgr_register_exit_event(dr_exit);
 }
diff --git a/api/samples/cbrtrace.c b/api/samples/cbrtrace.c
@@ -117,7 +117,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
     client_id = id;
     tls_idx = drmgr_register_tls_field();
 
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_thread_init_event(event_thread_init) ||
         !drmgr_register_thread_exit_event(event_thread_exit) ||
         !drmgr_register_bb_instrumentation_event(NULL, event_app_instruction, NULL))

diff --git a/api/samples/countcalls.c b/api/samples/countcalls.c
@@ -86,7 +86,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
     if (!drmgr_init() || drreg_init(&ops) != DRREG_SUCCESS)
         DR_ASSERT(false);
     /* register events */
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     drmgr_register_thread_init_event(event_thread_init);
     drmgr_register_thread_exit_event(event_thread_exit);
     drmgr_register_bb_instrumentation_event(NULL, event_instruction, NULL);

diff --git a/api/samples/div.c b/api/samples/div.c
@@ -62,7 +62,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
     dr_set_client_name("DynamoRIO Sample Client 'div'", "http://dynamorio.org/issues");
     if (!drmgr_init())
         DR_ASSERT(false);
-    dr_register_exit_event(exit_event);
+    drmgr_register_exit_event(exit_event);
     if (!drmgr_register_bb_instrumentation_event(NULL, event_app_instruction, NULL))
         DR_ASSERT(false);
     count_mutex = dr_mutex_create();

diff --git a/api/samples/hot_bbcount.c b/api/samples/hot_bbcount.c
@@ -239,7 +239,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
         DR_ASSERT(false);
 
     /* register events */
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
 
     hashtable_init_ex(&hit_count_table, HASH_BITS, HASH_INTPTR, false /*!strdup*/,
                       false /*synchronization is external*/, destroy_hit_count, NULL,

diff --git a/api/samples/inc2add.c b/api/samples/inc2add.c
@@ -85,7 +85,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
      * We're changing the app's code, rather than just inserting observational
      * instrumentation.
      */
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_bb_app2app_event(event_instruction_change, NULL))
         DR_ASSERT(false);
 

diff --git a/api/samples/inline.c b/api/samples/inline.c
@@ -128,7 +128,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
                       false /*synchronization is external*/, free_trace_head_entry, NULL,
                       NULL);
 
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_bb_instrumentation_event(event_analyze_bb, NULL, NULL))
         DR_ASSERT(false);
     dr_register_delete_event(event_fragment_deleted);

diff --git a/api/samples/inscount.cpp b/api/samples/inscount.cpp
@@ -224,7 +224,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
     }
 
     /* register events */
-    dr_register_exit_event(dynamorio::samples::event_exit);
+    drmgr_register_exit_event(dynamorio::samples::event_exit);
     drmgr_register_bb_instrumentation_event(dynamorio::samples::event_bb_analysis,
                                             dynamorio::samples::event_app_instruction,
                                             NULL);

diff --git a/api/samples/instrace_simple.c b/api/samples/instrace_simple.c
@@ -307,7 +307,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
         DR_ASSERT(false);
 
     /* register events */
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_thread_init_event(event_thread_init) ||
         !drmgr_register_thread_exit_event(event_thread_exit) ||
         !drmgr_register_bb_instrumentation_event(NULL /*analysis_func*/,

diff --git a/api/samples/instrace_x86.c b/api/samples/instrace_x86.c
@@ -132,7 +132,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
         DR_ASSERT(false);
     client_id = id;
     mutex = dr_mutex_create();
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_thread_init_event(event_thread_init) ||
         !drmgr_register_thread_exit_event(event_thread_exit) ||
         !drmgr_register_bb_instrumentation_event(NULL /*analysis func*/, event_bb_insert,

diff --git a/api/samples/instrcalls.c b/api/samples/instrcalls.c
@@ -90,7 +90,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
         dr_fprintf(STDERR, "Client instrcalls is running\n");
     }
 #endif
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     drmgr_register_bb_instrumentation_event(NULL, event_app_instruction, NULL);
     drmgr_register_thread_init_event(event_thread_init);
     drmgr_register_thread_exit_event(event_thread_exit);

diff --git a/api/samples/memtrace_simple.c b/api/samples/memtrace_simple.c
@@ -458,7 +458,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
         DR_ASSERT(false);
 
     /* register events */
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_thread_init_event(event_thread_init) ||
         !drmgr_register_thread_exit_event(event_thread_exit) ||
         !drmgr_register_bb_app2app_event(event_bb_app2app, NULL) ||

diff --git a/api/samples/memtrace_x86.c b/api/samples/memtrace_x86.c
@@ -158,7 +158,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
     drutil_init();
     client_id = id;
     mutex = dr_mutex_create();
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_thread_init_event(event_thread_init) ||
         !drmgr_register_thread_exit_event(event_thread_exit) ||
         !drmgr_register_bb_app2app_event(event_bb_app2app, &priority) ||

diff --git a/api/samples/memval_simple.c b/api/samples/memval_simple.c
@@ -472,7 +472,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
         DR_ASSERT(false);
 
     /* register events */
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_thread_init_event(event_thread_init) ||
         !drmgr_register_thread_exit_event(event_thread_exit) ||
         !drmgr_register_bb_app2app_event(event_bb_app2app, NULL) ||

diff --git a/api/samples/modxfer.c b/api/samples/modxfer.c
@@ -157,7 +157,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
         DR_ASSERT(false);
     drx_init();
     /* register events */
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_bb_instrumentation_event(event_analyze_bb,
                                                  event_insert_instrumentation, NULL))
         DR_ASSERT(false);

diff --git a/api/samples/modxfer_app2lib.c b/api/samples/modxfer_app2lib.c
@@ -122,7 +122,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
         DR_ASSERT(false);
 
     /* register events */
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_bb_instrumentation_event(event_analyze_bb,
                                                  event_insert_instrumentation, NULL))
         DR_ASSERT(false);

diff --git a/api/samples/opcode_count.cpp b/api/samples/opcode_count.cpp
@@ -185,7 +185,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
         DR_ASSERT(false);
 
     /* Register opcode event. */
-    dr_register_exit_event(dynamorio::samples::event_exit);
+    drmgr_register_exit_event(dynamorio::samples::event_exit);
     if (!drmgr_register_opcode_instrumentation_event(
             dynamorio::samples::event_opcode_instruction, valid_opcode, NULL, NULL) ||
         !drmgr_register_bb_instrumentation_event(

diff --git a/api/samples/opcodes.c b/api/samples/opcodes.c
@@ -100,7 +100,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
     drx_init();
 
     /* Register events: */
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_bb_instrumentation_event(NULL, event_app_instruction, NULL))
         DR_ASSERT(false);
 

diff --git a/api/samples/prefetch.c b/api/samples/prefetch.c
@@ -61,7 +61,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
                        "http://dynamorio.org/issues");
     if (!drmgr_init())
         DR_ASSERT(false);
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     /* Only need to remove prefetches for Intel processors. */
     if (proc_get_vendor() == VENDOR_INTEL) {
         /* We may remove app instructions, so we should register app2app event

diff --git a/api/samples/signal.c b/api/samples/signal.c
@@ -64,7 +64,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
 #ifdef UNIX
     drmgr_register_signal_event(event_signal);
 #endif
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
 #ifdef SHOW_RESULTS
     if (dr_is_notify_on()) {
 #    ifdef WINDOWS

diff --git a/api/samples/ssljack.c b/api/samples/ssljack.c
@@ -123,7 +123,7 @@ dr_init(client_id_t id)
 
     drmgr_init();
     drwrap_init();
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     drmgr_register_module_load_event(module_load_event);
 }
 

diff --git a/api/samples/statecmp.c b/api/samples/statecmp.c
@@ -151,5 +151,5 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
                                                  NULL))
         DR_ASSERT(false);
 
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
 }
diff --git a/api/samples/stats.c b/api/samples/stats.c
@@ -250,7 +250,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
         strncpy(stats->names[i], stat_names[i], CLIENTSTAT_NAME_MAX_LEN);
         stats->names[i][CLIENTSTAT_NAME_MAX_LEN - 1] = '\0';
     }
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     if (!drmgr_register_bb_instrumentation_event(event_analyze_bb,
                                                  event_insert_instrumentation, NULL))
         DR_ASSERT(false);

diff --git a/api/samples/strace.c b/api/samples/strace.c
@@ -81,7 +81,7 @@ dr_init(client_id_t id)
     drmgr_register_post_syscall_event(event_post_syscall);
     if (drsys_init(id, &ops) != DRMF_SUCCESS)
         DR_ASSERT(false);
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
 #ifdef WINDOWS
     dr_enable_console_printing(); /* ensure output shows up in cmd */
 #endif

diff --git a/api/samples/syscall.c b/api/samples/syscall.c
@@ -115,7 +115,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
     drmgr_register_filter_syscall_event(event_filter_syscall);
     drmgr_register_pre_syscall_event(event_pre_syscall);
     drmgr_register_post_syscall_event(event_post_syscall);
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     tcls_idx =
         drmgr_register_cls_field(event_thread_context_init, event_thread_context_exit);
     DR_ASSERT(tcls_idx != -1);

diff --git a/api/samples/wrap.c b/api/samples/wrap.c
@@ -115,7 +115,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
 #endif
     drmgr_init();
     drwrap_init();
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
     drmgr_register_module_load_event(module_load_event);
     max_lock = dr_mutex_create();
 }

diff --git a/clients/drcachesim/tracer/tracer.cpp b/clients/drcachesim/tracer/tracer.cpp
@@ -2079,7 +2079,7 @@ event_exit(void)
             DR_ASSERT(false);
         }
     }
-    dr_unregister_exit_event(event_exit);
+    drmgr_unregister_exit_event(event_exit);
 
     /* Clear callbacks and globals to support re-attach when linked statically. */
     file_ops_func = file_ops_func_t();
@@ -2530,7 +2530,7 @@ drmemtrace_client_main(client_id_t id, int argc, const char *argv[])
     }
 
     /* register events */
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
 #ifdef UNIX
     dr_register_fork_init_event(fork_init);
 #endif

diff --git a/clients/drcpusim/drcpusim.cpp b/clients/drcpusim/drcpusim.cpp
@@ -893,7 +893,7 @@ dr_client_main(client_id_t id, int argc, const char *argv[])
         DR_ASSERT(false);
 
     /* register events */
-    dr_register_exit_event(dynamorio::drcpusim::event_exit);
+    drmgr_register_exit_event(dynamorio::drcpusim::event_exit);
     if (!drmgr_register_bb_instrumentation_event(
             NULL, dynamorio::drcpusim::event_app_instruction, NULL))
         DR_ASSERT(false);

diff --git a/ext/drcovlib/drcovlib.h b/ext/drcovlib/drcovlib.h
@@ -1,5 +1,5 @@
 /* **********************************************************
- * Copyright (c) 2016-2022 Google, Inc.   All rights reserved.
+ * Copyright (c) 2016-2025 Google, Inc.   All rights reserved.
  * **********************************************************/
 
 /*
@@ -35,8 +35,6 @@
 #ifndef _DRCOVLIB_H_
 #define _DRCOVLIB_H_ 1
 
-#include "drmgr.h"
-
 /**
  * @file drcovlib.h
  * @brief Header for DynamoRIO Code Coverage Library

diff --git a/ext/drcovlib/modules.c b/ext/drcovlib/modules.c
@@ -1,5 +1,5 @@
 /* ***************************************************************************
- * Copyright (c) 2012-2022 Google, Inc.  All rights reserved.
+ * Copyright (c) 2012-2025 Google, Inc.  All rights reserved.
  * ***************************************************************************/
 
 /*
@@ -31,6 +31,7 @@
  */
 
 #include "dr_api.h"
+#include "drmgr.h"
 #include "drvector.h"
 #include "drcovlib.h"
 #include "drcovlib_private.h"

diff --git a/ext/drmf/framework/samples/strace.c b/ext/drmf/framework/samples/strace.c
@@ -81,7 +81,7 @@ dr_init(client_id_t id)
     drmgr_register_post_syscall_event(event_post_syscall);
     if (drsys_init(id, &ops) != DRMF_SUCCESS)
         DR_ASSERT(false);
-    dr_register_exit_event(event_exit);
+    drmgr_register_exit_event(event_exit);
 #ifdef WINDOWS
     dr_enable_console_printing(); /* ensure output shows up in cmd */
 #endif