Changeset 477 for library/tests/unittest-cpp/Posix

Timestamp:

08/05/09 14:40:03 (16 years ago)

Author:

mido

Message:

panove, vite, jak jsem peclivej na upravu kodu.. snad se vam bude libit:) konfigurace je v souboru /system/astylerc

Location:

library/tests/unittest-cpp/Posix

Files:

• SignalTranslator.cpp (modified) (2 diffs)
• SignalTranslator.h (modified) (2 diffs)
• TimeHelpers.cpp (modified) (1 diff)
• TimeHelpers.h (modified) (1 diff)

library/tests/unittest-cpp/Posix/SignalTranslator.cpp

@@ -7 +7 @@
 namespace {
 
-void SignalHandler(int sig)
-{
-    siglongjmp(*SignalTranslator::s_jumpTarget, sig );
+void SignalHandler ( int sig ) {
+        siglongjmp ( *SignalTranslator::s_jumpTarget, sig );
 }
 
@@ -15 +14 @@
 
 
-SignalTranslator::SignalTranslator()
-{
-    m_oldJumpTarget = s_jumpTarget;
-    s_jumpTarget = &m_currentJumpTarget;
+SignalTranslator::SignalTranslator() {
+        m_oldJumpTarget = s_jumpTarget;
+        s_jumpTarget = &m_currentJumpTarget;
 
-    struct sigaction action;
-    action.sa_flags = 0;
-    action.sa_handler = SignalHandler;
-    sigemptyset( &action.sa_mask );
+        struct sigaction action;
+        action.sa_flags = 0;
+        action.sa_handler = SignalHandler;
+        sigemptyset ( &action.sa_mask );
 
-    sigaction( SIGSEGV, &action, &m_old_SIGSEGV_action );
-    sigaction( SIGFPE , &action, &m_old_SIGFPE_action  );
-    sigaction( SIGTRAP, &action, &m_old_SIGTRAP_action );
-    sigaction( SIGBUS , &action, &m_old_SIGBUS_action  );
-    sigaction( SIGILL , &action, &m_old_SIGBUS_action  );
+        sigaction ( SIGSEGV, &action, &m_old_SIGSEGV_action );
+        sigaction ( SIGFPE , &action, &m_old_SIGFPE_action );
+        sigaction ( SIGTRAP, &action, &m_old_SIGTRAP_action );
+        sigaction ( SIGBUS , &action, &m_old_SIGBUS_action );
+        sigaction ( SIGILL , &action, &m_old_SIGBUS_action );
 }
 
-SignalTranslator::~SignalTranslator()
-{
-    sigaction( SIGILL , &m_old_SIGBUS_action , 0 );
-    sigaction( SIGBUS , &m_old_SIGBUS_action , 0 );
-    sigaction( SIGTRAP, &m_old_SIGTRAP_action, 0 );
-    sigaction( SIGFPE , &m_old_SIGFPE_action , 0 );
-    sigaction( SIGSEGV, &m_old_SIGSEGV_action, 0 );
+SignalTranslator::~SignalTranslator() {
+        sigaction ( SIGILL , &m_old_SIGBUS_action , 0 );
+        sigaction ( SIGBUS , &m_old_SIGBUS_action , 0 );
+        sigaction ( SIGTRAP, &m_old_SIGTRAP_action, 0 );
+        sigaction ( SIGFPE , &m_old_SIGFPE_action , 0 );
+        sigaction ( SIGSEGV, &m_old_SIGSEGV_action, 0 );
 
-    s_jumpTarget = m_oldJumpTarget;
+        s_jumpTarget = m_oldJumpTarget;
 }
 

library/tests/unittest-cpp/Posix/SignalTranslator.h

@@ -7 +7 @@
 namespace UnitTest {
 
-class SignalTranslator
-{
+class SignalTranslator {
 public:
-    SignalTranslator();
-    ~SignalTranslator();
+        SignalTranslator();
+        ~SignalTranslator();
 
-    static sigjmp_buf* s_jumpTarget;
+        static sigjmp_buf* s_jumpTarget;
 
 private:
-    sigjmp_buf m_currentJumpTarget;
-    sigjmp_buf* m_oldJumpTarget;
+        sigjmp_buf m_currentJumpTarget;
+        sigjmp_buf* m_oldJumpTarget;
 
-    struct sigaction m_old_SIGFPE_action;
-    struct sigaction m_old_SIGTRAP_action;
-    struct sigaction m_old_SIGSEGV_action;
-    struct sigaction m_old_SIGBUS_action;
-    struct sigaction m_old_SIGABRT_action;
-    struct sigaction m_old_SIGALRM_action;
+        struct sigaction m_old_SIGFPE_action;
+        struct sigaction m_old_SIGTRAP_action;
+        struct sigaction m_old_SIGSEGV_action;
+        struct sigaction m_old_SIGBUS_action;
+        struct sigaction m_old_SIGABRT_action;
+        struct sigaction m_old_SIGALRM_action;
 };
 
 #if !defined (__GNUC__)
-    #define UNITTEST_EXTENSION
+#define UNITTEST_EXTENSION
 #else
-    #define UNITTEST_EXTENSION __extension__
+#define UNITTEST_EXTENSION __extension__
 #endif
 
@@ -36 +35 @@
         UnitTest::SignalTranslator sig; \
         if (UNITTEST_EXTENSION sigsetjmp(*UnitTest::SignalTranslator::s_jumpTarget, 1) != 0) \
-        throw ("Unhandled system exception"); 
+        throw ("Unhandled system exception");
 
 }

library/tests/unittest-cpp/Posix/TimeHelpers.cpp

@@ -4 +4 @@
 namespace UnitTest {
 
-Timer::Timer()
-{
-    m_startTime.tv_sec = 0;
-    m_startTime.tv_usec = 0;
+Timer::Timer() {
+        m_startTime.tv_sec = 0;
+        m_startTime.tv_usec = 0;
 }
 
-void Timer::Start()
-{
-    gettimeofday(&m_startTime, 0);
+void Timer::Start() {
+        gettimeofday ( &m_startTime, 0 );
 }
 
-double Timer::GetTimeInMs() const
-{
-    struct timeval currentTime;
-    gettimeofday(&currentTime, 0);
+double Timer::GetTimeInMs() const {
+        struct timeval currentTime;
+        gettimeofday ( &currentTime, 0 );
 
         double const dsecs = currentTime.tv_sec - m_startTime.tv_sec;
-    double const dus = currentTime.tv_usec - m_startTime.tv_usec;
+        double const dus = currentTime.tv_usec - m_startTime.tv_usec;
 
-        return (dsecs * 1000.0) + (dus / 1000.0);
+        return ( dsecs * 1000.0 ) + ( dus / 1000.0 );
 }
 
-void TimeHelpers::SleepMs(int ms)
-{
-    usleep(ms * 1000);
+void TimeHelpers::SleepMs ( int ms ) {
+        usleep ( ms * 1000 );
 }
 

library/tests/unittest-cpp/Posix/TimeHelpers.h

@@ -6 +6 @@
 namespace UnitTest {
 
-class Timer
-{
+class Timer {
 public:
-    Timer();
-    void Start();
-    double GetTimeInMs() const;    
+        Timer();
+        void Start();
+        double GetTimeInMs() const;
 
 private:
-    struct timeval m_startTime;    
+        struct timeval m_startTime;
 };
 
 
-namespace TimeHelpers
-{
-void SleepMs (int ms);
+namespace TimeHelpers {
+void SleepMs ( int ms );
 }