From 3a2d9faddc884116610b105f8cf07433b474658b Mon Sep 17 00:00:00 2001 From: "kibak.yoon" Date: Fri, 22 Jan 2016 13:40:30 +0900 Subject: [PATCH] sensord: remove "c" prefix about all classes Change-Id: I364d88ebeca3cc9e522b560f94b01c2601987f4d Signed-off-by: kibak.yoon --- src/client/CMakeLists.txt | 12 +-- src/client/client.cpp | 6 +- src/client/client_common.cpp | 2 +- src/client/client_common.h | 14 +-- src/client/command_channel.h | 1 + src/client/{creg_event_info.h => reg_event_info.h} | 12 +-- ...nsor_client_info.cpp => sensor_client_info.cpp} | 100 ++++++++++----------- ...{csensor_client_info.h => sensor_client_info.h} | 18 ++-- ...vent_listener.cpp => sensor_event_listener.cpp} | 62 ++++++------- ...or_event_listener.h => sensor_event_listener.h} | 30 +++---- ...nsor_handle_info.cpp => sensor_handle_info.cpp} | 32 +++---- ...{csensor_handle_info.h => sensor_handle_info.h} | 18 ++-- ...nt_info_manager.cpp => client_info_manager.cpp} | 60 ++++++------- ...client_info_manager.h => client_info_manager.h} | 22 ++--- ..._sensor_record.cpp => client_sensor_record.cpp} | 74 +++++++-------- ...ient_sensor_record.h => client_sensor_record.h} | 16 ++-- src/server/command_worker.cpp | 8 +- src/server/command_worker.h | 14 +-- src/server/dbus_util.h | 2 +- src/server/{cconfig.cpp => device_config.cpp} | 8 +- src/server/{cconfig.h => device_config.h} | 12 +-- src/server/permission_checker.h | 2 +- src/server/physical_sensor.cpp | 2 +- src/server/physical_sensor.h | 2 +- ...{cplugin_info_list.cpp => plugin_info_list.cpp} | 36 ++++---- .../{cplugin_info_list.h => plugin_info_list.h} | 8 +- .../plugins/auto_rotation/auto_rotation_sensor.cpp | 4 +- src/server/plugins/fusion/fusion_sensor.cpp | 4 +- src/server/plugins/gravity/gravity_sensor.cpp | 4 +- .../plugins/linear_accel/linear_accel_sensor.cpp | 4 +- .../plugins/orientation/orientation_sensor.cpp | 4 +- .../rotation_vector/gaming_rv/gaming_rv_sensor.cpp | 4 +- .../geomagnetic_rv/geomagnetic_rv_sensor.cpp | 4 +- .../plugins/rotation_vector/rv/rv_sensor.cpp | 4 +- src/server/plugins/tilt/tilt_sensor.cpp | 4 +- src/server/sensor_base.cpp | 12 +-- src/server/sensor_base.h | 6 +- ..._dispatcher.cpp => sensor_event_dispatcher.cpp} | 62 ++++++------- ...vent_dispatcher.h => sensor_event_dispatcher.h} | 22 ++--- src/server/sensor_event_poller.h | 5 ++ ...nsor_event_queue.cpp => sensor_event_queue.cpp} | 12 +-- ...{csensor_event_queue.h => sensor_event_queue.h} | 19 ++-- src/server/sensor_plugin_loader.h | 6 +- src/server/{csensor_usage.cpp => sensor_usage.cpp} | 12 +-- src/server/{csensor_usage.h => sensor_usage.h} | 12 +-- src/server/server.cpp | 2 +- src/server/server.h | 6 +- src/server/virtual_sensor.cpp | 6 +- src/server/virtual_sensor.h | 2 +- ...sensor_config.cpp => virtual_sensor_config.cpp} | 46 +++++----- ...ual_sensor_config.h => virtual_sensor_config.h} | 24 ++--- src/server/worker_thread.h | 2 +- src/shared/cbase_lock.h | 7 +- src/shared/cmutex.h | 7 +- src/shared/cpacket.h | 7 +- src/shared/csocket.h | 6 +- src/shared/sensor_common.h | 7 +- src/shared/sensor_hal.h | 2 +- src/shared/sensor_logs.h | 7 +- src/shared/sf_common.h | 8 +- 60 files changed, 459 insertions(+), 457 deletions(-) rename src/client/{creg_event_info.h => reg_event_info.h} (87%) rename src/client/{csensor_client_info.cpp => sensor_client_info.cpp} (78%) rename src/client/{csensor_client_info.h => sensor_client_info.h} (92%) rename src/client/{csensor_event_listener.cpp => sensor_event_listener.cpp} (88%) rename src/client/{csensor_event_listener.h => sensor_event_listener.h} (78%) rename src/client/{csensor_handle_info.cpp => sensor_handle_info.cpp} (76%) rename src/client/{csensor_handle_info.h => sensor_handle_info.h} (83%) rename src/server/{cclient_info_manager.cpp => client_info_manager.cpp} (73%) rename src/server/{cclient_info_manager.h => client_info_manager.h} (83%) rename src/server/{cclient_sensor_record.cpp => client_sensor_record.cpp} (65%) rename src/server/{cclient_sensor_record.h => client_sensor_record.h} (87%) rename src/server/{cconfig.cpp => device_config.cpp} (91%) rename src/server/{cconfig.h => device_config.h} (85%) rename src/server/{cplugin_info_list.cpp => plugin_info_list.cpp} (76%) rename src/server/{cplugin_info_list.h => plugin_info_list.h} (95%) rename src/server/{csensor_event_dispatcher.cpp => sensor_event_dispatcher.cpp} (80%) rename src/server/{csensor_event_dispatcher.h => sensor_event_dispatcher.h} (80%) rename src/server/{csensor_event_queue.cpp => sensor_event_queue.cpp} (79%) rename src/server/{csensor_event_queue.h => sensor_event_queue.h} (87%) rename src/server/{csensor_usage.cpp => sensor_usage.cpp} (84%) rename src/server/{csensor_usage.h => sensor_usage.h} (88%) rename src/server/{cvirtual_sensor_config.cpp => virtual_sensor_config.cpp} (78%) rename src/server/{cvirtual_sensor_config.h => virtual_sensor_config.h} (79%) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 7653492..ac7dcc0 100755 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -28,10 +28,10 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) add_library(${PROJECT_NAME} SHARED client.cpp - csensor_client_info.cpp - csensor_event_listener.cpp + sensor_client_info.cpp + sensor_event_listener.cpp sensor_info_manager.cpp - csensor_handle_info.cpp + sensor_handle_info.cpp client_common.cpp command_channel.cpp ) @@ -42,10 +42,10 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION}) configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries) -install(FILES creg_event_info.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES csensor_event_listener.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES reg_event_info.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_event_listener.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) install(FILES sensor_info_manager.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) -install(FILES csensor_handle_info.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) +install(FILES sensor_handle_info.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) install(FILES client_common.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/) install(FILES ${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/src/client/client.cpp b/src/client/client.cpp index dafe4db..05e3897 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,8 +41,8 @@ using std::vector; static const int OP_SUCCESS = 0; static const int OP_ERROR = -1; -static csensor_event_listener &event_listener = csensor_event_listener::get_instance(); -static csensor_client_info &client_info = csensor_client_info::get_instance(); +static sensor_event_listener &event_listener = sensor_event_listener::get_instance(); +static sensor_client_info &client_info = sensor_client_info::get_instance(); static cmutex lock; static int g_power_save_state = 0; diff --git a/src/client/client_common.cpp b/src/client/client_common.cpp index 51ad05a..bc48da0 100755 --- a/src/client/client_common.cpp +++ b/src/client/client_common.cpp @@ -200,7 +200,7 @@ unsigned long long get_timestamp(void) return ((unsigned long long)(t.tv_sec)*1000000000LL + t.tv_nsec) / 1000; } -void print_event_occurrence_log(csensor_handle_info &sensor_handle_info, const creg_event_info *event_info) +void print_event_occurrence_log(sensor_handle_info &sensor_handle_info, const reg_event_info *event_info) { log_attr *log_attr; diff --git a/src/client/client_common.h b/src/client/client_common.h index db3ae6d..7c6ae30 100755 --- a/src/client/client_common.h +++ b/src/client/client_common.h @@ -17,13 +17,13 @@ * */ -#ifndef CLIENT_COMMON_H_ -#define CLIENT_COMMON_H_ +#ifndef _CLIENT_COMMON_H_ +#define _CLIENT_COMMON_H_ /*header for each sensor type*/ #include -#include -#include +#include +#include #include #define BASE_GATHERING_INTERVAL 100 @@ -59,7 +59,7 @@ typedef struct { int sensor_state; int sensor_option; sensor_type_t sensor; - creg_event_info event_info; + reg_event_info event_info; } log_info; bool is_one_shot_event(unsigned int event_type); @@ -73,10 +73,10 @@ const char* get_log_element_name(log_id id, unsigned int type); const char* get_sensor_name(sensor_id_t sensor_id); const char* get_event_name(unsigned int event_type); const char* get_data_name(unsigned int data_id); -void print_event_occurrence_log(csensor_handle_info &sensor_handle_info, const creg_event_info *event_info); +void print_event_occurrence_log(sensor_handle_info &sensor_handle_info, const reg_event_info *event_info); class sensor_info; sensor_info *sensor_to_sensor_info(sensor_t sensor); sensor_t sensor_info_to_sensor(const sensor_info *info); -#endif /* CLIENT_COMMON_H_ */ +#endif /* _CLIENT_COMMON_H_ */ diff --git a/src/client/command_channel.h b/src/client/command_channel.h index c4f85b5..e60434e 100644 --- a/src/client/command_channel.h +++ b/src/client/command_channel.h @@ -19,6 +19,7 @@ #ifndef _COMMAND_CHANNEL_H_ #define _COMMAND_CHANNEL_H_ + #include #include #include diff --git a/src/client/creg_event_info.h b/src/client/reg_event_info.h similarity index 87% rename from src/client/creg_event_info.h rename to src/client/reg_event_info.h index d431316..44d8937 100644 --- a/src/client/creg_event_info.h +++ b/src/client/reg_event_info.h @@ -17,8 +17,8 @@ * */ -#ifndef CREG_EVENT_INFO_H_ -#define CREG_EVENT_INFO_H_ +#ifndef _REG_EVENT_INFO_H_ +#define _REG_EVENT_INFO_H_ #include #include @@ -29,7 +29,7 @@ typedef enum { SENSOR_LEGACY_CB, } event_cb_type_t; -class creg_event_info { +class reg_event_info { public: unsigned long long m_id; int m_handle; @@ -43,14 +43,14 @@ public: bool m_fired; GMainContext *m_maincontext; - creg_event_info():m_id(0), m_handle(-1), + reg_event_info():m_id(0), m_handle(-1), type(0), m_interval(POLL_1HZ_MS), m_latency(0), m_cb_type(SENSOR_EVENT_CB), m_cb(NULL), m_user_data(NULL), m_previous_event_time(0), m_fired(false), m_maincontext(NULL){} - ~creg_event_info(){} + ~reg_event_info(){} }; -#endif /* CREG_EVENT_INFO_H_ */ +#endif /* _REG_EVENT_INFO_H_ */ diff --git a/src/client/csensor_client_info.cpp b/src/client/sensor_client_info.cpp similarity index 78% rename from src/client/csensor_client_info.cpp rename to src/client/sensor_client_info.cpp index 9def2b5..0917459 100644 --- a/src/client/csensor_client_info.cpp +++ b/src/client/sensor_client_info.cpp @@ -17,7 +17,7 @@ * */ -#include +#include #include #include #include @@ -31,26 +31,26 @@ using std::thread; using std::pair; -csensor_client_info::csensor_client_info() +sensor_client_info::sensor_client_info() : m_client_id(CLIENT_ID_INVALID) { } -csensor_client_info::~csensor_client_info() +sensor_client_info::~sensor_client_info() { } -csensor_client_info& csensor_client_info::get_instance(void) +sensor_client_info& sensor_client_info::get_instance(void) { - static csensor_client_info inst; + static sensor_client_info inst; return inst; } -int csensor_client_info::create_handle(sensor_id_t sensor) +int sensor_client_info::create_handle(sensor_id_t sensor) { - csensor_handle_info handle_info; + sensor_handle_info handle_info; int handle = 0; AUTOLOCK(m_handle_info_lock); @@ -71,12 +71,12 @@ int csensor_client_info::create_handle(sensor_id_t sensor) handle_info.m_accuracy_cb = NULL; handle_info.m_accuracy_user_data = NULL; - m_sensor_handle_infos.insert(pair (handle, handle_info)); + m_sensor_handle_infos.insert(pair (handle, handle_info)); return handle; } -bool csensor_client_info::delete_handle(int handle) +bool sensor_client_info::delete_handle(int handle) { AUTOLOCK(m_handle_info_lock); @@ -92,14 +92,14 @@ bool csensor_client_info::delete_handle(int handle) } -bool csensor_client_info::is_active() +bool sensor_client_info::is_active() { AUTOLOCK(m_handle_info_lock); return !m_sensor_handle_infos.empty(); } -bool csensor_client_info::register_event(int handle, unsigned int event_type, +bool sensor_client_info::register_event(int handle, unsigned int event_type, unsigned int interval, unsigned int latency, int cb_type, void *cb, void* user_data) { AUTOLOCK(m_handle_info_lock); @@ -117,7 +117,7 @@ bool csensor_client_info::register_event(int handle, unsigned int event_type, return true; } -bool csensor_client_info::unregister_event(int handle, unsigned int event_type) +bool sensor_client_info::unregister_event(int handle, unsigned int event_type) { AUTOLOCK(m_handle_info_lock); @@ -134,7 +134,7 @@ bool csensor_client_info::unregister_event(int handle, unsigned int event_type) return true; } -bool csensor_client_info::register_accuracy_cb(int handle, sensor_accuracy_changed_cb_t cb, void* user_data) +bool sensor_client_info::register_accuracy_cb(int handle, sensor_accuracy_changed_cb_t cb, void* user_data) { AUTOLOCK(m_handle_info_lock); @@ -152,7 +152,7 @@ bool csensor_client_info::register_accuracy_cb(int handle, sensor_accuracy_chang return true; } -bool csensor_client_info::unregister_accuracy_cb(int handle) +bool sensor_client_info::unregister_accuracy_cb(int handle) { AUTOLOCK(m_handle_info_lock); @@ -170,7 +170,7 @@ bool csensor_client_info::unregister_accuracy_cb(int handle) return true; } -bool csensor_client_info::set_sensor_params(int handle, int sensor_state, int sensor_option) +bool sensor_client_info::set_sensor_params(int handle, int sensor_state, int sensor_option) { AUTOLOCK(m_handle_info_lock); @@ -187,7 +187,7 @@ bool csensor_client_info::set_sensor_params(int handle, int sensor_state, int se return true; } -bool csensor_client_info::get_sensor_params(int handle, int &sensor_state, int &sensor_option) +bool sensor_client_info::get_sensor_params(int handle, int &sensor_state, int &sensor_option) { AUTOLOCK(m_handle_info_lock); @@ -204,7 +204,7 @@ bool csensor_client_info::get_sensor_params(int handle, int &sensor_state, int & return true; } -bool csensor_client_info::set_sensor_state(int handle, int sensor_state) +bool sensor_client_info::set_sensor_state(int handle, int sensor_state) { AUTOLOCK(m_handle_info_lock); @@ -220,7 +220,7 @@ bool csensor_client_info::set_sensor_state(int handle, int sensor_state) return true; } -bool csensor_client_info::set_sensor_option(int handle, int sensor_option) +bool sensor_client_info::set_sensor_option(int handle, int sensor_option) { AUTOLOCK(m_handle_info_lock); @@ -236,7 +236,7 @@ bool csensor_client_info::set_sensor_option(int handle, int sensor_option) return true; } -bool csensor_client_info::set_event_batch(int handle, unsigned int event_type, unsigned int interval, unsigned int latency) +bool sensor_client_info::set_event_batch(int handle, unsigned int event_type, unsigned int interval, unsigned int latency) { AUTOLOCK(m_handle_info_lock); @@ -253,7 +253,7 @@ bool csensor_client_info::set_event_batch(int handle, unsigned int event_type, u return true; } -bool csensor_client_info::set_event_maincontext(int handle, unsigned int event_type, GMainContext *maincontext) +bool sensor_client_info::set_event_maincontext(int handle, unsigned int event_type, GMainContext *maincontext) { AUTOLOCK(m_handle_info_lock); @@ -270,7 +270,7 @@ bool csensor_client_info::set_event_maincontext(int handle, unsigned int event_t return true; } -bool csensor_client_info::set_accuracy(int handle, int accuracy) +bool sensor_client_info::set_accuracy(int handle, int accuracy) { AUTOLOCK(m_handle_info_lock); @@ -286,7 +286,7 @@ bool csensor_client_info::set_accuracy(int handle, int accuracy) return true; } -bool csensor_client_info::set_bad_accuracy(int handle, int bad_accuracy) +bool sensor_client_info::set_bad_accuracy(int handle, int bad_accuracy) { AUTOLOCK(m_handle_info_lock); @@ -302,7 +302,7 @@ bool csensor_client_info::set_bad_accuracy(int handle, int bad_accuracy) return true; } -bool csensor_client_info::get_event_info(int handle, unsigned int event_type, unsigned int &interval, unsigned int &latency, int &cb_type, void* &cb, void* &user_data) +bool sensor_client_info::get_event_info(int handle, unsigned int event_type, unsigned int &interval, unsigned int &latency, int &cb_type, void* &cb, void* &user_data) { AUTOLOCK(m_handle_info_lock); @@ -313,7 +313,7 @@ bool csensor_client_info::get_event_info(int handle, unsigned int event_type, un return false; } - const creg_event_info *event_info; + const reg_event_info *event_info; event_info = it_handle->second.get_reg_event_info(event_type); @@ -331,7 +331,7 @@ bool csensor_client_info::get_event_info(int handle, unsigned int event_type, un } -void csensor_client_info::get_listening_sensors(sensor_id_vector &sensors) +void sensor_client_info::get_listening_sensors(sensor_id_vector &sensors) { AUTOLOCK(m_handle_info_lock); @@ -346,7 +346,7 @@ void csensor_client_info::get_listening_sensors(sensor_id_vector &sensors) unique(sensors.begin(),sensors.end()); } -void csensor_client_info::get_sensor_rep(sensor_id_t sensor, sensor_rep& rep) { +void sensor_client_info::get_sensor_rep(sensor_id_t sensor, sensor_rep& rep) { const unsigned int INVALID_BATCH_VALUE = std::numeric_limits::max(); rep.active = is_sensor_active(sensor); @@ -359,7 +359,7 @@ void csensor_client_info::get_sensor_rep(sensor_id_t sensor, sensor_rep& rep) { get_active_event_types(sensor, rep.event_types); } -bool csensor_client_info::add_command_channel(sensor_id_t sensor, command_channel *cmd_channel) +bool sensor_client_info::add_command_channel(sensor_id_t sensor, command_channel *cmd_channel) { auto it_channel = m_command_channels.find(sensor); @@ -373,7 +373,7 @@ bool csensor_client_info::add_command_channel(sensor_id_t sensor, command_channe return true; } -bool csensor_client_info::get_command_channel(sensor_id_t sensor, command_channel **cmd_channel) +bool sensor_client_info::get_command_channel(sensor_id_t sensor, command_channel **cmd_channel) { auto it_channel = m_command_channels.find(sensor); @@ -388,7 +388,7 @@ bool csensor_client_info::get_command_channel(sensor_id_t sensor, command_channe } -bool csensor_client_info::close_command_channel(void) +bool sensor_client_info::close_command_channel(void) { auto it_channel = m_command_channels.begin(); @@ -402,7 +402,7 @@ bool csensor_client_info::close_command_channel(void) return true; } -bool csensor_client_info::close_command_channel(sensor_id_t sensor_id) +bool sensor_client_info::close_command_channel(sensor_id_t sensor_id) { auto it_channel = m_command_channels.find(sensor_id); @@ -419,22 +419,22 @@ bool csensor_client_info::close_command_channel(sensor_id_t sensor_id) } -bool csensor_client_info::has_client_id(void) +bool sensor_client_info::has_client_id(void) { return (m_client_id != CLIENT_ID_INVALID); } -int csensor_client_info::get_client_id(void) +int sensor_client_info::get_client_id(void) { return m_client_id; } -void csensor_client_info::set_client_id(int client_id) +void sensor_client_info::set_client_id(int client_id) { m_client_id = client_id; } -bool csensor_client_info::get_active_batch(sensor_id_t sensor, unsigned int &interval, unsigned int &latency) +bool sensor_client_info::get_active_batch(sensor_id_t sensor, unsigned int &interval, unsigned int &latency) { unsigned int min_interval = POLL_MAX_HZ_MS; unsigned int min_latency = std::numeric_limits::max(); @@ -470,7 +470,7 @@ bool csensor_client_info::get_active_batch(sensor_id_t sensor, unsigned int &int return true; } -unsigned int csensor_client_info::get_active_option(sensor_id_t sensor) +unsigned int sensor_client_info::get_active_option(sensor_id_t sensor) { int active_option = SENSOR_OPTION_DEFAULT; bool active_sensor_found = false; @@ -497,7 +497,7 @@ unsigned int csensor_client_info::get_active_option(sensor_id_t sensor) return active_option; } -bool csensor_client_info::get_sensor_id(int handle, sensor_id_t &sensor) +bool sensor_client_info::get_sensor_id(int handle, sensor_id_t &sensor) { AUTOLOCK(m_handle_info_lock); @@ -513,7 +513,7 @@ bool csensor_client_info::get_sensor_id(int handle, sensor_id_t &sensor) return true; } -bool csensor_client_info::get_sensor_state(int handle, int &sensor_state) +bool sensor_client_info::get_sensor_state(int handle, int &sensor_state) { AUTOLOCK(m_handle_info_lock); @@ -529,7 +529,7 @@ bool csensor_client_info::get_sensor_state(int handle, int &sensor_state) return true; } -bool csensor_client_info::get_sensor_wakeup(int handle, int &sensor_wakeup) +bool sensor_client_info::get_sensor_wakeup(int handle, int &sensor_wakeup) { AUTOLOCK(m_handle_info_lock); @@ -545,7 +545,7 @@ bool csensor_client_info::get_sensor_wakeup(int handle, int &sensor_wakeup) return true; } -bool csensor_client_info::set_sensor_wakeup(int handle, int sensor_wakeup) +bool sensor_client_info::set_sensor_wakeup(int handle, int sensor_wakeup) { AUTOLOCK(m_handle_info_lock); @@ -561,7 +561,7 @@ bool csensor_client_info::set_sensor_wakeup(int handle, int sensor_wakeup) return true; } -void csensor_client_info::get_active_event_types(sensor_id_t sensor, event_type_vector &active_event_types) +void sensor_client_info::get_active_event_types(sensor_id_t sensor, event_type_vector &active_event_types) { event_type_vector event_types; @@ -587,7 +587,7 @@ void csensor_client_info::get_active_event_types(sensor_id_t sensor, event_type_ } -void csensor_client_info::get_all_handles(handle_vector &handles) +void sensor_client_info::get_all_handles(handle_vector &handles) { AUTOLOCK(m_handle_info_lock); @@ -599,7 +599,7 @@ void csensor_client_info::get_all_handles(handle_vector &handles) } } -void csensor_client_info::get_sensor_handle_info(sensor_id_t sensor, sensor_handle_info_map &handles_info) { +void sensor_client_info::get_sensor_handle_info(sensor_id_t sensor, sensor_handle_info_map &handles_info) { AUTOLOCK(m_handle_info_lock); @@ -607,26 +607,26 @@ void csensor_client_info::get_sensor_handle_info(sensor_id_t sensor, sensor_hand while (it_handle != m_sensor_handle_infos.end()) { if (it_handle->second.m_sensor_id == sensor) { - handles_info.insert(pair (it_handle->first, it_handle->second)); + handles_info.insert(pair (it_handle->first, it_handle->second)); } ++it_handle; } } -void csensor_client_info::get_all_handle_info(sensor_handle_info_map &handles_info) { +void sensor_client_info::get_all_handle_info(sensor_handle_info_map &handles_info) { AUTOLOCK(m_handle_info_lock); auto it_handle = m_sensor_handle_infos.begin(); while (it_handle != m_sensor_handle_infos.end()) { - handles_info.insert(pair (it_handle->first, it_handle->second)); + handles_info.insert(pair (it_handle->first, it_handle->second)); ++it_handle; } } -bool csensor_client_info::is_sensor_registered(sensor_id_t sensor) +bool sensor_client_info::is_sensor_registered(sensor_id_t sensor) { AUTOLOCK(m_handle_info_lock); @@ -643,7 +643,7 @@ bool csensor_client_info::is_sensor_registered(sensor_id_t sensor) } -bool csensor_client_info::is_sensor_active(sensor_id_t sensor) +bool sensor_client_info::is_sensor_active(sensor_id_t sensor) { AUTOLOCK(m_handle_info_lock); @@ -660,9 +660,9 @@ bool csensor_client_info::is_sensor_active(sensor_id_t sensor) return false; } -bool csensor_client_info::is_event_active(int handle, unsigned int event_type, unsigned long long event_id) +bool sensor_client_info::is_event_active(int handle, unsigned int event_type, unsigned long long event_id) { - creg_event_info *event_info; + reg_event_info *event_info; AUTOLOCK(m_handle_info_lock); @@ -681,7 +681,7 @@ bool csensor_client_info::is_event_active(int handle, unsigned int event_type, u return true; } -void csensor_client_info::clear(void) +void sensor_client_info::clear(void) { close_command_channel(); m_sensor_handle_infos.clear(); diff --git a/src/client/csensor_client_info.h b/src/client/sensor_client_info.h similarity index 92% rename from src/client/csensor_client_info.h rename to src/client/sensor_client_info.h index 33108d8..53b7c6a 100644 --- a/src/client/csensor_client_info.h +++ b/src/client/sensor_client_info.h @@ -17,12 +17,12 @@ * */ -#ifndef CSENSOR_CLIENT_INFO_H_ -#define CSENSOR_CLIENT_INFO_H_ +#ifndef _SENSOR_CLIENT_INFO_H_ +#define _SENSOR_CLIENT_INFO_H_ #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ using std::condition_variable; typedef vector handle_vector; typedef vector sensor_id_vector; -typedef unordered_map sensor_handle_info_map; +typedef unordered_map sensor_handle_info_map; typedef unordered_map sensor_command_channel_map; typedef struct sensor_rep @@ -61,9 +61,9 @@ typedef struct sensor_rep event_type_vector event_types; } sensor_rep; -class csensor_client_info { +class sensor_client_info { public: - static csensor_client_info& get_instance(void); + static sensor_client_info& get_instance(void); int create_handle(sensor_id_t sensor_id); bool delete_handle(int handle); bool register_event(int handle, unsigned int event_type, @@ -114,8 +114,8 @@ public: void clear(void); - csensor_client_info(); - ~csensor_client_info(); + sensor_client_info(); + ~sensor_client_info(); private: sensor_handle_info_map m_sensor_handle_infos; @@ -125,4 +125,4 @@ private: cmutex m_handle_info_lock; }; -#endif /* CSENSOR_CLIENT_INFO_H_ */ +#endif /* _SENSOR_CLIENT_INFO_H_ */ diff --git a/src/client/csensor_event_listener.cpp b/src/client/sensor_event_listener.cpp similarity index 88% rename from src/client/csensor_event_listener.cpp rename to src/client/sensor_event_listener.cpp index 6595309..2c94ca8 100644 --- a/src/client/csensor_event_listener.cpp +++ b/src/client/sensor_event_listener.cpp @@ -17,7 +17,7 @@ * */ -#include +#include #include #include #include @@ -36,20 +36,20 @@ using std::thread; using std::pair; using std::vector; -csensor_event_listener::csensor_event_listener() +sensor_event_listener::sensor_event_listener() : m_poller(NULL) , m_thread_state(THREAD_STATE_TERMINATE) , m_hup_observer(NULL) -, m_client_info(csensor_client_info::get_instance()) +, m_client_info(sensor_client_info::get_instance()) { } -csensor_event_listener::~csensor_event_listener() +sensor_event_listener::~sensor_event_listener() { stop_event_listener(); } -csensor_event_listener::csensor_event_listener(const csensor_event_listener& listener) +sensor_event_listener::sensor_event_listener(const sensor_event_listener& listener) : m_poller(listener.m_poller) , m_thread_state(listener.m_thread_state) , m_hup_observer(listener.m_hup_observer) @@ -57,23 +57,23 @@ csensor_event_listener::csensor_event_listener(const csensor_event_listener& lis { } -csensor_event_listener& csensor_event_listener::get_instance(void) +sensor_event_listener& sensor_event_listener::get_instance(void) { - static csensor_event_listener inst; + static sensor_event_listener inst; return inst; } -bool csensor_event_listener::start_handle(int handle) +bool sensor_event_listener::start_handle(int handle) { return m_client_info.set_sensor_state(handle, SENSOR_STATE_STARTED); } -bool csensor_event_listener::stop_handle(int handle) +bool sensor_event_listener::stop_handle(int handle) { return m_client_info.set_sensor_state(handle, SENSOR_STATE_STOPPED); } -void csensor_event_listener::operate_sensor(sensor_id_t sensor, int power_save_state) +void sensor_event_listener::operate_sensor(sensor_id_t sensor, int power_save_state) { sensor_handle_info_map handles_info; @@ -102,11 +102,11 @@ void csensor_event_listener::operate_sensor(sensor_id_t sensor, int power_save_s } } -client_callback_info* csensor_event_listener::handle_calibration_cb(csensor_handle_info &handle_info, unsigned event_type, unsigned long long time, int accuracy) +client_callback_info* sensor_event_listener::handle_calibration_cb(sensor_handle_info &handle_info, unsigned event_type, unsigned long long time, int accuracy) { unsigned int cal_event_type = get_calibration_event_type(event_type); - creg_event_info *event_info = NULL; - creg_event_info *cal_event_info = NULL; + reg_event_info *event_info = NULL; + reg_event_info *cal_event_info = NULL; client_callback_info* cal_callback_info = NULL; if (!cal_event_type) @@ -152,10 +152,10 @@ client_callback_info* csensor_event_listener::handle_calibration_cb(csensor_hand } -void csensor_event_listener::handle_events(void* event) +void sensor_event_listener::handle_events(void* event) { unsigned long long cur_time; - creg_event_info *event_info = NULL; + reg_event_info *event_info = NULL; sensor_event_data_t event_data; sensor_id_t sensor_id; sensor_handle_info_map handles_info; @@ -207,7 +207,7 @@ void csensor_event_listener::handle_events(void* event) for (auto it_handle = handles_info.begin(); it_handle != handles_info.end(); ++it_handle) { - csensor_handle_info &sensor_handle_info = it_handle->second; + sensor_handle_info &sensor_handle_info = it_handle->second; event_info = sensor_handle_info.get_reg_event_info(event_type); if ((sensor_handle_info.m_sensor_id != sensor_id) || @@ -263,7 +263,7 @@ void csensor_event_listener::handle_events(void* event) } -client_callback_info* csensor_event_listener::get_callback_info(sensor_id_t sensor_id, const creg_event_info *event_info, void* sensor_data, void *buffer) +client_callback_info* sensor_event_listener::get_callback_info(sensor_id_t sensor_id, const reg_event_info *event_info, void* sensor_data, void *buffer) { client_callback_info* callback_info; @@ -338,7 +338,7 @@ client_callback_info* csensor_event_listener::get_callback_info(sensor_id_t sens return callback_info; } -void csensor_event_listener::post_callback_to_main_loop(client_callback_info* cb_info) +void sensor_event_listener::post_callback_to_main_loop(client_callback_info* cb_info) { if (cb_info->maincontext) { GSource *_source = g_idle_source_new(); @@ -350,16 +350,16 @@ void csensor_event_listener::post_callback_to_main_loop(client_callback_info* cb } } -bool csensor_event_listener::is_valid_callback(client_callback_info *cb_info) +bool sensor_event_listener::is_valid_callback(client_callback_info *cb_info) { return m_client_info.is_event_active(cb_info->handle, cb_info->event_type, cb_info->event_id); } -gboolean csensor_event_listener::callback_dispatcher(gpointer data) +gboolean sensor_event_listener::callback_dispatcher(gpointer data) { client_callback_info *cb_info = (client_callback_info*) data; - if (csensor_event_listener::get_instance().is_valid_callback(cb_info)) { + if (sensor_event_listener::get_instance().is_valid_callback(cb_info)) { if (cb_info->accuracy_cb) cb_info->accuracy_cb(cb_info->sensor, cb_info->timestamp, cb_info->accuracy, cb_info->accuracy_user_data); @@ -391,7 +391,7 @@ gboolean csensor_event_listener::callback_dispatcher(gpointer data) -ssize_t csensor_event_listener::sensor_event_poll(void* buffer, int buffer_len, struct epoll_event &event) +ssize_t sensor_event_listener::sensor_event_poll(void* buffer, int buffer_len, struct epoll_event &event) { ssize_t len; @@ -418,7 +418,7 @@ ssize_t csensor_event_listener::sensor_event_poll(void* buffer, int buffer_len, -void csensor_event_listener::listen_events(void) +void sensor_event_listener::listen_events(void) { struct epoll_event event; ssize_t len = -1; @@ -475,7 +475,7 @@ void csensor_event_listener::listen_events(void) } -bool csensor_event_listener::create_event_channel(void) +bool sensor_event_listener::create_event_channel(void) { int client_id; event_channel_ready_t event_channel_ready; @@ -519,13 +519,13 @@ bool csensor_event_listener::create_event_channel(void) } -void csensor_event_listener::close_event_channel(void) +void sensor_event_listener::close_event_channel(void) { m_event_socket.close(); } -void csensor_event_listener::stop_event_listener(void) +void sensor_event_listener::stop_event_listener(void) { const int THREAD_TERMINATING_TIMEOUT = 2; @@ -543,13 +543,13 @@ void csensor_event_listener::stop_event_listener(void) } } -void csensor_event_listener::set_thread_state(thread_state state) +void sensor_event_listener::set_thread_state(thread_state state) { lock l(m_thread_mutex); m_thread_state = state; } -void csensor_event_listener::clear(void) +void sensor_event_listener::clear(void) { close_event_channel(); stop_event_listener(); @@ -559,12 +559,12 @@ void csensor_event_listener::clear(void) } -void csensor_event_listener::set_hup_observer(hup_observer_t observer) +void sensor_event_listener::set_hup_observer(hup_observer_t observer) { m_hup_observer = observer; } -bool csensor_event_listener::start_event_listener(void) +bool sensor_event_listener::start_event_listener(void) { if (!create_event_channel()) { ERR("Event channel is not established for %s", get_client_name()); @@ -578,7 +578,7 @@ bool csensor_event_listener::start_event_listener(void) set_thread_state(THREAD_STATE_START); - thread listener(&csensor_event_listener::listen_events, this); + thread listener(&sensor_event_listener::listen_events, this); listener.detach(); return true; diff --git a/src/client/csensor_event_listener.h b/src/client/sensor_event_listener.h similarity index 78% rename from src/client/csensor_event_listener.h rename to src/client/sensor_event_listener.h index 72dc7e7..2ea5e1f 100644 --- a/src/client/csensor_event_listener.h +++ b/src/client/sensor_event_listener.h @@ -17,14 +17,14 @@ * */ -#ifndef CSENSOR_EVENT_LISTENER_H_ -#define CSENSOR_EVENT_LISTENER_H_ +#ifndef _SENSOR_EVENT_LISTENER_H_ +#define _SENSOR_EVENT_LISTENER_H_ #include #include #include -#include -#include +#include +#include #include #include #include @@ -42,7 +42,7 @@ typedef std::vector handle_vector; typedef std::vector sensor_id_vector; -typedef std::unordered_map sensor_handle_info_map; +typedef std::unordered_map sensor_handle_info_map; typedef std::unordered_map sensor_command_channel_map; typedef struct { @@ -64,9 +64,9 @@ typedef struct { typedef void (*hup_observer_t)(void); -class csensor_event_listener { +class sensor_event_listener { public: - static csensor_event_listener& get_instance(void); + static sensor_event_listener& get_instance(void); bool start_handle(int handle); bool stop_handle(int handle); @@ -96,11 +96,11 @@ private: hup_observer_t m_hup_observer; - csensor_event_listener(); - ~csensor_event_listener(); + sensor_event_listener(); + ~sensor_event_listener(); - csensor_event_listener(const csensor_event_listener&); - csensor_event_listener& operator=(const csensor_event_listener&); + sensor_event_listener(const sensor_event_listener&); + sensor_event_listener& operator=(const sensor_event_listener&); bool create_event_channel(void); void close_event_channel(void); @@ -108,10 +108,10 @@ private: ssize_t sensor_event_poll(void* buffer, int buffer_len, struct epoll_event &event); void listen_events(void); - client_callback_info* handle_calibration_cb(csensor_handle_info &handle_info, unsigned event_type, unsigned long long time, int accuracy); + client_callback_info* handle_calibration_cb(sensor_handle_info &handle_info, unsigned event_type, unsigned long long time, int accuracy); void handle_events(void* event); - client_callback_info* get_callback_info(sensor_id_t sensor_id, const creg_event_info *event_info, void *sensor_data, void *buffer); + client_callback_info* get_callback_info(sensor_id_t sensor_id, const reg_event_info *event_info, void *sensor_data, void *buffer); unsigned long long renew_event_id(void); @@ -122,6 +122,6 @@ private: void set_thread_state(thread_state state); - csensor_client_info &m_client_info; + sensor_client_info &m_client_info; }; -#endif /* CSENSOR_EVENT_LISTENER_H_ */ +#endif /* _SENSOR_EVENT_LISTENER_H_ */ diff --git a/src/client/csensor_handle_info.cpp b/src/client/sensor_handle_info.cpp similarity index 76% rename from src/client/csensor_handle_info.cpp rename to src/client/sensor_handle_info.cpp index 76f0533..1439d43 100644 --- a/src/client/csensor_handle_info.cpp +++ b/src/client/sensor_handle_info.cpp @@ -18,14 +18,14 @@ */ #include -#include +#include #include using std::pair; -unsigned long long csensor_handle_info::m_event_id = 0; +unsigned long long sensor_handle_info::m_event_id = 0; -csensor_handle_info::csensor_handle_info() +sensor_handle_info::sensor_handle_info() : m_handle(0) , m_sensor_id(UNKNOWN_SENSOR) , m_sensor_state(SENSOR_STATE_UNKNOWN) @@ -39,12 +39,12 @@ csensor_handle_info::csensor_handle_info() } -csensor_handle_info::~csensor_handle_info() +sensor_handle_info::~sensor_handle_info() { clear_all_events(); } -creg_event_info* csensor_handle_info::get_reg_event_info(unsigned int event_type) +reg_event_info* sensor_handle_info::get_reg_event_info(unsigned int event_type) { auto it_event = m_reg_event_infos.find(event_type); @@ -56,7 +56,7 @@ creg_event_info* csensor_handle_info::get_reg_event_info(unsigned int event_type return &(it_event->second); } -void csensor_handle_info::get_reg_event_types(event_type_vector &event_types) +void sensor_handle_info::get_reg_event_types(event_type_vector &event_types) { auto it_event = m_reg_event_infos.begin(); @@ -66,9 +66,9 @@ void csensor_handle_info::get_reg_event_types(event_type_vector &event_types) } } -bool csensor_handle_info::add_reg_event_info(unsigned int event_type, unsigned int interval, unsigned int latency, int cb_type, void *cb, void *user_data) +bool sensor_handle_info::add_reg_event_info(unsigned int event_type, unsigned int interval, unsigned int latency, int cb_type, void *cb, void *user_data) { - creg_event_info event_info; + reg_event_info event_info; auto it_event = m_reg_event_infos.find(event_type); @@ -86,12 +86,12 @@ bool csensor_handle_info::add_reg_event_info(unsigned int event_type, unsigned i event_info.m_cb = cb; event_info.m_user_data = user_data; - m_reg_event_infos.insert(pair (event_type, event_info)); + m_reg_event_infos.insert(pair (event_type, event_info)); return true; } -bool csensor_handle_info::delete_reg_event_info(unsigned int event_type) +bool sensor_handle_info::delete_reg_event_info(unsigned int event_type) { auto it_event = m_reg_event_infos.find(event_type); @@ -105,18 +105,18 @@ bool csensor_handle_info::delete_reg_event_info(unsigned int event_type) return true; } -void csensor_handle_info::clear_all_events(void) +void sensor_handle_info::clear_all_events(void) { m_reg_event_infos.clear(); } -unsigned long long csensor_handle_info::renew_event_id(void) +unsigned long long sensor_handle_info::renew_event_id(void) { return m_event_id++; } -bool csensor_handle_info::change_reg_event_batch(unsigned int event_type, unsigned int interval, unsigned int latency) +bool sensor_handle_info::change_reg_event_batch(unsigned int event_type, unsigned int interval, unsigned int latency) { auto it_event = m_reg_event_infos.find(event_type); @@ -132,7 +132,7 @@ bool csensor_handle_info::change_reg_event_batch(unsigned int event_type, unsign return true; } -bool csensor_handle_info::change_reg_event_maincontext(unsigned int event_type, GMainContext *maincontext) +bool sensor_handle_info::change_reg_event_maincontext(unsigned int event_type, GMainContext *maincontext) { auto it_event = m_reg_event_infos.find(event_type); @@ -146,7 +146,7 @@ bool csensor_handle_info::change_reg_event_maincontext(unsigned int event_type, return true; } -void csensor_handle_info::get_batch(unsigned int &interval, unsigned int &latency) +void sensor_handle_info::get_batch(unsigned int &interval, unsigned int &latency) { if (m_reg_event_infos.empty()) { DBG("No events are registered for client %s", get_client_name()); @@ -176,7 +176,7 @@ void csensor_handle_info::get_batch(unsigned int &interval, unsigned int &latenc latency = min_latency; } -unsigned int csensor_handle_info::get_reg_event_count(void) +unsigned int sensor_handle_info::get_reg_event_count(void) { return m_reg_event_infos.size(); } diff --git a/src/client/csensor_handle_info.h b/src/client/sensor_handle_info.h similarity index 83% rename from src/client/csensor_handle_info.h rename to src/client/sensor_handle_info.h index 7b1f94d..adf211d 100644 --- a/src/client/csensor_handle_info.h +++ b/src/client/sensor_handle_info.h @@ -17,19 +17,19 @@ * */ -#ifndef CSENSOR_HANDLE_INFO_H_ -#define CSENSOR_HANDLE_INFO_H_ +#ifndef _SENSOR_HANDLE_INFO_H_ +#define _SENSOR_HANDLE_INFO_H_ -#include +#include #include #include #include #include #include -typedef std::unordered_map event_info_map; +typedef std::unordered_map event_info_map; -class csensor_handle_info { +class sensor_handle_info { public: int m_handle; sensor_id_t m_sensor_id; @@ -41,8 +41,8 @@ public: sensor_accuracy_changed_cb_t m_accuracy_cb; void *m_accuracy_user_data; - csensor_handle_info(); - ~csensor_handle_info(); + sensor_handle_info(); + ~sensor_handle_info(); bool add_reg_event_info(unsigned int event_type, unsigned int interval, unsigned int latency, int cb_type, void *cb,void *user_data); bool delete_reg_event_info(unsigned int event_type); @@ -50,7 +50,7 @@ public: bool change_reg_event_batch(unsigned int event_type, unsigned int interval, unsigned int latency); bool change_reg_event_maincontext(unsigned int event_type, GMainContext *maincontext); - creg_event_info* get_reg_event_info(const unsigned int event_type); + reg_event_info* get_reg_event_info(const unsigned int event_type); void get_reg_event_types(event_type_vector &event_types); void get_batch(unsigned int &interval, unsigned int &latency); unsigned int get_reg_event_count(void); @@ -63,4 +63,4 @@ private: }; -#endif /* CSENSOR_HANDLE_INFO_H_ */ +#endif /* _SENSOR_HANDLE_INFO_H_ */ diff --git a/src/server/cclient_info_manager.cpp b/src/server/client_info_manager.cpp similarity index 73% rename from src/server/cclient_info_manager.cpp rename to src/server/client_info_manager.cpp index 540491c..52308ff 100644 --- a/src/server/cclient_info_manager.cpp +++ b/src/server/client_info_manager.cpp @@ -17,28 +17,28 @@ * */ -#include +#include #include #include using std::pair; using std::string; -cclient_info_manager::cclient_info_manager() +client_info_manager::client_info_manager() { } -cclient_info_manager::~cclient_info_manager() +client_info_manager::~client_info_manager() { m_clients.clear(); } -cclient_info_manager& cclient_info_manager::get_instance() +client_info_manager& client_info_manager::get_instance() { - static cclient_info_manager inst; + static client_info_manager inst; return inst; } -bool cclient_info_manager::get_registered_events(int client_id, sensor_id_t sensor_id, event_type_vector &event_vec) +bool client_info_manager::get_registered_events(int client_id, sensor_id_t sensor_id, event_type_vector &event_vec) { AUTOLOCK(m_mutex); @@ -56,7 +56,7 @@ bool cclient_info_manager::get_registered_events(int client_id, sensor_id_t sens } -bool cclient_info_manager::register_event(int client_id, sensor_id_t sensor_id, unsigned int event_type) +bool client_info_manager::register_event(int client_id, sensor_id_t sensor_id, unsigned int event_type) { AUTOLOCK(m_mutex); @@ -73,7 +73,7 @@ bool cclient_info_manager::register_event(int client_id, sensor_id_t sensor_id, return true; } -bool cclient_info_manager::unregister_event(int client_id, sensor_id_t sensor_id, unsigned int event_type) +bool client_info_manager::unregister_event(int client_id, sensor_id_t sensor_id, unsigned int event_type) { AUTOLOCK(m_mutex); @@ -90,7 +90,7 @@ bool cclient_info_manager::unregister_event(int client_id, sensor_id_t sensor_id return true; } -bool cclient_info_manager::set_batch(int client_id, sensor_id_t sensor_id, unsigned int interval, unsigned latency) +bool client_info_manager::set_batch(int client_id, sensor_id_t sensor_id, unsigned int interval, unsigned latency) { AUTOLOCK(m_mutex); @@ -104,7 +104,7 @@ bool cclient_info_manager::set_batch(int client_id, sensor_id_t sensor_id, unsig return it_record->second.set_batch(sensor_id, interval, latency); } -bool cclient_info_manager::get_batch(int client_id, sensor_id_t sensor_id, unsigned int &interval, unsigned int &latency) +bool client_info_manager::get_batch(int client_id, sensor_id_t sensor_id, unsigned int &interval, unsigned int &latency) { AUTOLOCK(m_mutex); @@ -118,7 +118,7 @@ bool cclient_info_manager::get_batch(int client_id, sensor_id_t sensor_id, unsig return it_record->second.get_batch(sensor_id, interval, latency); } -bool cclient_info_manager::set_option(int client_id, sensor_id_t sensor_id, int option) +bool client_info_manager::set_option(int client_id, sensor_id_t sensor_id, int option) { AUTOLOCK(m_mutex); @@ -135,7 +135,7 @@ bool cclient_info_manager::set_option(int client_id, sensor_id_t sensor_id, int return true; } -bool cclient_info_manager::set_wakeup(int client_id, sensor_id_t sensor_id, int wakeup) +bool client_info_manager::set_wakeup(int client_id, sensor_id_t sensor_id, int wakeup) { AUTOLOCK(m_mutex); @@ -152,7 +152,7 @@ bool cclient_info_manager::set_wakeup(int client_id, sensor_id_t sensor_id, int return true; } -bool cclient_info_manager::set_start(int client_id, sensor_id_t sensor_id, bool start) +bool client_info_manager::set_start(int client_id, sensor_id_t sensor_id, bool start) { AUTOLOCK(m_mutex); @@ -170,7 +170,7 @@ bool cclient_info_manager::set_start(int client_id, sensor_id_t sensor_id, bool } -bool cclient_info_manager::is_started(int client_id, sensor_id_t sensor_id) +bool client_info_manager::is_started(int client_id, sensor_id_t sensor_id) { AUTOLOCK(m_mutex); @@ -184,13 +184,13 @@ bool cclient_info_manager::is_started(int client_id, sensor_id_t sensor_id) return it_record->second.is_started(sensor_id); } -int cclient_info_manager::create_client_record(void) +int client_info_manager::create_client_record(void) { AUTOLOCK(m_mutex); int client_id = 0; - cclient_sensor_record client_record; + client_sensor_record client_record; while (m_clients.count(client_id) > 0) client_id++; @@ -202,13 +202,13 @@ int cclient_info_manager::create_client_record(void) client_record.set_client_id(client_id); - m_clients.insert(pair (client_id, client_record)); + m_clients.insert(pair (client_id, client_record)); return client_id; } -bool cclient_info_manager::remove_client_record(int client_id) +bool client_info_manager::remove_client_record(int client_id) { AUTOLOCK(m_mutex); @@ -227,7 +227,7 @@ bool cclient_info_manager::remove_client_record(int client_id) } -bool cclient_info_manager::has_client_record(int client_id) +bool client_info_manager::has_client_record(int client_id) { AUTOLOCK(m_mutex); @@ -237,7 +237,7 @@ bool cclient_info_manager::has_client_record(int client_id) } -void cclient_info_manager::set_client_info(int client_id, pid_t pid, const string &name) +void client_info_manager::set_client_info(int client_id, pid_t pid, const string &name) { AUTOLOCK(m_mutex); @@ -253,7 +253,7 @@ void cclient_info_manager::set_client_info(int client_id, pid_t pid, const strin return; } -const char* cclient_info_manager::get_client_info(int client_id) +const char* client_info_manager::get_client_info(int client_id) { AUTOLOCK(m_mutex); @@ -267,7 +267,7 @@ const char* cclient_info_manager::get_client_info(int client_id) return it_record->second.get_client_info(); } -bool cclient_info_manager::set_permission(int client_id, int permission) +bool client_info_manager::set_permission(int client_id, int permission) { AUTOLOCK(m_mutex); @@ -282,7 +282,7 @@ bool cclient_info_manager::set_permission(int client_id, int permission) return true; } -bool cclient_info_manager::get_permission(int client_id, int &permission) +bool client_info_manager::get_permission(int client_id, int &permission) { AUTOLOCK(m_mutex); @@ -297,7 +297,7 @@ bool cclient_info_manager::get_permission(int client_id, int &permission) return true; } -bool cclient_info_manager::create_sensor_record(int client_id, sensor_id_t sensor_id) +bool client_info_manager::create_sensor_record(int client_id, sensor_id_t sensor_id) { AUTOLOCK(m_mutex); @@ -313,7 +313,7 @@ bool cclient_info_manager::create_sensor_record(int client_id, sensor_id_t senso return true; } -bool cclient_info_manager::remove_sensor_record(int client_id, sensor_id_t sensor_id) +bool client_info_manager::remove_sensor_record(int client_id, sensor_id_t sensor_id) { AUTOLOCK(m_mutex); @@ -334,7 +334,7 @@ bool cclient_info_manager::remove_sensor_record(int client_id, sensor_id_t senso } -bool cclient_info_manager::has_sensor_record(int client_id, sensor_id_t sensor_id) +bool client_info_manager::has_sensor_record(int client_id, sensor_id_t sensor_id) { AUTOLOCK(m_mutex); @@ -351,7 +351,7 @@ bool cclient_info_manager::has_sensor_record(int client_id, sensor_id_t sensor_i return true; } -bool cclient_info_manager::has_sensor_record(int client_id) +bool client_info_manager::has_sensor_record(int client_id) { AUTOLOCK(m_mutex); @@ -368,7 +368,7 @@ bool cclient_info_manager::has_sensor_record(int client_id) return true; } -bool cclient_info_manager::get_listener_ids(sensor_id_t sensor_id, unsigned int event_type, client_id_vec &id_vec) +bool client_info_manager::get_listener_ids(sensor_id_t sensor_id, unsigned int event_type, client_id_vec &id_vec) { AUTOLOCK(m_mutex); @@ -384,7 +384,7 @@ bool cclient_info_manager::get_listener_ids(sensor_id_t sensor_id, unsigned int return true; } -bool cclient_info_manager::get_event_socket(int client_id, csocket &socket) +bool client_info_manager::get_event_socket(int client_id, csocket &socket) { AUTOLOCK(m_mutex); @@ -400,7 +400,7 @@ bool cclient_info_manager::get_event_socket(int client_id, csocket &socket) return true; } -bool cclient_info_manager::set_event_socket(int client_id, const csocket &socket) +bool client_info_manager::set_event_socket(int client_id, const csocket &socket) { AUTOLOCK(m_mutex); diff --git a/src/server/cclient_info_manager.h b/src/server/client_info_manager.h similarity index 83% rename from src/server/cclient_info_manager.h rename to src/server/client_info_manager.h index f49b324..8947f4b 100644 --- a/src/server/cclient_info_manager.h +++ b/src/server/client_info_manager.h @@ -17,22 +17,22 @@ * */ -#ifndef CCLIENT_INFO_MANAGER_H_ -#define CCLIENT_INFO_MANAGER_H_ +#ifndef _CLIENT_INFO_MANAGER_H_ +#define _CLIENT_INFO_MANAGER_H_ -#include +#include #include #include #include #include -typedef std::unordered_map client_id_sensor_record_map; +typedef std::unordered_map client_id_sensor_record_map; typedef std::vector client_id_vec; -class cclient_info_manager { +class client_info_manager { public: - static cclient_info_manager& get_instance(); + static client_info_manager& get_instance(); int create_client_record(void); bool remove_client_record(int client_id); bool has_client_record(int client_id); @@ -68,10 +68,10 @@ private: client_id_sensor_record_map m_clients; cmutex m_mutex; - cclient_info_manager(); - ~cclient_info_manager(); - cclient_info_manager(cclient_info_manager const&) {}; - cclient_info_manager& operator=(cclient_info_manager const&); + client_info_manager(); + ~client_info_manager(); + client_info_manager(client_info_manager const&) {}; + client_info_manager& operator=(client_info_manager const&); }; -#endif /* CCLIENT_INFO_MANAGER_H_ */ +#endif /* _CLIENT_INFO_MANAGER_H_ */ diff --git a/src/server/cclient_sensor_record.cpp b/src/server/client_sensor_record.cpp similarity index 65% rename from src/server/cclient_sensor_record.cpp rename to src/server/client_sensor_record.cpp index 24d4c6c..da52cf4 100644 --- a/src/server/cclient_sensor_record.cpp +++ b/src/server/client_sensor_record.cpp @@ -17,13 +17,13 @@ * */ -#include +#include #include using std::pair; using std::string; -cclient_sensor_record::cclient_sensor_record() +client_sensor_record::client_sensor_record() : m_client_id(0) , m_pid(-1) , m_permission(SENSOR_PERMISSION_NONE) @@ -31,20 +31,20 @@ cclient_sensor_record::cclient_sensor_record() } -cclient_sensor_record::~cclient_sensor_record() +client_sensor_record::~client_sensor_record() { m_sensor_usages.clear(); close_event_socket(); } -bool cclient_sensor_record::register_event(sensor_id_t sensor_id, unsigned int event_type) +bool client_sensor_record::register_event(sensor_id_t sensor_id, unsigned int event_type) { auto it_usage = m_sensor_usages.find(sensor_id); if (it_usage == m_sensor_usages.end()) { - csensor_usage usage; + sensor_usage usage; usage.register_event(event_type); - m_sensor_usages.insert(pair(sensor_id, usage)); + m_sensor_usages.insert(pair(sensor_id, usage)); return true; } @@ -56,7 +56,7 @@ bool cclient_sensor_record::register_event(sensor_id_t sensor_id, unsigned int e return true; } -bool cclient_sensor_record::unregister_event(sensor_id_t sensor_id, unsigned int event_type) +bool client_sensor_record::unregister_event(sensor_id_t sensor_id, unsigned int event_type) { auto it_usage = m_sensor_usages.find(sensor_id); @@ -73,14 +73,14 @@ bool cclient_sensor_record::unregister_event(sensor_id_t sensor_id, unsigned int return true; } -bool cclient_sensor_record::set_option(sensor_id_t sensor_id, int option) +bool client_sensor_record::set_option(sensor_id_t sensor_id, int option) { auto it_usage = m_sensor_usages.find(sensor_id); if (it_usage == m_sensor_usages.end()) { - csensor_usage usage; + sensor_usage usage; usage.m_option = option; - m_sensor_usages.insert(pair(sensor_id, usage)); + m_sensor_usages.insert(pair(sensor_id, usage)); } else { it_usage->second.m_option = option; } @@ -88,14 +88,14 @@ bool cclient_sensor_record::set_option(sensor_id_t sensor_id, int option) return true; } -bool cclient_sensor_record::set_wakeup(sensor_id_t sensor_id, int wakeup) +bool client_sensor_record::set_wakeup(sensor_id_t sensor_id, int wakeup) { auto it_usage = m_sensor_usages.find(sensor_id); if (it_usage == m_sensor_usages.end()) { - csensor_usage usage; + sensor_usage usage; usage.m_wakeup = wakeup; - m_sensor_usages.insert(pair(sensor_id, usage)); + m_sensor_usages.insert(pair(sensor_id, usage)); } else { it_usage->second.m_wakeup = wakeup; } @@ -103,14 +103,14 @@ bool cclient_sensor_record::set_wakeup(sensor_id_t sensor_id, int wakeup) return true; } -bool cclient_sensor_record::set_start(sensor_id_t sensor_id, bool start) +bool client_sensor_record::set_start(sensor_id_t sensor_id, bool start) { auto it_usage = m_sensor_usages.find(sensor_id); if (it_usage == m_sensor_usages.end()) { - csensor_usage usage; + sensor_usage usage; usage.m_start = start; - m_sensor_usages.insert(pair(sensor_id, usage)); + m_sensor_usages.insert(pair(sensor_id, usage)); } else { it_usage->second.m_start = start; } @@ -118,7 +118,7 @@ bool cclient_sensor_record::set_start(sensor_id_t sensor_id, bool start) return true; } -bool cclient_sensor_record::is_started(sensor_id_t sensor_id) +bool client_sensor_record::is_started(sensor_id_t sensor_id) { auto it_usage = m_sensor_usages.find(sensor_id); @@ -128,15 +128,15 @@ bool cclient_sensor_record::is_started(sensor_id_t sensor_id) return it_usage->second.m_start; } -bool cclient_sensor_record::set_batch(sensor_id_t sensor_id, unsigned int interval, unsigned int latency) +bool client_sensor_record::set_batch(sensor_id_t sensor_id, unsigned int interval, unsigned int latency) { auto it_usage = m_sensor_usages.find(sensor_id); if (it_usage == m_sensor_usages.end()) { - csensor_usage usage; + sensor_usage usage; usage.m_interval = interval; usage.m_latency = latency; - m_sensor_usages.insert(pair(sensor_id, usage)); + m_sensor_usages.insert(pair(sensor_id, usage)); } else { it_usage->second.m_interval = interval; it_usage->second.m_latency = latency; @@ -145,7 +145,7 @@ bool cclient_sensor_record::set_batch(sensor_id_t sensor_id, unsigned int interv return true; } -bool cclient_sensor_record::get_batch(sensor_id_t sensor_id, unsigned int &interval, unsigned int &latency) +bool client_sensor_record::get_batch(sensor_id_t sensor_id, unsigned int &interval, unsigned int &latency) { auto it_usage = m_sensor_usages.find(sensor_id); @@ -160,7 +160,7 @@ bool cclient_sensor_record::get_batch(sensor_id_t sensor_id, unsigned int &inter return true; } -bool cclient_sensor_record::is_listening_event(sensor_id_t sensor_id, unsigned int event_type) +bool client_sensor_record::is_listening_event(sensor_id_t sensor_id, unsigned int event_type) { auto it_usage = m_sensor_usages.find(sensor_id); @@ -173,7 +173,7 @@ bool cclient_sensor_record::is_listening_event(sensor_id_t sensor_id, unsigned i return false; } -bool cclient_sensor_record::add_sensor_usage(sensor_id_t sensor_id) +bool client_sensor_record::add_sensor_usage(sensor_id_t sensor_id) { auto it_usage = m_sensor_usages.find(sensor_id); @@ -182,12 +182,12 @@ bool cclient_sensor_record::add_sensor_usage(sensor_id_t sensor_id) return false; } - csensor_usage usage; - m_sensor_usages.insert(pair (sensor_id, usage)); + sensor_usage usage; + m_sensor_usages.insert(pair (sensor_id, usage)); return true; } -bool cclient_sensor_record::remove_sensor_usage(sensor_id_t sensor_id) +bool client_sensor_record::remove_sensor_usage(sensor_id_t sensor_id) { auto it_usage = m_sensor_usages.find(sensor_id); @@ -199,7 +199,7 @@ bool cclient_sensor_record::remove_sensor_usage(sensor_id_t sensor_id) return true; } -bool cclient_sensor_record::has_sensor_usage(void) +bool client_sensor_record::has_sensor_usage(void) { if (m_sensor_usages.empty()) return false; @@ -208,7 +208,7 @@ bool cclient_sensor_record::has_sensor_usage(void) } -bool cclient_sensor_record::has_sensor_usage(sensor_id_t sensor_id) +bool client_sensor_record::has_sensor_usage(sensor_id_t sensor_id) { auto it_usage = m_sensor_usages.find(sensor_id); @@ -221,7 +221,7 @@ bool cclient_sensor_record::has_sensor_usage(sensor_id_t sensor_id) } -bool cclient_sensor_record::get_registered_events(sensor_id_t sensor_id, event_type_vector &event_vec) +bool client_sensor_record::get_registered_events(sensor_id_t sensor_id, event_type_vector &event_vec) { auto it_usage = m_sensor_usages.find(sensor_id); @@ -236,12 +236,12 @@ bool cclient_sensor_record::get_registered_events(sensor_id_t sensor_id, event_t } -void cclient_sensor_record::set_client_id(int client_id) +void client_sensor_record::set_client_id(int client_id) { m_client_id = client_id; } -void cclient_sensor_record::set_client_info(pid_t pid, const string &name) +void client_sensor_record::set_client_info(pid_t pid, const string &name) { char client_info[NAME_MAX + 32]; m_pid = pid; @@ -250,34 +250,34 @@ void cclient_sensor_record::set_client_info(pid_t pid, const string &name) m_client_info.assign(client_info); } -const char* cclient_sensor_record::get_client_info(void) +const char* client_sensor_record::get_client_info(void) { return m_client_info.c_str(); } -void cclient_sensor_record::set_permission(int permission) +void client_sensor_record::set_permission(int permission) { m_permission = permission; } -int cclient_sensor_record::get_permission(void) +int client_sensor_record::get_permission(void) { return m_permission; } -void cclient_sensor_record::set_event_socket(const csocket &socket) +void client_sensor_record::set_event_socket(const csocket &socket) { m_event_socket = socket; } -void cclient_sensor_record::get_event_socket(csocket &socket) +void client_sensor_record::get_event_socket(csocket &socket) { socket = m_event_socket; } -bool cclient_sensor_record::close_event_socket(void) +bool client_sensor_record::close_event_socket(void) { return m_event_socket.close(); } diff --git a/src/server/cclient_sensor_record.h b/src/server/client_sensor_record.h similarity index 87% rename from src/server/cclient_sensor_record.h rename to src/server/client_sensor_record.h index 6ddde9c..d6968e9 100644 --- a/src/server/cclient_sensor_record.h +++ b/src/server/client_sensor_record.h @@ -17,22 +17,22 @@ * */ -#ifndef CCLIENT_SENSOR_RECORD_H_ -#define CCLIENT_SENSOR_RECORD_H_ +#ifndef _CLIENT_SENSOR_RECORD_H_ +#define _CLIENT_SENSOR_RECORD_H_ #include #include -#include +#include #include #include #include -typedef std::unordered_map sensor_usage_map; +typedef std::unordered_map sensor_usage_map; -class cclient_sensor_record { +class client_sensor_record { public: - cclient_sensor_record(); - ~cclient_sensor_record(); + client_sensor_record(); + ~client_sensor_record(); void set_client_id(int client_id); @@ -75,4 +75,4 @@ private: sensor_usage_map m_sensor_usages; }; -#endif /* CCLIENT_SENSOR_RECORD_H_ */ +#endif /* _CLIENT_SENSOR_RECORD_H_ */ diff --git a/src/server/command_worker.cpp b/src/server/command_worker.cpp index b72d7b6..e0359f2 100644 --- a/src/server/command_worker.cpp +++ b/src/server/command_worker.cpp @@ -868,14 +868,14 @@ bool command_worker::is_permission_allowed(void) } -cclient_info_manager& command_worker::get_client_info_manager(void) +client_info_manager& command_worker::get_client_info_manager(void) { - return cclient_info_manager::get_instance(); + return client_info_manager::get_instance(); } -csensor_event_dispatcher& command_worker::get_event_dispathcher(void) +sensor_event_dispatcher& command_worker::get_event_dispathcher(void) { - return csensor_event_dispatcher::get_instance(); + return sensor_event_dispatcher::get_instance(); } void insert_priority_list(unsigned int event_type) diff --git a/src/server/command_worker.h b/src/server/command_worker.h index 8f7b7a8..217f4aa 100644 --- a/src/server/command_worker.h +++ b/src/server/command_worker.h @@ -17,12 +17,12 @@ * */ -#ifndef COMMAND_WORKER_H_ -#define COMMAND_WORKER_H_ +#ifndef _COMMAND_WORKER_H_ +#define _COMMAND_WORKER_H_ #include -#include -#include +#include +#include #include #include #include @@ -83,8 +83,8 @@ private: int get_permission(void); bool is_permission_allowed(void); - static cclient_info_manager& get_client_info_manager(void); - static csensor_event_dispatcher& get_event_dispathcher(void); + static client_info_manager& get_client_info_manager(void); + static sensor_event_dispatcher& get_event_dispathcher(void); public: command_worker(const csocket& socket); virtual ~command_worker(); @@ -93,4 +93,4 @@ public: }; -#endif /* COMMAND_WORKER_H_ */ +#endif /* _COMMAND_WORKER_H_ */ diff --git a/src/server/dbus_util.h b/src/server/dbus_util.h index 96a9635..bca46b4 100755 --- a/src/server/dbus_util.h +++ b/src/server/dbus_util.h @@ -29,4 +29,4 @@ enum dbus_ret{ void init_dbus(void); void fini_dbus(void); -#endif /* SENSORD_GDBUS_H_ */ +#endif /* _DBUS_UTIL_H_ */ diff --git a/src/server/cconfig.cpp b/src/server/device_config.cpp similarity index 91% rename from src/server/cconfig.cpp rename to src/server/device_config.cpp index 14c7f01..3497ca6 100755 --- a/src/server/cconfig.cpp +++ b/src/server/device_config.cpp @@ -17,7 +17,7 @@ * */ -#include +#include #include #include @@ -25,17 +25,17 @@ using std::ifstream; using std::string; using std::istringstream; -cconfig::cconfig(void) +device_config::device_config(void) { } -cconfig::~cconfig(void) +device_config::~device_config(void) { } -bool cconfig::get_device_id(void) +bool device_config::get_device_id(void) { const string INFO_INI_PATH = "/etc/info.ini"; const string START_DELIMETER = "Model="; diff --git a/src/server/cconfig.h b/src/server/device_config.h similarity index 85% rename from src/server/cconfig.h rename to src/server/device_config.h index ef2802f..c7a668b 100755 --- a/src/server/cconfig.h +++ b/src/server/device_config.h @@ -17,25 +17,25 @@ * */ -#ifndef _CCONFIG_H_ -#define _CCONFIG_H_ +#ifndef _DEVICE_CONFIG_H_ +#define _DEVICE_CONFIG_H_ #include #include #include -class cconfig +class device_config { protected: virtual bool load_config(const std::string& config_path) = 0; std::string m_device_id; public: - cconfig(); - virtual ~cconfig(); + device_config(); + virtual ~device_config(); bool get_device_id(void); }; -#endif /* _CCONFIG_H_ */ +#endif /* _DEVICE_CONFIG_H_ */ diff --git a/src/server/permission_checker.h b/src/server/permission_checker.h index 8acc6ac..53fa3b6 100755 --- a/src/server/permission_checker.h +++ b/src/server/permission_checker.h @@ -58,4 +58,4 @@ public: int get_permission(int sock_fd); }; -#endif /* COMMAND_WORKER_H_ */ +#endif /* _PERMISSION_CHECKER_H_ */ diff --git a/src/server/physical_sensor.cpp b/src/server/physical_sensor.cpp index 2df83e3..b108682 100644 --- a/src/server/physical_sensor.cpp +++ b/src/server/physical_sensor.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #define UNKNOWN_NAME "UNKNOWN_SENSOR" diff --git a/src/server/physical_sensor.h b/src/server/physical_sensor.h index 3fb5924..2fb245a 100644 --- a/src/server/physical_sensor.h +++ b/src/server/physical_sensor.h @@ -59,4 +59,4 @@ private: virtual bool get_properties(sensor_properties_s &properties); }; -#endif +#endif /* _PHYSICAL_SENSOR_H_ */ diff --git a/src/server/cplugin_info_list.cpp b/src/server/plugin_info_list.cpp similarity index 76% rename from src/server/cplugin_info_list.cpp rename to src/server/plugin_info_list.cpp index db9714d..0de1b21 100644 --- a/src/server/cplugin_info_list.cpp +++ b/src/server/plugin_info_list.cpp @@ -17,7 +17,7 @@ * */ -#include +#include #include @@ -40,17 +40,17 @@ cwakeup_info::cwakeup_info(int client_id, int wakeup) this->wakeup = wakeup; } -bool cplugin_info_list::comp_interval_info(cinterval_info a, cinterval_info b) +bool plugin_info_list::comp_interval_info(cinterval_info a, cinterval_info b) { return a.interval < b.interval; } -bool cplugin_info_list::comp_batch_info(cbatch_info a, cbatch_info b) +bool plugin_info_list::comp_batch_info(cbatch_info a, cbatch_info b) { return a.latency < b.latency; } -cinterval_info_iterator cplugin_info_list::find_if_interval_info(int client_id, bool is_processor) +cinterval_info_iterator plugin_info_list::find_if_interval_info(int client_id, bool is_processor) { auto iter = m_interval_info_list.begin(); @@ -64,7 +64,7 @@ cinterval_info_iterator cplugin_info_list::find_if_interval_info(int client_id, return iter; } -cbatch_info_iterator cplugin_info_list::find_if_batch_info(int client_id) +cbatch_info_iterator plugin_info_list::find_if_batch_info(int client_id) { auto iter = m_batch_info_list.begin(); @@ -78,7 +78,7 @@ cbatch_info_iterator cplugin_info_list::find_if_batch_info(int client_id) return iter; } -cwakeup_info_iterator cplugin_info_list::find_if_wakeup_info(int client_id) +cwakeup_info_iterator plugin_info_list::find_if_wakeup_info(int client_id) { auto iter = m_wakeup_info_list.begin(); @@ -92,7 +92,7 @@ cwakeup_info_iterator cplugin_info_list::find_if_wakeup_info(int client_id) return iter; } -bool cplugin_info_list::add_interval(int client_id, unsigned int interval, bool is_processor) +bool plugin_info_list::add_interval(int client_id, unsigned int interval, bool is_processor) { auto iter = find_if_interval_info(client_id, is_processor); @@ -104,7 +104,7 @@ bool cplugin_info_list::add_interval(int client_id, unsigned int interval, bool return true; } -bool cplugin_info_list::delete_interval(int client_id, bool is_processor) +bool plugin_info_list::delete_interval(int client_id, bool is_processor) { auto iter = find_if_interval_info(client_id, is_processor); @@ -116,7 +116,7 @@ bool cplugin_info_list::delete_interval(int client_id, bool is_processor) return true; } -unsigned int cplugin_info_list::get_interval(int client_id, bool is_processor) +unsigned int plugin_info_list::get_interval(int client_id, bool is_processor) { auto iter = find_if_interval_info(client_id, is_processor); @@ -126,7 +126,7 @@ unsigned int cplugin_info_list::get_interval(int client_id, bool is_processor) return iter->interval; } -unsigned int cplugin_info_list::get_min_interval(void) +unsigned int plugin_info_list::get_min_interval(void) { if (m_interval_info_list.empty()) return 0; @@ -136,7 +136,7 @@ unsigned int cplugin_info_list::get_min_interval(void) return iter->interval; } -bool cplugin_info_list::add_batch(int client_id, unsigned int latency) +bool plugin_info_list::add_batch(int client_id, unsigned int latency) { auto iter = find_if_batch_info(client_id); @@ -148,7 +148,7 @@ bool cplugin_info_list::add_batch(int client_id, unsigned int latency) return true; } -bool cplugin_info_list::delete_batch(int client_id) +bool plugin_info_list::delete_batch(int client_id) { auto iter = find_if_batch_info(client_id); @@ -160,7 +160,7 @@ bool cplugin_info_list::delete_batch(int client_id) return true; } -unsigned int cplugin_info_list::get_batch(int client_id) +unsigned int plugin_info_list::get_batch(int client_id) { auto iter = find_if_batch_info(client_id); @@ -170,7 +170,7 @@ unsigned int cplugin_info_list::get_batch(int client_id) return iter->latency; } -unsigned int cplugin_info_list::get_max_batch(void) +unsigned int plugin_info_list::get_max_batch(void) { if (m_batch_info_list.empty()) return 0; @@ -180,7 +180,7 @@ unsigned int cplugin_info_list::get_max_batch(void) return iter->latency; } -bool cplugin_info_list::add_wakeup(int client_id, int wakeup) +bool plugin_info_list::add_wakeup(int client_id, int wakeup) { auto iter = find_if_wakeup_info(client_id); @@ -192,7 +192,7 @@ bool cplugin_info_list::add_wakeup(int client_id, int wakeup) return true; } -bool cplugin_info_list::delete_wakeup(int client_id) +bool plugin_info_list::delete_wakeup(int client_id) { auto iter = find_if_wakeup_info(client_id); @@ -204,7 +204,7 @@ bool cplugin_info_list::delete_wakeup(int client_id) return true; } -int cplugin_info_list::get_wakeup(int client_id) +int plugin_info_list::get_wakeup(int client_id) { auto iter = find_if_wakeup_info(client_id); @@ -214,7 +214,7 @@ int cplugin_info_list::get_wakeup(int client_id) return iter->wakeup; } -int cplugin_info_list::is_wakeup_on(void) +int plugin_info_list::is_wakeup_on(void) { if (m_wakeup_info_list.empty()) return -1; diff --git a/src/server/cplugin_info_list.h b/src/server/plugin_info_list.h similarity index 95% rename from src/server/cplugin_info_list.h rename to src/server/plugin_info_list.h index 6ea149e..d96c556 100644 --- a/src/server/cplugin_info_list.h +++ b/src/server/plugin_info_list.h @@ -17,8 +17,8 @@ * */ -#ifndef _CPLUGIN_INFO_LIST_CLASS_H_ -#define _CPLUGIN_INFO_LIST_CLASS_H_ +#ifndef _PLUGIN_INFO_LIST_H_ +#define _PLUGIN_INFO_LIST_H_ #include @@ -53,7 +53,7 @@ public: typedef std::list::iterator cwakeup_info_iterator; -class cplugin_info_list +class plugin_info_list { private: static bool comp_interval_info(cinterval_info a, cinterval_info b); @@ -84,4 +84,4 @@ public: int get_wakeup(int client_id); int is_wakeup_on(void); }; -#endif +#endif /* _PLUGIN_INFO_LIST_H_ */ diff --git a/src/server/plugins/auto_rotation/auto_rotation_sensor.cpp b/src/server/plugins/auto_rotation/auto_rotation_sensor.cpp index 15046be..4ef30fa 100755 --- a/src/server/plugins/auto_rotation/auto_rotation_sensor.cpp +++ b/src/server/plugins/auto_rotation/auto_rotation_sensor.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include @@ -59,7 +59,7 @@ auto_rotation_sensor::auto_rotation_sensor() , m_rotation_time(1) // rotation state is valid from initial state, so set rotation time to non-zero value , m_alg(NULL) { - cvirtual_sensor_config &config = cvirtual_sensor_config::get_instance(); + virtual_sensor_config &config = virtual_sensor_config::get_instance(); if (!config.get(SENSOR_TYPE_AUTO_ROTATION, ELEMENT_VENDOR, m_vendor)) { ERR("[VENDOR] is empty\n"); diff --git a/src/server/plugins/fusion/fusion_sensor.cpp b/src/server/plugins/fusion/fusion_sensor.cpp index 9830117..a2f9183 100755 --- a/src/server/plugins/fusion/fusion_sensor.cpp +++ b/src/server/plugins/fusion/fusion_sensor.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include using std::string; @@ -79,7 +79,7 @@ fusion_sensor::fusion_sensor() , m_magnetic_sensor(NULL) , m_time(0) { - cvirtual_sensor_config &config = cvirtual_sensor_config::get_instance(); + virtual_sensor_config &config = virtual_sensor_config::get_instance(); m_name = string(SENSOR_NAME); m_enable_fusion = 0; diff --git a/src/server/plugins/gravity/gravity_sensor.cpp b/src/server/plugins/gravity/gravity_sensor.cpp index c1871f5..b77bac4 100755 --- a/src/server/plugins/gravity/gravity_sensor.cpp +++ b/src/server/plugins/gravity/gravity_sensor.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include using std::string; using std::vector; @@ -67,7 +67,7 @@ gravity_sensor::gravity_sensor() , m_fusion_sensor(NULL) , m_time(0) { - cvirtual_sensor_config &config = cvirtual_sensor_config::get_instance(); + virtual_sensor_config &config = virtual_sensor_config::get_instance(); sensor_hal *fusion_sensor_hal = sensor_plugin_loader::get_instance().get_sensor_hal(SENSOR_HAL_TYPE_FUSION); if (!fusion_sensor_hal) diff --git a/src/server/plugins/linear_accel/linear_accel_sensor.cpp b/src/server/plugins/linear_accel/linear_accel_sensor.cpp index 71a3c9a..f320885 100755 --- a/src/server/plugins/linear_accel/linear_accel_sensor.cpp +++ b/src/server/plugins/linear_accel/linear_accel_sensor.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include using std::string; using std::vector; @@ -75,7 +75,7 @@ linear_accel_sensor::linear_accel_sensor() , m_fusion_sensor(NULL) , m_time(0) { - cvirtual_sensor_config &config = cvirtual_sensor_config::get_instance(); + virtual_sensor_config &config = virtual_sensor_config::get_instance(); m_name = string(SENSOR_NAME); m_enable_linear_accel = 0; diff --git a/src/server/plugins/orientation/orientation_sensor.cpp b/src/server/plugins/orientation/orientation_sensor.cpp index 10876bf..a4200d5 100755 --- a/src/server/plugins/orientation/orientation_sensor.cpp +++ b/src/server/plugins/orientation/orientation_sensor.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include using std::string; using std::vector; @@ -62,7 +62,7 @@ orientation_sensor::orientation_sensor() , m_fusion_sensor(NULL) , m_time(0) { - cvirtual_sensor_config &config = cvirtual_sensor_config::get_instance(); + virtual_sensor_config &config = virtual_sensor_config::get_instance(); sensor_hal *fusion_sensor_hal = sensor_plugin_loader::get_instance().get_sensor_hal(SENSOR_HAL_TYPE_FUSION); if (!fusion_sensor_hal) diff --git a/src/server/plugins/rotation_vector/gaming_rv/gaming_rv_sensor.cpp b/src/server/plugins/rotation_vector/gaming_rv/gaming_rv_sensor.cpp index f7b3367..df3b168 100755 --- a/src/server/plugins/rotation_vector/gaming_rv/gaming_rv_sensor.cpp +++ b/src/server/plugins/rotation_vector/gaming_rv/gaming_rv_sensor.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include using std::string; using std::vector; @@ -63,7 +63,7 @@ gaming_rv_sensor::gaming_rv_sensor() , m_accuracy(-1) , m_time(0) { - cvirtual_sensor_config &config = cvirtual_sensor_config::get_instance(); + virtual_sensor_config &config = virtual_sensor_config::get_instance(); sensor_hal *fusion_sensor_hal = sensor_plugin_loader::get_instance().get_sensor_hal(SENSOR_HAL_TYPE_FUSION); if (!fusion_sensor_hal) diff --git a/src/server/plugins/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp b/src/server/plugins/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp index 9e54ec4..6bfdaf4 100755 --- a/src/server/plugins/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp +++ b/src/server/plugins/rotation_vector/geomagnetic_rv/geomagnetic_rv_sensor.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include using std::string; using std::vector; @@ -51,7 +51,7 @@ geomagnetic_rv_sensor::geomagnetic_rv_sensor() , m_fusion_sensor(NULL) , m_time(0) { - cvirtual_sensor_config &config = cvirtual_sensor_config::get_instance(); + virtual_sensor_config &config = virtual_sensor_config::get_instance(); sensor_hal *fusion_sensor_hal = sensor_plugin_loader::get_instance().get_sensor_hal(SENSOR_HAL_TYPE_FUSION); if (!fusion_sensor_hal) diff --git a/src/server/plugins/rotation_vector/rv/rv_sensor.cpp b/src/server/plugins/rotation_vector/rv/rv_sensor.cpp index 5cc98fa..08d1353 100755 --- a/src/server/plugins/rotation_vector/rv/rv_sensor.cpp +++ b/src/server/plugins/rotation_vector/rv/rv_sensor.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include using std::string; using std::vector; @@ -56,7 +56,7 @@ rv_sensor::rv_sensor() , m_fusion_sensor(NULL) , m_time(0) { - cvirtual_sensor_config &config = cvirtual_sensor_config::get_instance(); + virtual_sensor_config &config = virtual_sensor_config::get_instance(); // Will check if fusion_sensor is in the list of hal sensors. sensor_hal *fusion_sensor_hal = sensor_plugin_loader::get_instance().get_sensor_hal(SENSOR_HAL_TYPE_FUSION); diff --git a/src/server/plugins/tilt/tilt_sensor.cpp b/src/server/plugins/tilt/tilt_sensor.cpp index 8276f89..a7830fe 100755 --- a/src/server/plugins/tilt/tilt_sensor.cpp +++ b/src/server/plugins/tilt/tilt_sensor.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include using std::string; using std::vector; @@ -58,7 +58,7 @@ tilt_sensor::tilt_sensor() , m_fusion_sensor(NULL) , m_time(0) { - cvirtual_sensor_config &config = cvirtual_sensor_config::get_instance(); + virtual_sensor_config &config = virtual_sensor_config::get_instance(); m_name = string(SENSOR_NAME); register_supported_event(TILT_RAW_DATA_EVENT); diff --git a/src/server/sensor_base.cpp b/src/server/sensor_base.cpp index 48b81cc..cbe5966 100644 --- a/src/server/sensor_base.cpp +++ b/src/server/sensor_base.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include using std::make_pair; using std::vector; @@ -401,7 +401,7 @@ bool sensor_base::push(sensor_event_t *event, int event_length) if (m_client <= 0) return false; - csensor_event_queue::get_instance().push(event, event_length); + sensor_event_queue::get_instance().push(event, event_length); return true; } @@ -413,7 +413,7 @@ bool sensor_base::push(const sensor_event_t &event) if (m_client <= 0) return false; - csensor_event_queue::get_instance().push(event); + sensor_event_queue::get_instance().push(event); return true; } @@ -424,7 +424,7 @@ bool sensor_base::push(sensor_event_t *event) if (m_client <= 0) return false; - csensor_event_queue::get_instance().push(event); + sensor_event_queue::get_instance().push(event); return true; } @@ -435,7 +435,7 @@ bool sensor_base::push(const sensorhub_event_t &event) if (m_client <= 0) return false; - csensor_event_queue::get_instance().push(event); + sensor_event_queue::get_instance().push(event); return true; } @@ -446,7 +446,7 @@ bool sensor_base::push(sensorhub_event_t *event) if (m_client <= 0) return false; - csensor_event_queue::get_instance().push(event); + sensor_event_queue::get_instance().push(event); return true; } */ diff --git a/src/server/sensor_base.h b/src/server/sensor_base.h index c3d19c3..58b1087 100644 --- a/src/server/sensor_base.h +++ b/src/server/sensor_base.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include @@ -110,7 +110,7 @@ private: int m_permission; - cplugin_info_list m_plugin_info_list; + plugin_info_list m_plugin_info_list; cmutex m_plugin_info_list_mutex; unsigned int m_client; @@ -132,4 +132,4 @@ private: static unsigned long long get_timestamp(timeval *t); }; -#endif +#endif /* _SENSOR_BASE_H_ */ diff --git a/src/server/csensor_event_dispatcher.cpp b/src/server/sensor_event_dispatcher.cpp similarity index 80% rename from src/server/csensor_event_dispatcher.cpp rename to src/server/sensor_event_dispatcher.cpp index 06eb8a8..9b58afc 100755 --- a/src/server/csensor_event_dispatcher.cpp +++ b/src/server/sensor_event_dispatcher.cpp @@ -17,7 +17,7 @@ * */ -#include +#include #include #include #include @@ -28,22 +28,22 @@ using std::pair; #define MAX_PENDING_CONNECTION 32 -csensor_event_dispatcher::csensor_event_dispatcher() +sensor_event_dispatcher::sensor_event_dispatcher() : m_lcd_on(false) { } -csensor_event_dispatcher::~csensor_event_dispatcher() { } +sensor_event_dispatcher::~sensor_event_dispatcher() { } -csensor_event_dispatcher& csensor_event_dispatcher::get_instance() +sensor_event_dispatcher& sensor_event_dispatcher::get_instance() { - static csensor_event_dispatcher inst; + static sensor_event_dispatcher inst; return inst; } -bool csensor_event_dispatcher::run(void) +bool sensor_event_dispatcher::run(void) { INFO("Starting Event Dispatcher\n"); @@ -63,20 +63,20 @@ bool csensor_event_dispatcher::run(void) return false; } - thread accepter(&csensor_event_dispatcher::accept_connections, this); + thread accepter(&sensor_event_dispatcher::accept_connections, this); accepter.detach(); - thread dispatcher(&csensor_event_dispatcher::dispatch_event, this); + thread dispatcher(&sensor_event_dispatcher::dispatch_event, this); dispatcher.detach(); return true; } -void csensor_event_dispatcher::accept_event_channel(csocket client_socket) +void sensor_event_dispatcher::accept_event_channel(csocket client_socket) { int client_id; event_channel_ready_t event_channel_ready; - cclient_info_manager& client_info_manager = get_client_info_manager(); + client_info_manager& client_info_manager = get_client_info_manager(); client_socket.set_connection_mode(); @@ -108,7 +108,7 @@ void csensor_event_dispatcher::accept_event_channel(csocket client_socket) } } -void csensor_event_dispatcher::accept_connections(void) +void sensor_event_dispatcher::accept_connections(void) { INFO("Event channel acceptor is started.\n"); @@ -122,12 +122,12 @@ void csensor_event_dispatcher::accept_connections(void) INFO("New client connected (socket_fd : %d)\n", client_socket.get_socket_fd()); - thread event_channel_creator(&csensor_event_dispatcher::accept_event_channel, this, client_socket); + thread event_channel_creator(&sensor_event_dispatcher::accept_event_channel, this, client_socket); event_channel_creator.detach(); } } -void csensor_event_dispatcher::dispatch_event(void) +void sensor_event_dispatcher::dispatch_event(void) { const int MAX_SYNTH_PER_SENSOR = 5; @@ -188,10 +188,10 @@ void csensor_event_dispatcher::dispatch_event(void) } -void csensor_event_dispatcher::send_sensor_events(vector< pair > &events) +void sensor_event_dispatcher::send_sensor_events(vector< pair > &events) { sensor_event_t *sensor_events = NULL; - cclient_info_manager& client_info_manager = get_client_info_manager(); + client_info_manager& client_info_manager = get_client_info_manager(); const int RESERVED_CLIENT_CNT = 20; static client_id_vec id_vec(RESERVED_CLIENT_CNT); @@ -226,10 +226,10 @@ void csensor_event_dispatcher::send_sensor_events(vector< pair > &ev } } -void csensor_event_dispatcher::send_sensorhub_events(void* events) +void sensor_event_dispatcher::send_sensorhub_events(void* events) { sensorhub_event_t *sensor_hub_events; - cclient_info_manager& client_info_manager = get_client_info_manager(); + client_info_manager& client_info_manager = get_client_info_manager(); const int RESERVED_CLIENT_CNT = 20; static client_id_vec id_vec(RESERVED_CLIENT_CNT); @@ -263,28 +263,28 @@ void csensor_event_dispatcher::send_sensorhub_events(void* events) free(sensor_hub_events); } -cclient_info_manager& csensor_event_dispatcher::get_client_info_manager(void) +client_info_manager& sensor_event_dispatcher::get_client_info_manager(void) { - return cclient_info_manager::get_instance(); + return client_info_manager::get_instance(); } -csensor_event_queue& csensor_event_dispatcher::get_event_queue(void) +sensor_event_queue& sensor_event_dispatcher::get_event_queue(void) { - return csensor_event_queue::get_instance(); + return sensor_event_queue::get_instance(); } -bool csensor_event_dispatcher::is_record_event(unsigned int event_type) +bool sensor_event_dispatcher::is_record_event(unsigned int event_type) { return false; } -void csensor_event_dispatcher::put_last_event(unsigned int event_type, const sensor_event_t &event) +void sensor_event_dispatcher::put_last_event(unsigned int event_type, const sensor_event_t &event) { AUTOLOCK(m_last_events_mutex); m_last_events[event_type] = event; } -bool csensor_event_dispatcher::get_last_event(unsigned int event_type, sensor_event_t &event) +bool sensor_event_dispatcher::get_last_event(unsigned int event_type, sensor_event_t &event) { AUTOLOCK(m_last_events_mutex); @@ -297,7 +297,7 @@ bool csensor_event_dispatcher::get_last_event(unsigned int event_type, sensor_ev return true; } -bool csensor_event_dispatcher::has_active_virtual_sensor(virtual_sensor *sensor) +bool sensor_event_dispatcher::has_active_virtual_sensor(virtual_sensor *sensor) { AUTOLOCK(m_active_virtual_sensors_mutex); @@ -307,7 +307,7 @@ bool csensor_event_dispatcher::has_active_virtual_sensor(virtual_sensor *sensor) } -virtual_sensors csensor_event_dispatcher::get_active_virtual_sensors(void) +virtual_sensors sensor_event_dispatcher::get_active_virtual_sensors(void) { AUTOLOCK(m_active_virtual_sensors_mutex); @@ -320,14 +320,14 @@ struct sort_comp { } }; -void csensor_event_dispatcher::sort_sensor_events(vector< pair > &events) +void sensor_event_dispatcher::sort_sensor_events(vector< pair > &events) { std::sort(events.begin(), events.end(), sort_comp()); } -void csensor_event_dispatcher::request_last_event(int client_id, sensor_id_t sensor_id) +void sensor_event_dispatcher::request_last_event(int client_id, sensor_id_t sensor_id) { - cclient_info_manager& client_info_manager = get_client_info_manager(); + client_info_manager& client_info_manager = get_client_info_manager(); event_type_vector event_vec; csocket client_socket; @@ -355,7 +355,7 @@ void csensor_event_dispatcher::request_last_event(int client_id, sensor_id_t sen } -bool csensor_event_dispatcher::add_active_virtual_sensor(virtual_sensor * sensor) +bool sensor_event_dispatcher::add_active_virtual_sensor(virtual_sensor * sensor) { AUTOLOCK(m_active_virtual_sensors_mutex); @@ -369,7 +369,7 @@ bool csensor_event_dispatcher::add_active_virtual_sensor(virtual_sensor * sensor return true; } -bool csensor_event_dispatcher::delete_active_virtual_sensor(virtual_sensor * sensor) +bool sensor_event_dispatcher::delete_active_virtual_sensor(virtual_sensor * sensor) { AUTOLOCK(m_active_virtual_sensors_mutex); diff --git a/src/server/csensor_event_dispatcher.h b/src/server/sensor_event_dispatcher.h similarity index 80% rename from src/server/csensor_event_dispatcher.h rename to src/server/sensor_event_dispatcher.h index bb40ac2..278b498 100755 --- a/src/server/csensor_event_dispatcher.h +++ b/src/server/sensor_event_dispatcher.h @@ -21,8 +21,8 @@ #define _SENSOR_EVENT_DISPATCHER_H_ #include -#include -#include +#include +#include #include #include #include @@ -33,7 +33,7 @@ typedef std::unordered_map event_type_last_event_map; typedef std::list virtual_sensors; -class csensor_event_dispatcher +class sensor_event_dispatcher { private: bool m_lcd_on; @@ -44,10 +44,10 @@ private: virtual_sensors m_active_virtual_sensors; cmutex m_active_virtual_sensors_mutex; - csensor_event_dispatcher(); - ~csensor_event_dispatcher(); - csensor_event_dispatcher(csensor_event_dispatcher const&) {}; - csensor_event_dispatcher& operator=(csensor_event_dispatcher const&); + sensor_event_dispatcher(); + ~sensor_event_dispatcher(); + sensor_event_dispatcher(sensor_event_dispatcher const&) {}; + sensor_event_dispatcher& operator=(sensor_event_dispatcher const&); void accept_connections(void); void accept_event_channel(csocket client_socket); @@ -55,8 +55,8 @@ private: void dispatch_event(void); void send_sensor_events(std::vector< std::pair > &events); void send_sensorhub_events(void* events); - static cclient_info_manager& get_client_info_manager(void); - static csensor_event_queue& get_event_queue(void); + static client_info_manager& get_client_info_manager(void); + static sensor_event_queue& get_event_queue(void); bool is_record_event(unsigned int event_type); void put_last_event(unsigned int event_type, const sensor_event_t &event); @@ -67,7 +67,7 @@ private: void sort_sensor_events(std::vector< std::pair > &events); public: - static csensor_event_dispatcher& get_instance(); + static sensor_event_dispatcher& get_instance(); bool run(void); void request_last_event(int client_id, sensor_id_t sensor_id); @@ -75,4 +75,4 @@ public: bool delete_active_virtual_sensor(virtual_sensor *sensor); }; -#endif +#endif /* _SENSOR_EVENT_DISPATCHER_H_ */ diff --git a/src/server/sensor_event_poller.h b/src/server/sensor_event_poller.h index 51d5f26..21f3240 100644 --- a/src/server/sensor_event_poller.h +++ b/src/server/sensor_event_poller.h @@ -17,6 +17,9 @@ * */ +#ifndef _SENSOR_EVENT_POLLER_H_ +#define _SENSOR_EVENT_POLLER_H_ + #include #include #include @@ -39,3 +42,5 @@ private: bool is_data_ready(int fd); bool process_event(int fd); }; + +#endif /* _SENSOR_EVENT_POLLER_H_ */ diff --git a/src/server/csensor_event_queue.cpp b/src/server/sensor_event_queue.cpp similarity index 79% rename from src/server/csensor_event_queue.cpp rename to src/server/sensor_event_queue.cpp index 6902e8b..444b053 100644 --- a/src/server/csensor_event_queue.cpp +++ b/src/server/sensor_event_queue.cpp @@ -17,16 +17,16 @@ * */ -#include +#include #include "sensor_logs.h" -csensor_event_queue& csensor_event_queue::get_instance() +sensor_event_queue& sensor_event_queue::get_instance() { - static csensor_event_queue inst; + static sensor_event_queue inst; return inst; } -void csensor_event_queue::push_internal(void *event, int length) +void sensor_event_queue::push_internal(void *event, int length) { lock l(m_mutex); bool wake = m_queue.empty(); @@ -41,7 +41,7 @@ void csensor_event_queue::push_internal(void *event, int length) m_cond_var.notify_one(); } -void* csensor_event_queue::pop(int *length) +void* sensor_event_queue::pop(int *length) { ulock u(m_mutex); while (m_queue.empty()) @@ -54,7 +54,7 @@ void* csensor_event_queue::pop(int *length) return event.first; } -void csensor_event_queue::push(sensor_event_t *event, int event_length) +void sensor_event_queue::push(sensor_event_t *event, int event_length) { push_internal(event, event_length); } diff --git a/src/server/csensor_event_queue.h b/src/server/sensor_event_queue.h similarity index 87% rename from src/server/csensor_event_queue.h rename to src/server/sensor_event_queue.h index 4138cac..a57507b 100644 --- a/src/server/csensor_event_queue.h +++ b/src/server/sensor_event_queue.h @@ -17,8 +17,9 @@ * */ -#if !defined(_CSENSOR_EVENT_QUEUE_CLASS_H_) -#define _CSENSOR_EVENT_QUEUE_CLASS_H_ +#ifndef _SENSOR_EVENT_QUEUE_H_ +#define _SENSOR_EVENT_QUEUE_H_ + #include #include #include @@ -29,7 +30,7 @@ extern std::set priority_list; -class csensor_event_queue +class sensor_event_queue { private: static const unsigned int QUEUE_FULL_SIZE = 1000; @@ -82,16 +83,16 @@ private: typedef std::lock_guard lock; typedef std::unique_lock ulock; - csensor_event_queue() {}; - ~csensor_event_queue() {}; - csensor_event_queue(const csensor_event_queue &) {}; - csensor_event_queue& operator=(const csensor_event_queue &); + sensor_event_queue() {}; + ~sensor_event_queue() {}; + sensor_event_queue(const sensor_event_queue &) {}; + sensor_event_queue& operator=(const sensor_event_queue &); void push_internal(void *event, int length); public: - static csensor_event_queue& get_instance(); + static sensor_event_queue& get_instance(); void push(sensor_event_t *event, int event_length); void* pop(int *length); }; -#endif +#endif /* _SENSOR_EVENT_QUEUE_H_*/ diff --git a/src/server/sensor_plugin_loader.h b/src/server/sensor_plugin_loader.h index bc0bb66..07886e3 100755 --- a/src/server/sensor_plugin_loader.h +++ b/src/server/sensor_plugin_loader.h @@ -17,8 +17,8 @@ * */ -#if !defined(_SENSOR_PLUGIN_LOADER_CLASS_H_) -#define _SENSOR_PLUGIN_LOADER_CLASS_H_ +#ifndef _SENSOR_PLUGIN_LOADER_H_ +#define _SENSOR_PLUGIN_LOADER_H_ #include #include @@ -61,4 +61,4 @@ public: std::vector get_sensors(sensor_type_t type); std::vector get_virtual_sensors(void); }; -#endif /* _SENSOR_PLUGIN_LOADER_CLASS_H_ */ +#endif /* _SENSOR_PLUGIN_LOADER_H_ */ diff --git a/src/server/csensor_usage.cpp b/src/server/sensor_usage.cpp similarity index 84% rename from src/server/csensor_usage.cpp rename to src/server/sensor_usage.cpp index 0e06826..cc114ff 100644 --- a/src/server/csensor_usage.cpp +++ b/src/server/sensor_usage.cpp @@ -18,10 +18,10 @@ */ #include -#include +#include #include -csensor_usage::csensor_usage() +sensor_usage::sensor_usage() : m_interval(POLL_MAX_HZ_MS) , m_latency(0) , m_option(SENSOR_OPTION_DEFAULT) @@ -30,12 +30,12 @@ csensor_usage::csensor_usage() { } -csensor_usage::~csensor_usage() +sensor_usage::~sensor_usage() { m_reg_events.clear(); } -bool csensor_usage::register_event(unsigned int event_type) +bool sensor_usage::register_event(unsigned int event_type) { auto it_event = find(m_reg_events.begin(), m_reg_events.end(), event_type); @@ -48,7 +48,7 @@ bool csensor_usage::register_event(unsigned int event_type) return true; } -bool csensor_usage::unregister_event(unsigned int event_type) +bool sensor_usage::unregister_event(unsigned int event_type) { auto it_event = find(m_reg_events.begin(), m_reg_events.end(), event_type); @@ -62,7 +62,7 @@ bool csensor_usage::unregister_event(unsigned int event_type) return true; } -bool csensor_usage::is_event_registered(unsigned int event_type) +bool sensor_usage::is_event_registered(unsigned int event_type) { auto it_event = find (m_reg_events.begin(), m_reg_events.end(), event_type); diff --git a/src/server/csensor_usage.h b/src/server/sensor_usage.h similarity index 88% rename from src/server/csensor_usage.h rename to src/server/sensor_usage.h index 553ca51..7e6d3ac 100644 --- a/src/server/csensor_usage.h +++ b/src/server/sensor_usage.h @@ -17,8 +17,8 @@ * */ -#ifndef CSENSOR_USAGE_H_ -#define CSENSOR_USAGE_H_ +#ifndef _SENSOR_USAGE_H_ +#define _SENSOR_USAGE_H_ #include #include @@ -26,7 +26,7 @@ typedef std::vector reg_event_vector; -class csensor_usage { +class sensor_usage { public: unsigned int m_interval; unsigned int m_latency; @@ -35,12 +35,12 @@ public: reg_event_vector m_reg_events; bool m_start; - csensor_usage(); - ~csensor_usage(); + sensor_usage(); + ~sensor_usage(); bool register_event(unsigned int event_type); bool unregister_event(unsigned int event_type); bool is_event_registered(unsigned int event_type); }; -#endif /* CSENSOR_USAGE_H_ */ +#endif /* _SENSOR_USAGE_H_ */ diff --git a/src/server/server.cpp b/src/server/server.cpp index f4d8468..6bf0793 100755 --- a/src/server/server.cpp +++ b/src/server/server.cpp @@ -127,7 +127,7 @@ void server::run(void) } } - csensor_event_dispatcher::get_instance().run(); + sensor_event_dispatcher::get_instance().run(); thread client_accepter(&server::accept_client, this); client_accepter.detach(); diff --git a/src/server/server.h b/src/server/server.h index 3f6f393..ae52cc5 100755 --- a/src/server/server.h +++ b/src/server/server.h @@ -17,8 +17,8 @@ * */ -#ifndef SERVER_H_ -#define SERVER_H_ +#ifndef _SERVER_H_ +#define _SERVER_H_ #include #include @@ -41,4 +41,4 @@ public: static server& get_instance(); }; -#endif +#endif /* _SERVER_H_ */ diff --git a/src/server/virtual_sensor.cpp b/src/server/virtual_sensor.cpp index 75c3bc0..112a3a0 100755 --- a/src/server/virtual_sensor.cpp +++ b/src/server/virtual_sensor.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include virtual_sensor::virtual_sensor() @@ -40,10 +40,10 @@ bool virtual_sensor::is_virtual(void) bool virtual_sensor::activate(void) { - return csensor_event_dispatcher::get_instance().add_active_virtual_sensor(this); + return sensor_event_dispatcher::get_instance().add_active_virtual_sensor(this); } bool virtual_sensor::deactivate(void) { - return csensor_event_dispatcher::get_instance().delete_active_virtual_sensor(this); + return sensor_event_dispatcher::get_instance().delete_active_virtual_sensor(this); } diff --git a/src/server/virtual_sensor.h b/src/server/virtual_sensor.h index a695538..f781880 100755 --- a/src/server/virtual_sensor.h +++ b/src/server/virtual_sensor.h @@ -43,4 +43,4 @@ private: bool m_hardware_fusion; }; -#endif +#endif /* _VIRTUAL_SENSOR_H_ */ diff --git a/src/server/cvirtual_sensor_config.cpp b/src/server/virtual_sensor_config.cpp similarity index 78% rename from src/server/cvirtual_sensor_config.cpp rename to src/server/virtual_sensor_config.cpp index c963d48..1741239 100755 --- a/src/server/cvirtual_sensor_config.cpp +++ b/src/server/virtual_sensor_config.cpp @@ -17,7 +17,7 @@ * */ -#include +#include #include "sensor_logs.h" #include #include @@ -37,14 +37,14 @@ using std::stringstream; #define DEFAULT_ATTR3 "value3" #define DEFAULT_DEVICE "Default" -cvirtual_sensor_config::cvirtual_sensor_config() +virtual_sensor_config::virtual_sensor_config() { } -cvirtual_sensor_config& cvirtual_sensor_config::get_instance(void) +virtual_sensor_config& virtual_sensor_config::get_instance(void) { static bool load_done = false; - static cvirtual_sensor_config inst; + static virtual_sensor_config inst; if (!load_done) { inst.load_config(VIRTUAL_SENSOR_CONFIG_FILE_PATH); @@ -59,12 +59,12 @@ cvirtual_sensor_config& cvirtual_sensor_config::get_instance(void) return inst; } -bool cvirtual_sensor_config::load_config(const string& config_path) +bool virtual_sensor_config::load_config(const string& config_path) { xmlDocPtr doc; xmlNodePtr cur; - DBG("cvirtual_sensor_config::load_config(\"%s\") is called!\n",config_path.c_str()); + DBG("virtual_sensor_config::load_config(\"%s\") is called!\n",config_path.c_str()); doc = xmlParseFile(config_path.c_str()); @@ -107,7 +107,7 @@ bool cvirtual_sensor_config::load_config(const string& config_path) free(prop); //insert device to device_list - m_virtual_sensor_config[device_type]; + m_virtual_sensor_configs[device_type]; DBG("\n",device_type.c_str()); virtual_sensor_node_ptr = device_node_ptr->xmlChildrenNode; @@ -119,7 +119,7 @@ bool cvirtual_sensor_config::load_config(const string& config_path) continue; } - m_virtual_sensor_config[device_type][(const char*)virtual_sensor_node_ptr->name]; + m_virtual_sensor_configs[device_type][(const char*)virtual_sensor_node_ptr->name]; DBG("<%s>\n",device_type.c_str(),(const char*)virtual_sensor_node_ptr->name); element_node_ptr = virtual_sensor_node_ptr->xmlChildrenNode; @@ -131,7 +131,7 @@ bool cvirtual_sensor_config::load_config(const string& config_path) } //insert Element to Model - m_virtual_sensor_config[device_type][(const char*)virtual_sensor_node_ptr->name][(const char*)element_node_ptr->name]; + m_virtual_sensor_configs[device_type][(const char*)virtual_sensor_node_ptr->name][(const char*)element_node_ptr->name]; DBG("<%s><%s>\n",device_type.c_str(),(const char*)virtual_sensor_node_ptr->name,(const char*)element_node_ptr->name); attr_ptr = element_node_ptr->properties; @@ -144,7 +144,7 @@ bool cvirtual_sensor_config::load_config(const string& config_path) free(prop); //insert attribute to Element - m_virtual_sensor_config[device_type][(const char*)virtual_sensor_node_ptr->name][(const char*)element_node_ptr->name][key]=value; + m_virtual_sensor_configs[device_type][(const char*)virtual_sensor_node_ptr->name][(const char*)element_node_ptr->name][key]=value; DBG("<%s><%s \"%s\"=\"%s\">\n",device_type.c_str(),(const char*)virtual_sensor_node_ptr->name,(const char*)element_node_ptr->name,key.c_str(),value.c_str()); attr_ptr = attr_ptr->next; } @@ -163,17 +163,17 @@ bool cvirtual_sensor_config::load_config(const string& config_path) return true; } -bool cvirtual_sensor_config::get(const string& sensor_type, const string& element, const string& attr, string& value) +bool virtual_sensor_config::get(const string& sensor_type, const string& element, const string& attr, string& value) { - auto it_device_list = m_virtual_sensor_config.find(m_device_id); + auto it_device_list = m_virtual_sensor_configs.find(m_device_id); - if (it_device_list == m_virtual_sensor_config.end()) { + if (it_device_list == m_virtual_sensor_configs.end()) { ERR("There is no <%s> device\n",m_device_id.c_str()); m_device_id = DEFAULT_DEVICE; - it_device_list = m_virtual_sensor_config.find(m_device_id); + it_device_list = m_virtual_sensor_configs.find(m_device_id); - if (it_device_list == m_virtual_sensor_config.end()) { + if (it_device_list == m_virtual_sensor_configs.end()) { ERR("There is no Default device\n"); return false; } @@ -207,7 +207,7 @@ bool cvirtual_sensor_config::get(const string& sensor_type, const string& elemen return true; } -bool cvirtual_sensor_config::get(const string& sensor_type, const string& element, const string& attr, float *value) +bool virtual_sensor_config::get(const string& sensor_type, const string& element, const string& attr, float *value) { string str_value; @@ -221,7 +221,7 @@ bool cvirtual_sensor_config::get(const string& sensor_type, const string& elemen return true; } -bool cvirtual_sensor_config::get(const string& sensor_type, const string& element, const string& attr, int *value) +bool virtual_sensor_config::get(const string& sensor_type, const string& element, const string& attr, int *value) { string str_value; @@ -235,7 +235,7 @@ bool cvirtual_sensor_config::get(const string& sensor_type, const string& elemen return true; } -bool cvirtual_sensor_config::get(const string& sensor_type, const string& element, string& value) +bool virtual_sensor_config::get(const string& sensor_type, const string& element, string& value) { if (get(sensor_type, element, DEFAULT_ATTR, value)) return true; @@ -243,7 +243,7 @@ bool cvirtual_sensor_config::get(const string& sensor_type, const string& elemen return false; } -bool cvirtual_sensor_config::get(const string& sensor_type, const string& element, float *value, int count) +bool virtual_sensor_config::get(const string& sensor_type, const string& element, float *value, int count) { if (count == 1) { @@ -275,7 +275,7 @@ bool cvirtual_sensor_config::get(const string& sensor_type, const string& elemen return false; } -bool cvirtual_sensor_config::get(const string& sensor_type, const string& element, int *value, int count) +bool virtual_sensor_config::get(const string& sensor_type, const string& element, int *value, int count) { if (count == 1) { @@ -307,11 +307,11 @@ bool cvirtual_sensor_config::get(const string& sensor_type, const string& elemen return false; } -bool cvirtual_sensor_config::is_supported(const string& sensor_type) +bool virtual_sensor_config::is_supported(const string& sensor_type) { - auto it_device_list = m_virtual_sensor_config.find(m_device_id); + auto it_device_list = m_virtual_sensor_configs.find(m_device_id); - if (it_device_list == m_virtual_sensor_config.end()) + if (it_device_list == m_virtual_sensor_configs.end()) return false; auto it_virtual_sensor_list = it_device_list->second.find(sensor_type); diff --git a/src/server/cvirtual_sensor_config.h b/src/server/virtual_sensor_config.h similarity index 79% rename from src/server/cvirtual_sensor_config.h rename to src/server/virtual_sensor_config.h index a9af957..0c077ff 100755 --- a/src/server/cvirtual_sensor_config.h +++ b/src/server/virtual_sensor_config.h @@ -17,10 +17,10 @@ * */ -#if !defined(_CVIRTUAL_SENSOR_CONFIG_CLASS_H_) -#define _CVIRTUAL_SENSOR_CONFIG_CLASS_H_ +#ifndef _VIRTUAL_SENSOR_CONFIG_H_ +#define _VIRTUAL_SENSOR_CONFIG_H_ -#include +#include #define VIRTUAL_SENSOR_CONFIG_FILE_PATH "/usr/etc/virtual_sensors.xml" @@ -40,7 +40,7 @@ typedef std::unordered_map Virtual_sensor; * ... */ -typedef std::unordered_map virtual_sensor_config; +typedef std::unordered_map virtual_sensor_configs; /* * a Virtual_sensor_config represents virtual_sensors.xml * @@ -49,7 +49,7 @@ typedef std::unordered_map virtual_sensor_config; * */ -typedef std::unordered_map virtual_sensor_device_config; +typedef std::unordered_map virtual_sensor_device_configs; /* * a virtual_sensor_device_config represents virtual_sensors.xml * @@ -57,19 +57,19 @@ typedef std::unordered_map virtual_sensor_dev * */ -class cvirtual_sensor_config : public cconfig +class virtual_sensor_config : public device_config { private: - cvirtual_sensor_config(); - cvirtual_sensor_config(cvirtual_sensor_config const&) {}; - cvirtual_sensor_config& operator=(cvirtual_sensor_config const&); + virtual_sensor_config(); + virtual_sensor_config(virtual_sensor_config const&) {}; + virtual_sensor_config& operator=(virtual_sensor_config const&); bool load_config(const std::string& config_path); - virtual_sensor_device_config m_virtual_sensor_config; + virtual_sensor_device_configs m_virtual_sensor_configs; public: - static cvirtual_sensor_config& get_instance(void); + static virtual_sensor_config& get_instance(void); bool get(const std::string& sensor_type, const std::string& element, const std::string& attr, std::string& value); bool get(const std::string& sensor_type, const std::string& element, const std::string& attr, float *value); @@ -82,4 +82,4 @@ public: bool is_supported(const std::string &sensor_type); }; -#endif +#endif /* _VIRTUAL_SENSOR_CONFIG_H_ */ diff --git a/src/server/worker_thread.h b/src/server/worker_thread.h index 6459b3f..543d4e8 100755 --- a/src/server/worker_thread.h +++ b/src/server/worker_thread.h @@ -78,4 +78,4 @@ public: void set_context(void *ctx); }; -#endif +#endif /* _WORKER_THREAD_H_ */ diff --git a/src/shared/cbase_lock.h b/src/shared/cbase_lock.h index 2b0082a..6319488 100755 --- a/src/shared/cbase_lock.h +++ b/src/shared/cbase_lock.h @@ -17,8 +17,8 @@ * */ -#if !defined(_CBASE_LOCK_CLASS_H_) -#define _CBASE_LOCK_CLASS_H_ +#ifndef _CBASE_LOCK_H_ +#define _CBASE_LOCK_H_ #include @@ -83,5 +83,4 @@ public: ~Autolock(); }; -#endif -// End of a file +#endif /* _CBASE_LOCK_H_ */ diff --git a/src/shared/cmutex.h b/src/shared/cmutex.h index bfdd5d0..2d7ec68 100755 --- a/src/shared/cmutex.h +++ b/src/shared/cmutex.h @@ -17,8 +17,8 @@ * */ -#if !defined(_CMUTEX_CLASS_H_) -#define _CMUTEX_CLASS_H_ +#ifndef _CMUTEX_H_ +#define _CMUTEX_H_ #include "cbase_lock.h" @@ -39,5 +39,4 @@ private: pthread_mutex_t m_mutex; }; -#endif -// End of a file +#endif /* _CMUTEX_H_ */ diff --git a/src/shared/cpacket.h b/src/shared/cpacket.h index fa50eaf..3356ff5 100755 --- a/src/shared/cpacket.h +++ b/src/shared/cpacket.h @@ -17,8 +17,8 @@ * */ -#if !defined(_CPACKET_CLASS_H_) -#define _CPACKET_CLASS_H_ +#ifndef _CPACKET_H_ +#define _CPACKET_H_ typedef struct packet_header { int cmd; @@ -47,5 +47,4 @@ private: packet_header *m_packet; }; -#endif -// End of a file +#endif /* _CPACKET_H_ */ diff --git a/src/shared/csocket.h b/src/shared/csocket.h index 9014bc2..42b7733 100644 --- a/src/shared/csocket.h +++ b/src/shared/csocket.h @@ -17,8 +17,8 @@ * */ -#ifndef CSOCKET_H_ -#define CSOCKET_H_ +#ifndef _CSOCKET_H_ +#define _CSOCKET_H_ #include #include @@ -76,4 +76,4 @@ private: int m_recv_flags; }; -#endif /* CSOCKET_H_ */ +#endif /* _CSOCKET_H_ */ diff --git a/src/shared/sensor_common.h b/src/shared/sensor_common.h index 02cbfd3..83d8b7d 100755 --- a/src/shared/sensor_common.h +++ b/src/shared/sensor_common.h @@ -17,8 +17,8 @@ * */ -#ifndef __SENSOR_COMMON_H__ -#define __SENSOR_COMMON_H__ +#ifndef _SENSOR_COMMON_H_ +#define _SENSOR_COMMON_H_ #ifndef DEPRECATED #define DEPRECATED __attribute__((deprecated)) @@ -150,5 +150,4 @@ typedef enum { #endif -#endif -//! End of a file +#endif /* _SENSOR_COMMON_H_ */ diff --git a/src/shared/sensor_hal.h b/src/shared/sensor_hal.h index c9466ef..6ee4212 100644 --- a/src/shared/sensor_hal.h +++ b/src/shared/sensor_hal.h @@ -143,4 +143,4 @@ public: /* TODO: use get_sensors() instead of get_properties() */ virtual bool get_properties(uint32_t id, sensor_properties_s &properties) = 0; }; -#endif /*_SENSOR_HAL_H_*/ +#endif /* _SENSOR_HAL_H_ */ diff --git a/src/shared/sensor_logs.h b/src/shared/sensor_logs.h index ea2a8b9..4192123 100755 --- a/src/shared/sensor_logs.h +++ b/src/shared/sensor_logs.h @@ -17,8 +17,8 @@ * */ -#if !defined(_COMMON_H_) -#define _COMMON_H_ +#ifndef _SENSOR_LOGS_H_ +#define _SENSOR_LOGS_H_ #ifndef __cplusplus #include @@ -228,5 +228,4 @@ void copy_sensorhub_data(sensorhub_data_t *dest, sensorhub_data_t *src); } #endif -#endif -//! End of a file +#endif /* _SENSOR_LOGS_H_ */ diff --git a/src/shared/sf_common.h b/src/shared/sf_common.h index af649b9..c627edf 100644 --- a/src/shared/sf_common.h +++ b/src/shared/sf_common.h @@ -17,14 +17,14 @@ * */ -#include - -#if !defined(_SF_COMMON_H_) +#ifndef _SF_COMMON_H_ #define _SF_COMMON_H_ + #include #include #include #include +#include #define COMMAND_CHANNEL_PATH "/tmp/sensord_command_socket" #define EVENT_CHANNEL_PATH "/tmp/sensord_event_socket" @@ -238,4 +238,4 @@ enum sensor_permission_t { #define BIO_SENSOR_PRIVELEGE_NAME "sensord::bio" #define BIO_SENSOR_ACCESS_RIGHT "rw" -#endif +#endif /* _SF_COMMON_H_ */ -- 2.7.4