Make callbacks singleton into a helper function

Author: aarongreig

include/ur_api.h

@@ -750,7 +750,8 @@ urLoaderConfigSetCodeLocationCallback(
 ///     - The mock adapter will default to returning ::UR_RESULT_SUCCESS for all
 ///       entry points. It will also create and correctly reference count dummy
 ///       handles where appropriate. Its behaviour can be modified by linking
-///       the ::ur_mock_headers library and using the mock::callbacks object.
+///       the mock library and using the object accessed via
+///       mock::getCallbacks().
 ///
 /// @returns
 ///     - ::UR_RESULT_SUCCESS

scripts/core/INTRO.rst

@@ -269,12 +269,12 @@ handles that track a reference count, and ``Retain``/``Release`` entry points wi
 function as expected when used with these handles.
 
 The behavior of the mock adapter can be customized by linking the
-``unified-runtime::mock`` library and making use of the ``mock::callbacks``
-object. Callbacks can be passed into this object to run either before or after a
-given entry point, or they can be set to entirely replace the default behavior.
-Only one callback of each type (before, replace, after) can be set per entry
-point, with subsequent callbacks set in the same "slot" overwriting any set
-previously.
+``unified-runtime::mock`` library and making use of the object accessed via the
+``mock::getCallbacks()`` helper. Callbacks can be passed into this object to
+run either before or after a given entry point, or they can be set to entirely
+replace the default behavior.  Only one callback of each type (before, replace,
+after) can be set per entry point, with subsequent callbacks set in the same
+"slot" overwriting any set previously.
 
 The callback signature defined by ``ur_mock_callback_t`` takes a single
 ``void *`` parameter. When calling a user callback the adapter will pack the

scripts/core/loader.yml

@@ -190,7 +190,7 @@ params:
 type: function
 desc: "The only adapter reported with mock enabled will be the mock adapter."
 details:
-    - "The mock adapter will default to returning $X_RESULT_SUCCESS for all entry points. It will also create and correctly reference count dummy handles where appropriate. Its behaviour can be modified by linking the $x_mock_headers library and using the mock::callbacks object."
+    - "The mock adapter will default to returning $X_RESULT_SUCCESS for all entry points. It will also create and correctly reference count dummy handles where appropriate. Its behaviour can be modified by linking the mock library and using the object accessed via mock::getCallbacks()."
 class: $xLoaderConfig
 loader_only: True
 name: "SetMockingEnabled"

scripts/templates/mockddi.cpp.mako

@@ -44,7 +44,7 @@ namespace driver
         ${th.make_pfncb_param_type(n, tags, obj)} params = { &${",&".join(th.make_param_lines(n, tags, obj, format=["name"]))} };
 
         auto beforeCallback = reinterpret_cast<ur_mock_callback_t>(
-                mock::callbacks.get_before_callback("${fname}"));
+                mock::getCallbacks().get_before_callback("${fname}"));
         if(beforeCallback) {
             result = beforeCallback( &params );
             if(result != UR_RESULT_SUCCESS) {
@@ -53,7 +53,7 @@ namespace driver
         }
 
         auto replaceCallback = reinterpret_cast<ur_mock_callback_t>(
-                mock::callbacks.get_replace_callback("${fname}"));
+                mock::getCallbacks().get_replace_callback("${fname}"));
         if(replaceCallback) {
             result = replaceCallback( &params );
         }
@@ -130,7 +130,7 @@ namespace driver
         }
 
         auto afterCallback = reinterpret_cast<ur_mock_callback_t>(
-                mock::callbacks.get_after_callback("${fname}"));
+                mock::getCallbacks().get_after_callback("${fname}"));
         if(afterCallback) {
             return afterCallback( &params );
         }