diff options
Diffstat (limited to 'src/components/utils/src')
19 files changed, 51 insertions, 50 deletions
diff --git a/src/components/utils/src/back_trace.cc b/src/components/utils/src/back_trace.cc index c587643cc6..65f9e72070 100644 --- a/src/components/utils/src/back_trace.cc +++ b/src/components/utils/src/back_trace.cc @@ -33,8 +33,8 @@ #include "utils/back_trace.h" #include <algorithm> -#include <vector> #include <sstream> +#include <vector> #include <cxxabi.h> #include <execinfo.h> @@ -63,7 +63,7 @@ string demangle(const char* symbol) { } return symbol; } -} +} // namespace Backtrace::Backtrace(int32_t count, int32_t skip_top) : thread_id_(threads::Thread::CurrentId()) { diff --git a/src/components/utils/src/conditional_variable_boost.cc b/src/components/utils/src/conditional_variable_boost.cc index a74aa3eaa6..c70b727d66 100644 --- a/src/components/utils/src/conditional_variable_boost.cc +++ b/src/components/utils/src/conditional_variable_boost.cc @@ -34,9 +34,9 @@ #include <errno.h> #include <time.h> +#include <boost/exception/diagnostic_information.hpp> #include "utils/lock.h" #include "utils/logger.h" -#include <boost/exception/diagnostic_information.hpp> namespace { const long kNanosecondsPerSecond = 1000000000; diff --git a/src/components/utils/src/convert_utils.cc b/src/components/utils/src/convert_utils.cc index 319b231a96..9d90318731 100644 --- a/src/components/utils/src/convert_utils.cc +++ b/src/components/utils/src/convert_utils.cc @@ -32,8 +32,8 @@ #include "utils/convert_utils.h" #include <stdint.h> -#include <limits> #include <algorithm> +#include <limits> #include "utils/macro.h" long long int utils::ConvertInt64ToLongLongInt(const int64_t value) { diff --git a/src/components/utils/src/custom_string.cc b/src/components/utils/src/custom_string.cc index 8254a98180..7bbe5f2da8 100644 --- a/src/components/utils/src/custom_string.cc +++ b/src/components/utils/src/custom_string.cc @@ -31,14 +31,14 @@ */ #include "utils/custom_string.h" -#include <cwchar> -#include <cstdlib> +#include <string.h> +#include <algorithm> #include <clocale> +#include <cstdlib> +#include <cwchar> #include <cwctype> #include <new> -#include <algorithm> #include <vector> -#include <string.h> #include "utils/logger.h" #include "utils/macro.h" @@ -76,7 +76,7 @@ void ConvertWStringToLowerCase(std::wstring& str) { std::transform(str.begin(), str.end(), str.begin(), towlower); setlocale(LC_ALL, current_locale.c_str()); } -} +} // namespace namespace utils { namespace custom_string { diff --git a/src/components/utils/src/gen_hash.cc b/src/components/utils/src/gen_hash.cc index a43b8feb03..0b85798b00 100644 --- a/src/components/utils/src/gen_hash.cc +++ b/src/components/utils/src/gen_hash.cc @@ -32,8 +32,8 @@ #include "utils/gen_hash.h" #include <cstdlib> -#include <string> #include <locale> +#include <string> #include "utils/custom_string.h" namespace utils { diff --git a/src/components/utils/src/logger.cc b/src/components/utils/src/logger.cc index af21aeac77..2a4b8eb108 100644 --- a/src/components/utils/src/logger.cc +++ b/src/components/utils/src/logger.cc @@ -31,9 +31,9 @@ */ #include "utils/logger.h" +#include <apr_time.h> #include "utils/log_message_loop_thread.h" #include "utils/logger_status.h" -#include <apr_time.h> void deinit_logger() { CREATE_LOGGERPTR_LOCAL(logger_, "Utils") diff --git a/src/components/utils/src/qdb_wrapper/sql_database.cc b/src/components/utils/src/qdb_wrapper/sql_database.cc index b95fe17845..e2a51753b2 100644 --- a/src/components/utils/src/qdb_wrapper/sql_database.cc +++ b/src/components/utils/src/qdb_wrapper/sql_database.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <cstring> #include "qdb_wrapper/sql_database.h" +#include <cstring> #include "utils/logger.h" namespace utils { diff --git a/src/components/utils/src/qdb_wrapper/sql_query.cc b/src/components/utils/src/qdb_wrapper/sql_query.cc index e5facb5853..d101e80718 100644 --- a/src/components/utils/src/qdb_wrapper/sql_query.cc +++ b/src/components/utils/src/qdb_wrapper/sql_query.cc @@ -31,12 +31,12 @@ */ #include "qdb_wrapper/sql_query.h" +#include <errno.h> #include <string.h> -#include <cassert> #include <algorithm> +#include <cassert> #include "qdb_wrapper/sql_database.h" #include "utils/logger.h" -#include <errno.h> namespace utils { namespace dbms { diff --git a/src/components/utils/src/resource_usage.cc b/src/components/utils/src/resource_usage.cc index 385c2bfa2e..15a8c71e70 100644 --- a/src/components/utils/src/resource_usage.cc +++ b/src/components/utils/src/resource_usage.cc @@ -10,11 +10,11 @@ #include <sys/types.h> #include <unistd.h> #endif -#include <sys/resource.h> #include <errno.h> +#include <stdio.h> +#include <sys/resource.h> #include <sys/types.h> #include <unistd.h> -#include <stdio.h> #include <sstream> #include "utils/file_system.h" diff --git a/src/components/utils/src/rwlock_posix.cc b/src/components/utils/src/rwlock_posix.cc index 08edb8cb0c..81bf5feee1 100644 --- a/src/components/utils/src/rwlock_posix.cc +++ b/src/components/utils/src/rwlock_posix.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/rwlock.h" #include "utils/logger.h" +#include "utils/rwlock.h" namespace sync_primitives { diff --git a/src/components/utils/src/signals_posix.cc b/src/components/utils/src/signals_posix.cc index e13dc04f40..8d1134576f 100644 --- a/src/components/utils/src/signals_posix.cc +++ b/src/components/utils/src/signals_posix.cc @@ -29,10 +29,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include <stdint.h> #include <sys/wait.h> #include <csignal> #include <cstdlib> -#include <stdint.h> #include <iostream> #include "utils/signals.h" diff --git a/src/components/utils/src/system.cc b/src/components/utils/src/system.cc index 6c3cf56133..2acc7acf92 100644 --- a/src/components/utils/src/system.cc +++ b/src/components/utils/src/system.cc @@ -32,16 +32,16 @@ #ifdef __QNX__ #include <process.h> #else // __QNX__ +#include <fcntl.h> +#include <sys/stat.h> #include <sys/types.h> #include <sys/wait.h> -#include <sys/stat.h> -#include <fcntl.h> #include <unistd.h> #endif // __QNX__ #include <algorithm> -#include <functional> #include <cstring> +#include <functional> #include <iostream> #include "utils/logger.h" @@ -87,7 +87,7 @@ bool System::Execute() { bool System::Execute(bool wait) { size_t size = argv_.size(); - char** argv = new char* [size + 1]; + char** argv = new char*[size + 1]; std::transform(argv_.begin(), argv_.end(), argv, GetCString()); argv[size] = NULL; @@ -137,7 +137,7 @@ bool System::Execute(bool wait) { dup2(fd_dev0, STDERR_FILENO); size_t size = argv_.size(); - char** argv = new char* [size + 1]; + char** argv = new char*[size + 1]; std::transform(argv_.begin(), argv_.end(), argv, GetCString()); argv[size] = NULL; @@ -173,4 +173,4 @@ bool System::Execute(bool wait) { #endif // __QNX__ -} // utils +} // namespace utils diff --git a/src/components/utils/src/threads/async_runner.cc b/src/components/utils/src/threads/async_runner.cc index 131aaa3f78..740db016be 100644 --- a/src/components/utils/src/threads/async_runner.cc +++ b/src/components/utils/src/threads/async_runner.cc @@ -110,4 +110,4 @@ void AsyncRunner::AsyncRunnerDelegate::runDelegate(ThreadDelegate* delegate) { delegate_notifier_.NotifyOne(); } -} // namespace policy. +} // namespace threads diff --git a/src/components/utils/src/threads/pulse_thread_delegate.cc b/src/components/utils/src/threads/pulse_thread_delegate.cc index 37e6c670d1..a76b17368a 100644 --- a/src/components/utils/src/threads/pulse_thread_delegate.cc +++ b/src/components/utils/src/threads/pulse_thread_delegate.cc @@ -32,8 +32,8 @@ #include <sys/netmgr.h> -#include "utils/threads/pulse_thread_delegate.h" #include "utils/logger.h" +#include "utils/threads/pulse_thread_delegate.h" namespace threads { diff --git a/src/components/utils/src/threads/thread_delegate.cc b/src/components/utils/src/threads/thread_delegate.cc index 917603f92c..e071959522 100644 --- a/src/components/utils/src/threads/thread_delegate.cc +++ b/src/components/utils/src/threads/thread_delegate.cc @@ -34,8 +34,8 @@ #include <pthread.h> -#include "utils/threads/thread.h" #include "utils/lock.h" +#include "utils/threads/thread.h" namespace threads { diff --git a/src/components/utils/src/threads/thread_manager.cc b/src/components/utils/src/threads/thread_manager.cc index 2959a86cb7..8825510d74 100644 --- a/src/components/utils/src/threads/thread_manager.cc +++ b/src/components/utils/src/threads/thread_manager.cc @@ -31,16 +31,16 @@ */ #include "utils/threads/thread_manager.h" -#include "utils/threads/thread_delegate.h" -#include "utils/lock.h" #include "utils/conditional_variable.h" -#include "utils/threads/thread.h" +#include "utils/lock.h" #include "utils/logger.h" +#include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" #include <pthread.h> -#include <sstream> #include <list> +#include <sstream> #if defined(OS_LINUX) #include <sys/syscall.h> diff --git a/src/components/utils/src/threads/thread_posix.cc b/src/components/utils/src/threads/thread_posix.cc index 51e59fa108..35c1cd7084 100644 --- a/src/components/utils/src/threads/thread_posix.cc +++ b/src/components/utils/src/threads/thread_posix.cc @@ -32,16 +32,16 @@ #include <errno.h> #include <limits.h> -#include <stddef.h> -#include <signal.h> #include <pthread.h> +#include <signal.h> +#include <stddef.h> #include <algorithm> #include <functional> -#include "utils/threads/thread.h" #include "utils/atomic.h" -#include "utils/threads/thread_delegate.h" #include "utils/logger.h" +#include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" #ifndef __QNXNTO__ const int EOK = 0; @@ -172,9 +172,9 @@ bool Thread::start(const ThreadOptions& options) { } if (isThreadRunning_) { - LOG4CXX_TRACE(logger_, - "EXIT thread " << name_ << " #" << handle_ - << " is already running"); + LOG4CXX_TRACE( + logger_, + "EXIT thread " << name_ << " #" << handle_ << " is already running"); return true; } diff --git a/src/components/utils/src/threads/thread_validator.cc b/src/components/utils/src/threads/thread_validator.cc index 4024522ae4..3b753e79b5 100644 --- a/src/components/utils/src/threads/thread_validator.cc +++ b/src/components/utils/src/threads/thread_validator.cc @@ -31,8 +31,8 @@ */ #include "utils/threads/thread_validator.h" -#include "utils/logger.h" #include "utils/back_trace.h" +#include "utils/logger.h" namespace threads { @@ -46,14 +46,15 @@ SingleThreadSimpleValidator::~SingleThreadSimpleValidator() {} void SingleThreadSimpleValidator::AssertRunningOnCreationThread() const { PlatformThreadHandle current_id = Thread::CurrentId(); if (creation_thread_id_ != current_id) { - LOG4CXX_ERROR(logger_, - "Single-threaded object created at thread " - << creation_thread_id_ << " is accessed from thread " - << current_id + LOG4CXX_ERROR( + logger_, + "Single-threaded object created at thread " + << creation_thread_id_ << " is accessed from thread " << current_id #ifdef BACKTRACE_SUPPORT - << "\n" << utils::Backtrace() + << "\n" + << utils::Backtrace() #endif - ); + ); } } @@ -80,7 +81,7 @@ void SingleThreadValidator::AssertRunningOnValidThread() const { #ifdef BACKTRACE_SUPPORT << utils::Backtrace() #endif - ); + ); } } diff --git a/src/components/utils/src/timer.cc b/src/components/utils/src/timer.cc index 68693dfc55..8e854654de 100644 --- a/src/components/utils/src/timer.cc +++ b/src/components/utils/src/timer.cc @@ -33,13 +33,13 @@ #include <string> -#include "utils/macro.h" -#include "utils/logger.h" -#include "utils/lock.h" -#include "utils/timer_task.h" #include "utils/conditional_variable.h" +#include "utils/lock.h" +#include "utils/logger.h" +#include "utils/macro.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" +#include "utils/timer_task.h" CREATE_LOGGERPTR_GLOBAL(logger_, "Utils") |