summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Lorenz <jlorenz@de.adit-jv.com>2018-03-27 15:01:03 +0200
committerJens Lorenz <jlorenz@de.adit-jv.com>2018-04-09 17:00:47 +0200
commitb487c9b8c5e18797e91a77a4a0b447d63a2a42da (patch)
tree3d6c023f51e6b111478115a5e74ec9028ad8ff32
parenta212d35a4f1fe824ade75eb22dc860852e9d2d2f (diff)
downloadaudiomanager-b487c9b8c5e18797e91a77a4a0b447d63a2a42da.tar.gz
AMUtil: Cleanup indents and whitespaces
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
-rw-r--r--AudioManagerUtilities/include/CAmSocketHandler.h2
-rw-r--r--AudioManagerUtilities/src/CAmSocketHandler.cpp20
-rw-r--r--AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp45
3 files changed, 34 insertions, 33 deletions
diff --git a/AudioManagerUtilities/include/CAmSocketHandler.h b/AudioManagerUtilities/include/CAmSocketHandler.h
index cfa2e89..792d190 100644
--- a/AudioManagerUtilities/include/CAmSocketHandler.h
+++ b/AudioManagerUtilities/include/CAmSocketHandler.h
@@ -449,7 +449,7 @@ private:
bool nextHandle(sh_identifier_s & handle);
am_Error_e getFDPollData(const sh_pollHandle_t handle, sh_poll_s & outPollData);
-
+
public:
CAmSocketHandler();
diff --git a/AudioManagerUtilities/src/CAmSocketHandler.cpp b/AudioManagerUtilities/src/CAmSocketHandler.cpp
index 16fb5ad..1e7db6a 100644
--- a/AudioManagerUtilities/src/CAmSocketHandler.cpp
+++ b/AudioManagerUtilities/src/CAmSocketHandler.cpp
@@ -48,20 +48,20 @@ namespace am
CAmSocketHandler::CAmSocketHandler() :
mEventFd(-1), //
- mDispatchDone(true), //
- mSetPollKeys(MAX_POLLHANDLE), //
+ mDispatchDone(true), //
+ mSetPollKeys(MAX_POLLHANDLE), //
mMapShPoll(), //
- mSetTimerKeys(MAX_TIMERHANDLE),
- mListTimer(), //
+ mSetTimerKeys(MAX_TIMERHANDLE),
+ mListTimer(), //
#ifndef WITH_TIMERFD
- mListActiveTimer(), //
+ mListActiveTimer(), //
#endif
- mSetSignalhandlerKeys(MAX_POLLHANDLE), //
- mSignalHandlers(), //
- mInternalCodes(internal_codes_e::NO_ERROR),
- mSignalFdHandle(0)
+ mSetSignalhandlerKeys(MAX_POLLHANDLE), //
+ mSignalHandlers(), //
+ mInternalCodes(internal_codes_e::NO_ERROR),
+ mSignalFdHandle(0)
#ifndef WITH_TIMERFD
-,mStartTime() //
+ ,mStartTime() //
#endif
{
diff --git a/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp b/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp
index bd4aee4..085c3b1 100644
--- a/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp
+++ b/AudioManagerUtilities/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp
@@ -65,7 +65,7 @@ static void signalHandler(int sig, siginfo_t *siginfo, void *context)
if(pMockSignalHandler!=NULL)
pMockSignalHandler->signalHandler(sig, siginfo, context);
-
+
#ifdef ENABLED_SOCKETHANDLER_TEST_OUTPUT
std::cout<<"signal handler was called with signal " << sig << std::endl;
#endif
@@ -122,14 +122,14 @@ void am::CAmTimerSignalHandler::timerCallback(sh_timerHandle_t handle, void* use
std::advance(it, mIndex);
kill(getpid(), *it);
mIndex++;
-
+
#ifndef WITH_TIMERFD
mpSocketHandler->updateTimer( handle, mUpdateTimeout);
#endif
}
else
mpSocketHandler->stop_listening();
-
+
}
CAmTimer::CAmTimer(CAmSocketHandler *myHandler, const timespec &timeout, const int32_t repeats) :
@@ -604,7 +604,6 @@ TEST(CAmSocketHandlerTest, signalHandlerPrimaryPlusSecondary)
ASSERT_EQ(myHandler.listenToSignals({SIGHUP, SIGTERM, SIGCHLD}), E_OK);
sh_pollHandle_t signalHandler1, signalHandler2;
-
std::string userData = "User data";
// critical signals are registered here:
@@ -614,27 +613,29 @@ TEST(CAmSocketHandlerTest, signalHandlerPrimaryPlusSecondary)
signalAction.sa_flags = SA_RESETHAND | SA_NODEFER| SA_SIGINFO;
sigaction(SIGINT, &signalAction, NULL);
sigaction(SIGQUIT, &signalAction, NULL);
-
- myHandler.addSignalHandler([&](const sh_pollHandle_t handle, const signalfd_siginfo & info, void* userData)
- {
- unsigned sig = info.ssi_signo;
- pMockSignalHandler->signalHandlerAction(handle, sig, userData);
+
+ myHandler.addSignalHandler([&](const sh_pollHandle_t handle, const signalfd_siginfo & info, void* userData)
+ {
+ unsigned sig = info.ssi_signo;
+ pMockSignalHandler->signalHandlerAction(handle, sig, userData);
#ifdef ENABLED_SOCKETHANDLER_TEST_OUTPUT
- unsigned user = info.ssi_uid;
- std::cout<<"signal handler was called from user "<< user << " with signal " << sig << std::endl;
+ unsigned user = info.ssi_uid;
+ std::cout<<"signal handler was called from user "<< user << " with signal " << sig << std::endl;
#endif
- }, signalHandler1, &userData);
- ASSERT_EQ(signalHandler1, 1);
- myHandler.addSignalHandler([&](const sh_pollHandle_t handle, const signalfd_siginfo & info, void* userData)
- {
- unsigned sig = info.ssi_signo;
- pMockSignalHandler->signalHandlerAction(handle, sig, userData);
+ }, signalHandler1, &userData);
+ ASSERT_EQ(signalHandler1, 1);
+
+ myHandler.addSignalHandler([&](const sh_pollHandle_t handle, const signalfd_siginfo & info, void* userData)
+ {
+ unsigned sig = info.ssi_signo;
+ pMockSignalHandler->signalHandlerAction(handle, sig, userData);
#ifdef ENABLED_SOCKETHANDLER_TEST_OUTPUT
- unsigned user = info.ssi_uid;
- std::cout<<"signal handler was called from user "<< user << " with signal " << sig << std::endl;
+ unsigned user = info.ssi_uid;
+ std::cout<<"signal handler was called from user "<< user << " with signal " << sig << std::endl;
#endif
- }, signalHandler2, &userData);
- ASSERT_EQ(signalHandler2, 2);
+ }, signalHandler2, &userData);
+ ASSERT_EQ(signalHandler2, 2);
+
timespec timeout4;
timeout4.tv_nsec = 200000000;
timeout4.tv_sec = 0;
@@ -660,7 +661,7 @@ TEST(CAmSocketHandlerTest, signalHandlerPrimaryPlusSecondary)
EXPECT_CALL(*pMockSignalHandler,signalHandlerAction(signalHandler2,it,&userData)).Times(1);
for(auto it: primarySignals)
EXPECT_CALL(*pMockSignalHandler,signalHandler(it,_,_)).Times(1);
-
+
myHandler.start_listenting();
delete pMockSignalHandler;
}