-
// $Id$
//
// Copyright (C) 2006
unlink(SOCK_PATH);
int pid = fork();
if (pid == 0) {
+ signal(SIGCHLD, SIG_IGN);
server();
_exit(0);
}
error("fork");
return 0;
}
+ signal(SIGCHLD, SIG_DFL);
sleep(1); // Wait for the server socket to be opened
return pid;
void callback(int fd, int ev)
{
event = ev;
- switch (event & Scheduler::EV_ALL) {
- case Scheduler::EV_READ:
+ switch (event & senf::scheduler::FdEvent::EV_ALL) {
+ case senf::scheduler::FdEvent::EV_READ:
size = recv(fd,buffer,1024,0);
break;
- case Scheduler::EV_PRIO:
+ case senf::scheduler::FdEvent::EV_PRIO:
size = recv(fd,buffer,1024,MSG_OOB);
- Scheduler::instance().terminate();
break;
- case Scheduler::EV_WRITE:
+ case senf::scheduler::FdEvent::EV_WRITE:
size = write(fd,buffer,size);
- Scheduler::instance().terminate();
break;
}
- Scheduler::instance().terminate();
+ senf::scheduler::terminate();
}
bool timeoutCalled = false;
void timeout()
{
timeoutCalled = true;
- Scheduler::instance().terminate();
+ senf::scheduler::terminate();
}
struct HandleWrapper
void sigusr(siginfo_t const &)
{
sigtime = ClockService::now();
- Scheduler::instance().terminate();
+ senf::scheduler::terminate();
}
void delay(unsigned long milliseconds)
void blockingHandler()
{
delay(2200);
- Scheduler::instance().terminate();
+ senf::scheduler::terminate();
}
+ unsigned eventCount (0);
+
+ void eventeventhandler()
+ {
+ ++ eventCount;
+ }
}
BOOST_AUTO_UNIT_TEST(testScheduler)
///////////////////////////////////////////////////////////////////////////
- BOOST_CHECK_NO_THROW( Scheduler::instance() );
+ senf::scheduler::EventHook evev ("eventCounter", eventeventhandler, true,
+ senf::scheduler::EventHook::PRE);
{
senf::scheduler::FdEvent fde1 ("testFdEvent", boost::bind(&callback, sock, _1),
sock, senf::scheduler::FdEvent::EV_READ);
- event = Scheduler::EV_NONE;
- BOOST_CHECK_NO_THROW( Scheduler::instance().process() );
- BOOST_CHECK_EQUAL( event, Scheduler::EV_READ );
+ event = senf::scheduler::FdEvent::EV_NONE;
+ BOOST_CHECK_NO_THROW( senf::scheduler::process() );
+ BOOST_CHECK_EQUAL( event, senf::scheduler::FdEvent::EV_READ );
BOOST_REQUIRE_EQUAL( size, 4 );
buffer[size]=0;
BOOST_CHECK_EQUAL( buffer, "READ" );
handle, senf::scheduler::FdEvent::EV_WRITE);
strcpy(buffer,"WRITE");
size=5;
- event = Scheduler::EV_NONE;
- BOOST_CHECK_NO_THROW( Scheduler::instance().process() );
- BOOST_CHECK_EQUAL( event, Scheduler::EV_WRITE );
+ event = senf::scheduler::FdEvent::EV_NONE;
+ BOOST_CHECK_NO_THROW( senf::scheduler::process() );
+ BOOST_CHECK_EQUAL( event, senf::scheduler::FdEvent::EV_WRITE );
SENF_CHECK_NO_THROW( fde2.disable() );
- event = Scheduler::EV_NONE;
+ event = senf::scheduler::FdEvent::EV_NONE;
sleep(1);
- BOOST_CHECK_NO_THROW( Scheduler::instance().process() );
- BOOST_CHECK_EQUAL( event, Scheduler::EventId(Scheduler::EV_READ|Scheduler::EV_HUP) );
+ BOOST_CHECK_NO_THROW( senf::scheduler::process() );
+ BOOST_CHECK_EQUAL( event, senf::scheduler::FdEvent::EV_READ|senf::scheduler::FdEvent::EV_HUP );
BOOST_REQUIRE_EQUAL( size, 2 );
buffer[size]=0;
BOOST_CHECK_EQUAL( buffer, "OK" );
senf::scheduler::TimerEvent timer2 ("testTimer2", &timeout,
ClockService::now()+ClockService::milliseconds(400));
- event = Scheduler::EV_NONE;
+ event = senf::scheduler::FdEvent::EV_NONE;
ClockService::clock_type t (ClockService::now());
- BOOST_CHECK_NO_THROW( Scheduler::instance().process() );
+ BOOST_CHECK_NO_THROW( senf::scheduler::process() );
BOOST_CHECK_PREDICATE( is_close, (ClockService::now()-t) (ClockService::milliseconds(200)) );
BOOST_CHECK( timeoutCalled );
BOOST_CHECK( ! timer1.enabled() );
- BOOST_CHECK_EQUAL( event, Scheduler::EV_NONE );
- BOOST_CHECK_PREDICATE( is_close, (ClockService::now()) (Scheduler::instance().eventTime()) );
+ BOOST_CHECK_EQUAL( event, senf::scheduler::FdEvent::EV_NONE );
+ BOOST_CHECK_PREDICATE( is_close, (ClockService::now()) (senf::scheduler::eventTime()) );
timeoutCalled = false;
- BOOST_CHECK_NO_THROW( Scheduler::instance().process() );
+ BOOST_CHECK_NO_THROW( senf::scheduler::process() );
BOOST_CHECK_PREDICATE( is_close, (ClockService::now()-t) (ClockService::milliseconds(400)) );
BOOST_CHECK( timeoutCalled );
- BOOST_CHECK_EQUAL( event, Scheduler::EV_NONE );
+ BOOST_CHECK_EQUAL( event, senf::scheduler::FdEvent::EV_NONE );
BOOST_CHECK( ! timer2.enabled() );
BOOST_WARN_MESSAGE( false, "A 'Scheduler task hanging' error is expected to be signaled here." );
BOOST_CHECK_NO_THROW( timer1.action(&blockingHandler) );
BOOST_CHECK_NO_THROW( timer1.timeout(ClockService::now()) );
- BOOST_CHECK_NO_THROW( Scheduler::instance().process() );
- BOOST_CHECK_EQUAL( Scheduler::instance().hangCount(), 1u );
+ BOOST_CHECK_NO_THROW( senf::scheduler::process() );
+ BOOST_CHECK_EQUAL( senf::scheduler::hangCount(), 1u );
}
{
ClockService::clock_type t = ClockService::now();
::kill(::getpid(), SIGUSR1);
delay(100);
- BOOST_CHECK_NO_THROW( Scheduler::instance().process() );
+ BOOST_CHECK_NO_THROW( senf::scheduler::process() );
BOOST_CHECK_PREDICATE( is_close, (ClockService::now()) (t+ClockService::milliseconds(200)) );
BOOST_CHECK_PREDICATE( is_close, (sigtime) (t+ClockService::milliseconds(200)) );
- BOOST_CHECK_NO_THROW( Scheduler::instance().process() );
+ BOOST_CHECK_NO_THROW( senf::scheduler::process() );
}
+ BOOST_CHECK( eventCount >= 8u );
+
///////////////////////////////////////////////////////////////////////////
close(sock);