Move callback_table.h to the util directory

The CallbackTable utility is shared by multiple APIs, so move it out
of the roctracer directory.

Change-Id: Ie2378dca8a4f90bd334dbe2d39ced37c9e790ed0

src/CMakeLists.txt

@@ -159,7 +159,7 @@ set_target_properties(roctx PROPERTIES
 
 target_include_directories(roctx
   PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/inc>
-  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/roctracer ${CMAKE_CURRENT_SOURCE_DIR})
+  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_options(roctx PRIVATE -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/roctx/exportmap -Wl,--no-undefined)
 

src/roctx/roctx.cpp

@@ -22,11 +22,11 @@
 #include "roctracer_roctx.h"
 #include "ext/prof_protocol.h"
 
-#include "callback_table.h"
+#include "util/callback_table.h"
 
 namespace {
 
-roctracer::CallbackTable<ACTIVITY_DOMAIN_ROCTX, ROCTX_API_ID_NUMBER> callbacks;
+roctracer::util::CallbackTable<ACTIVITY_DOMAIN_ROCTX, ROCTX_API_ID_NUMBER> callbacks;
 thread_local int nested_range_level(0);
 
 }  // namespace

src/util/callback_table.h

@@ -18,8 +18,8 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE. */
 
-#ifndef CALLBACK_TABLE_H_
-#define CALLBACK_TABLE_H_
+#ifndef UTIL_CALLBACK_TABLE_H_
+#define UTIL_CALLBACK_TABLE_H_
 
 #include "ext/prof_protocol.h"
 
@@ -29,7 +29,7 @@
 #include <mutex>
 #include <utility>
 
-namespace roctracer {
+namespace roctracer::util {
 
 // Generic callbacks table
 template <activity_domain_t Domain, uint32_t N> class CallbackTable {
@@ -65,6 +65,6 @@ template <activity_domain_t Domain, uint32_t N> class CallbackTable {
   mutable std::mutex mutex_;
 };
 
-}  // namespace roctracer
+}  // namespace roctracer::util
 
-#endif  // CALLBACK_TABLE_H_
+#endif  // UTIL_CALLBACK_TABLE_H_