Merge pull request #212 from sy-c/master

v2.9.0

Author: sy-c

CMakeLists.txt

@@ -70,6 +70,7 @@ find_package(RDMA)
 find_package(Occ)
 find_package(BookkeepingApiCpp)
 find_package(ZMQ)
+find_package(MySQL)
 
 # extract include directories from targets
 get_target_property(InfoLogger_INCLUDE_DIRS AliceO2::InfoLogger INTERFACE_INCLUDE_DIRECTORIES)
@@ -128,8 +129,17 @@ else ()
   message(STATUS "ZMQ not found, corresponding features will be disabled.")
 endif()
 
+# check MySQL
+if(${MYSQL_FOUND})
+    message(
+    STATUS
+    "MySQL found: ${MYSQL_INCLUDE_DIRS} ${MYSQL_LIBRARIES}")
+else ()
+  message(STATUS "MySQL not found, corresponding features will be disabled.")
+endif()
+
 # add flags to enable optional features in Readout, based on available dependencies
-add_compile_definitions($<$<BOOL:${Numa_FOUND}>:WITH_NUMA> $<$<BOOL:${RDMA_FOUND}>:WITH_RDMA> $<$<BOOL:${Configuration_FOUND}>:WITH_CONFIG> $<$<BOOL:${FairMQ_FOUND}>:WITH_FAIRMQ> $<$<BOOL:${Occ_FOUND}>:WITH_OCC> $<$<BOOL:${BookkeepingApiCpp_FOUND}>:WITH_LOGBOOK> $<$<BOOL:${ZMQ_FOUND}>:WITH_ZMQ> $<$<BOOL:${ReadoutCard_FOUND}>:WITH_READOUTCARD> )
+add_compile_definitions($<$<BOOL:${Numa_FOUND}>:WITH_NUMA> $<$<BOOL:${RDMA_FOUND}>:WITH_RDMA> $<$<BOOL:${Configuration_FOUND}>:WITH_CONFIG> $<$<BOOL:${FairMQ_FOUND}>:WITH_FAIRMQ> $<$<BOOL:${Occ_FOUND}>:WITH_OCC> $<$<BOOL:${BookkeepingApiCpp_FOUND}>:WITH_LOGBOOK> $<$<BOOL:${ZMQ_FOUND}>:WITH_ZMQ> $<$<BOOL:${MYSQL_FOUND}>:WITH_DB> $<$<BOOL:${ReadoutCard_FOUND}>:WITH_READOUTCARD> )
 
 # define include directories
 set(READOUT_INCLUDE_DIRS
@@ -165,6 +175,10 @@ if(ZMQ_FOUND)
   list(APPEND READOUT_INCLUDE_DIRS ${ZMQ_INCLUDE_DIRS}) 
   list(APPEND READOUT_LINK_LIBRARIES ${ZMQ_LIBRARIES})
 endif()
+if(MYSQL_FOUND)
+  list(APPEND READOUT_INCLUDE_DIRS ${MYSQL_INCLUDE_DIRS}) 
+  list(APPEND READOUT_LINK_LIBRARIES ${MYSQL_LIBRARIES})
+endif()
 
 # some systems don't need an explicit library to have dlopen()
 if (CMAKE_DL_LIBS)
@@ -225,6 +239,15 @@ add_library(
 )
 target_include_directories(objReadoutUtils PRIVATE ${READOUT_INCLUDE_DIRS})
 
+# internal readout database
+if (MYSQL_FOUND)
+  add_library(
+          objReadoutDatabase OBJECT
+	  ${SOURCE_DIR}/ReadoutDatabase.cxx
+  )
+  target_include_directories(objReadoutDatabase PRIVATE ${READOUT_INCLUDE_DIRS} ${MYSQL_INCLUDE_DIRS})
+endif()
+
 # consumers
 add_library(
         objReadoutConsumers OBJECT
@@ -304,6 +327,7 @@ add_executable(
 	$<TARGET_OBJECTS:objReadoutAggregator>
 	$<TARGET_OBJECTS:objReadoutConsumers>
 	$<TARGET_OBJECTS:objReadoutUtils>
+	$<$<BOOL:${MYSQL_FOUND}>:$<TARGET_OBJECTS:objReadoutDatabase>>
 )
 
 # a test FMQ device receiver
@@ -398,6 +422,16 @@ add_executable(
 target_include_directories(o2-readout-monitor PRIVATE ${READOUT_INCLUDE_DIRS})
 target_link_libraries(o2-readout-monitor PRIVATE AliceO2::InfoLogger AliceO2::Common ${ZMQ_LIBRARIES})
 
+# a process to admin readout database
+if (MYSQL_FOUND)
+add_executable(
+	o2-readout-admin-db
+        ${SOURCE_DIR}/readoutAdminDB.cxx
+	$<TARGET_OBJECTS:objReadoutDatabase>
+)
+target_include_directories(o2-readout-admin-db PRIVATE ${READOUT_INCLUDE_DIRS})
+endif()
+
 endif()
 
 # a minimal test program to check Monitoring library
@@ -438,6 +472,9 @@ endif()
 if (BookkeepingApiCpp_FOUND)
   list (APPEND executables o2-readout-test-lib-bookkeeping)
 endif()
+if (MYSQL_FOUND)
+  list (APPEND executables o2-readout-admin-db)
+endif()
 foreach (exe ${executables})
 	target_include_directories(${exe} PRIVATE ${READOUT_INCLUDE_DIRS})
 	target_link_libraries(${exe} PRIVATE ${READOUT_LINK_LIBRARIES})

cmake/FindMySQL.cmake

@@ -0,0 +1,47 @@
+# - Find mysqlclient
+# Find the native MySQL includes and library
+#
+#  MYSQL_INCLUDE_DIRS - where to find mysql.h, etc.
+#  MYSQL_LIBRARIES    - List of libraries when using MySQL.
+#  MYSQL_FOUND        - True if MySQL found.
+
+#  MYSQL_PATH_SUFFIXES  - by default it includes "mysql". Set it if you want to force extra suffixes to be used.
+
+if(NOT MYSQL_PATH_SUFFIXES)
+    set(MYSQL_PATH_SUFFIXES "" "mysql") 
+endif()
+
+FIND_PATH(MYSQL_INCLUDE_DIRS mysql.h
+  /usr/local/include/mysql
+  /usr/include/mysql
+)
+
+SET(MYSQL_NAMES mysqlclient mysqlclient_r)
+FIND_LIBRARY(MYSQL_LIBRARY
+  NAMES ${MYSQL_NAMES}
+  PATHS /usr/lib /usr/lib64 /usr/local/lib 
+  PATH_SUFFIXES ${MYSQL_PATH_SUFFIXES}
+)
+
+IF (MYSQL_INCLUDE_DIRS AND MYSQL_LIBRARY)
+  SET(MYSQL_FOUND TRUE)
+  SET( MYSQL_LIBRARIES ${MYSQL_LIBRARY} )
+ELSE (MYSQL_INCLUDE_DIRS AND MYSQL_LIBRARY)
+  SET(MYSQL_FOUND FALSE)
+  UNSET(MYSQL_LIBRARIES CACHE)
+  UNSET(MYSQL_INCLUDE_DIRS CACHE)
+ENDIF (MYSQL_INCLUDE_DIRS AND MYSQL_LIBRARY)
+
+IF (MYSQL_FOUND)
+    MESSAGE(STATUS "Found MySQL: ${MYSQL_LIBRARY}")
+ELSE (MYSQL_FOUND)
+  IF (MYSQL_FIND_REQUIRED)
+    MESSAGE(STATUS "Looked for MySQL libraries named ${MYSQL_NAMES}.")
+    MESSAGE(FATAL_ERROR "Could NOT find MySQL library")
+  ENDIF (MYSQL_FIND_REQUIRED)
+ENDIF (MYSQL_FOUND)
+
+MARK_AS_ADVANCED(
+  MYSQL_LIBRARY
+  MYSQL_INCLUDE_DIRS
+)

doc/releaseNotes.md

@@ -428,3 +428,6 @@ This file describes the main feature changes for each readout.exe released versi
 ## v2.8.7 - 16/03/2022
 - Explicit order for resources cleanup on unexpected state machine exit.
 - Reset TFid on file replay start/stop loop.
+
+## v2.9.0 - 23/03/2022
+- Added optional database connection to store runtime statistics.