X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Scheduler%2FScheduler.test.cc;h=14e01bc0586b459bd3d9fb021e6e00b96b7e2f8a;hb=fd3a0e8ac95d1158e9ea661ddf9187b67c70169f;hp=26dd7fd50add55252ba6b7c3f1427036ca0aee57;hpb=2654c3b13a187f38dc026e04c76ea5c885b34787;p=senf.git diff --git a/Scheduler/Scheduler.test.cc b/Scheduler/Scheduler.test.cc index 26dd7fd..14e01bc 100644 --- a/Scheduler/Scheduler.test.cc +++ b/Scheduler/Scheduler.test.cc @@ -1,9 +1,9 @@ // $Id$ // -// Copyright (C) 2006 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) -// Stefan Bund +// Copyright (C) 2006 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Stefan Bund // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -20,10 +20,11 @@ // Free Software Foundation, Inc., // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// Unit tests +/** \file + \brief Scheduler unit tests */ -//#include "scheduler.test.hh" -//#include "scheduler.test.ih" +//#include "Scheduler.test.hh" +//#include "Scheduler.test.ih" // Custom includes #include @@ -35,21 +36,20 @@ #include #include #include +#include #include "Scheduler.hh" -#include +#include "../Utils/auto_unit_test.hh" #include #define prefix_ ///////////////////////////////cc.p//////////////////////////////////////// -using namespace satcom::lib; - namespace { - + char const * SOCK_PATH = "/tmp/sched_test.sock"; - + void error(char const * fn, char const * proc="") { std::cerr << "\n" << proc << fn << ": " << strerror(errno) << std::endl; @@ -100,6 +100,7 @@ namespace { unlink(SOCK_PATH); int pid = fork(); if (pid == 0) { + signal(SIGCHLD, SIG_IGN); server(); _exit(0); } @@ -107,7 +108,8 @@ namespace { error("fork"); return 0; } - + signal(SIGCHLD, SIG_DFL); + sleep(1); // Wait for the server socket to be opened return pid; } @@ -140,35 +142,30 @@ namespace { int size; int event; - void callback(int fd, Scheduler::EventId ev) + void callback(int fd, int ev) { event = ev; - switch (event) { - 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; - case Scheduler::EV_HUP: - case Scheduler::EV_ERR: - case Scheduler::EV_NONE: - case Scheduler::EV_ALL: - ; } - Scheduler::instance().terminate(); + senf::scheduler::terminate(); } - void timeout() + bool timeoutCalled = false; + void timeout() { - Scheduler::instance().terminate(); + timeoutCalled = true; + senf::scheduler::terminate(); } - + struct HandleWrapper { HandleWrapper(int fd,std::string const & tag) : fd_(fd), tag_(tag) {} @@ -181,21 +178,49 @@ namespace { return handle.fd_; } - void handleCallback(HandleWrapper const & handle, Scheduler::EventId event) + void handleCallback(HandleWrapper const & handle, int event) { if (handle.tag_ != "TheTag") return; callback(handle.fd_,event); } - bool is_close(MicroTime a, MicroTime b) + bool is_close(senf::ClockService::clock_type a, senf::ClockService::clock_type b) + { + return (a= 8u ); + + /////////////////////////////////////////////////////////////////////////// close(sock); @@ -258,11 +326,81 @@ BOOST_AUTO_UNIT_TEST(scheduler) BOOST_CHECK (stop_server(pid)); } +BOOST_AUTO_UNIT_TEST(testSchedulerPollTimers) +{ + BOOST_CHECK( ! senf::scheduler::usingHiresTimers() ); + schedulerTest(); +} + +BOOST_AUTO_UNIT_TEST(testSchedulerHiresTimers) +{ + if (senf::scheduler::haveScalableHiresTimers()) + BOOST_MESSAGE( "Using timerfd() hires timers" ); + else + BOOST_MESSAGE( "Using POSIX hires timers"); + SENF_CHECK_NO_THROW( senf::scheduler::hiresTimers() ); + BOOST_CHECK( senf::scheduler::usingHiresTimers() ); + schedulerTest(); + SENF_CHECK_NO_THROW( senf::scheduler::loresTimers() ); + BOOST_CHECK( ! senf::scheduler::usingHiresTimers() ); +} + +BOOST_AUTO_UNIT_TEST(testSchedulerPOSIXTimers) +{ + if (senf::scheduler::haveScalableHiresTimers()) { + SENF_CHECK_NO_THROW( senf::scheduler::detail::TimerDispatcher::instance().timerSource( + std::auto_ptr( + new senf::scheduler::detail::POSIXTimerSource())) ); + schedulerTest(); + senf::scheduler::loresTimers(); + } +} + +namespace { + + void sigme() + { + senf::scheduler::BlockSignals signalBlocker; + signalBlocker.block(); + signalBlocker.unblock(); + BOOST_CHECK( ! signalBlocker.blocked() ); + signalBlocker.unblock(); + signalBlocker.block(); + BOOST_CHECK( signalBlocker.blocked() ); + ::kill(::getpid(), SIGUSR1); + delay(200); + } + +} + +BOOST_AUTO_UNIT_TEST(blockSignals) +{ + senf::scheduler::TimerEvent signaler ("sigme", &sigme, senf::ClockService::now()); + senf::scheduler::TimerEvent timer ( + "testWatchdog", &timeout, senf::ClockService::now()+senf::ClockService::milliseconds(400)); + senf::scheduler::SignalEvent sig (SIGUSR1, &sigusr); + + senf::ClockService::clock_type t = senf::ClockService::now(); + SENF_CHECK_NO_THROW( senf::scheduler::process() ); + + BOOST_CHECK_PREDICATE( is_close, + (senf::ClockService::now()) + (t+senf::ClockService::milliseconds(200)) ); + BOOST_CHECK_PREDICATE( is_close, (sigtime) (t+senf::ClockService::milliseconds(200)) ); + + SENF_CHECK_NO_THROW( senf::scheduler::process() ); +} + ///////////////////////////////cc.e//////////////////////////////////////// #undef prefix_ // Local Variables: // mode: c++ -// c-file-style: "satcom" +// fill-column: 100 +// c-file-style: "senf" +// indent-tabs-mode: nil +// ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: