diff --git a/Scheduler/Console/ParsedCommand.ih b/Scheduler/Console/ParsedCommand.ih
index 0e2202165f73c67095cf709bd656af1ba8a469cf..65a02f769db5adce3831c4226b44ea0be8d7ba78 100644
--- a/Scheduler/Console/ParsedCommand.ih
+++ b/Scheduler/Console/ParsedCommand.ih
@@ -38,7 +38,7 @@ namespace console {
template < class FunctionTraits,
class ReturnType=typename FunctionTraits::result_type,
- unsigned arity=FunctionTraits::arity >
+ unsigned arity=FunctionTraits::arity >
class ParsedCommandOverload;
template < class Overload,
diff --git a/Socket/FileHandle.cc b/Socket/FileHandle.cc
index 5ee1afedab6e322d55c76ce5df352c24121254b1..bc8ea9caf21923dd77cdb2897f91116240ca2fe6 100644
--- a/Socket/FileHandle.cc
+++ b/Socket/FileHandle.cc
@@ -111,7 +111,7 @@ prefix_ void senf::FileBody::blocking(bool status)
/* We don't take POLLIN/POLLOUT as argument to avoid having to include
sys/poll.h in the .cci file (and therefore indirectly into the .hh
and then every file which uses FileHandle) */
-prefix_ bool senf::FileBody::pollCheck(int fd, bool incoming, bool block, bool oob)
+prefix_ bool senf::FileBody::pollCheck(int fd, bool incoming, int timeout, bool oob)
const
{
struct ::pollfd pfd;
@@ -120,7 +120,7 @@ prefix_ bool senf::FileBody::pollCheck(int fd, bool incoming, bool block, bool o
pfd.events = incoming?(oob?POLLPRI:POLLIN):POLLOUT;
int rv = -1;
do {
- rv = ::poll(&pfd,1,block?-1:0);
+ rv = ::poll(&pfd,1,timeout);
if (rv<0)
switch (errno) {
case EINTR:
diff --git a/Socket/FileHandle.cci b/Socket/FileHandle.cci
index 5cbfce4cc63e54bf082a2b516aad50a908b14e33..6db39f59ebc152913baa09ce9539402dd7a0e9dd 100644
--- a/Socket/FileHandle.cci
+++ b/Socket/FileHandle.cci
@@ -72,37 +72,40 @@ prefix_ bool senf::FileBody::valid()
prefix_ bool senf::FileBody::readable()
const
{
- return pollCheck(fd(),true);
+ return pollCheck(fd(),true,0);
}
-prefix_ void senf::FileBody::waitReadable()
+prefix_ bool senf::FileBody::waitReadable(senf::ClockService::clock_type timeout)
const
{
- pollCheck(fd(),true,true);
+ return pollCheck(fd(), true,
+ (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)) );
}
prefix_ bool senf::FileBody::writeable()
const
{
- return pollCheck(fd(),false);
+ return pollCheck(fd(),false,0);
}
-prefix_ void senf::FileBody::waitWriteable()
+prefix_ bool senf::FileBody::waitWriteable(senf::ClockService::clock_type timeout)
const
{
- pollCheck(fd(),false,true);
+ return pollCheck(fd(), false,
+ (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)) );
}
prefix_ bool senf::FileBody::oobReadable()
const
{
- return pollCheck(fd(),true,false,true);
+ return pollCheck(fd(),true,0,true);
}
-prefix_ void senf::FileBody::waitOOBReadable()
+prefix_ bool senf::FileBody::waitOOBReadable(senf::ClockService::clock_type timeout)
const
{
- pollCheck(fd(),true,true,true);
+ return pollCheck(fd(), true,
+ (timeout==-1?-1:senf::ClockService::in_milliseconds(timeout)), true);
}
///////////////////////////////////////////////////////////////////////////
@@ -137,10 +140,10 @@ prefix_ bool senf::FileHandle::readable()
return body().readable();
}
-prefix_ void senf::FileHandle::waitReadable()
+prefix_ bool senf::FileHandle::waitReadable(senf::ClockService::clock_type timeout)
const
{
- body().waitReadable();
+ return body().waitReadable(timeout);
}
prefix_ bool senf::FileHandle::writeable()
@@ -149,10 +152,10 @@ prefix_ bool senf::FileHandle::writeable()
return body().writeable();
}
-prefix_ void senf::FileHandle::waitWriteable()
+prefix_ bool senf::FileHandle::waitWriteable(senf::ClockService::clock_type timeout)
const
{
- body().waitWriteable();
+ return body().waitWriteable(timeout);
}
prefix_ bool senf::FileHandle::oobReadable()
@@ -161,10 +164,10 @@ prefix_ bool senf::FileHandle::oobReadable()
return body().oobReadable();
}
-prefix_ void senf::FileHandle::waitOOBReadable()
+prefix_ bool senf::FileHandle::waitOOBReadable(senf::ClockService::clock_type timeout)
const
{
- body().waitOOBReadable();
+ return body().waitOOBReadable(timeout);
}
prefix_ bool senf::FileHandle::blocking()
diff --git a/Socket/FileHandle.hh b/Socket/FileHandle.hh
index cf3fc67663eb666cff6a6d12a268b8b5cfe15828..377a8a61fbd9b036928e0af3e7c825fe1e614ba9 100644
--- a/Socket/FileHandle.hh
+++ b/Socket/FileHandle.hh
@@ -68,6 +68,7 @@
// Custom includes
#include <memory> // std::auto_ptr
#include "../Utils/safe_bool.hh"
+#include "../Scheduler/ClockService.hh"
//#include "FileHandle.mpp"
///////////////////////////////hh.p////////////////////////////////////////
@@ -137,16 +138,31 @@ namespace senf {
bool readable() const; ///< Check, whether a read on the handle would not block
///< (ignoring blocking state)
- void waitReadable() const; ///< Wait, until read on the handle would not block (ignoring
+ bool waitReadable(senf::ClockService::clock_type timeout = -1) const;
+ ///< Wait, until read on the handle would not block (ignoring
///< blocking state)
+ /**< \param[in] timeout max time to wait, default is to wait
+ forever.
+ \returns \c true, if handle became readable or \c false on
+ timeout. */
bool writeable() const; ///< Check, whether a write on the handle would not block
///< (ignoring blocking state)
- void waitWriteable() const; ///< Wait, until a write on the handle would not block
+ bool waitWriteable(senf::ClockService::clock_type timeout = -1) const;
+ ///< Wait, until a write on the handle would not block
///< (ignoring blocking state)
+ /**< \param[in] timeout max time to wait, default is to wait
+ forever.
+ \returns \c true, if handle became writable or \c false on
+ timeout. */
bool oobReadable() const; ///< Check, whether a read of prioritized data on the handle
///< would not block (ignoring blocking state)
- void waitOOBReadable() const; ///< Wait, until read of prioritized data on the handle does
+ bool waitOOBReadable(senf::ClockService::clock_type timeout = -1) const;
+ ///< Wait, until read of prioritized data on the handle does
///< not block (ignoring blocking state)
+ /**< \param[in] timeout max time to wait, default is to wait
+ forever.
+ \returns \c true, if handle became readable for
+ out-of-band data or \c false on timeout. */
bool blocking() const; ///< Return current blocking state
void blocking(bool status); ///< Set blocking state
diff --git a/Socket/FileHandle.ih b/Socket/FileHandle.ih
index 87b1920ea44d8e86c409c4c02117047b92849f86..b13f2feac59ebd4913ed69055232388e8c8128cd 100644
--- a/Socket/FileHandle.ih
+++ b/Socket/FileHandle.ih
@@ -105,11 +105,11 @@ namespace senf {
void destroyClose();
bool readable() const;
- void waitReadable() const;
+ bool waitReadable(senf::ClockService::clock_type timeout) const;
bool writeable() const;
- void waitWriteable() const;
+ bool waitWriteable(senf::ClockService::clock_type timeout) const;
bool oobReadable() const;
- void waitOOBReadable() const;
+ bool waitOOBReadable(senf::ClockService::clock_type timeout) const;
bool blocking() const;
void blocking(bool status);
@@ -142,7 +142,7 @@ namespace senf {
protected:
private:
- bool pollCheck(int fd, bool incoming, bool block=false, bool oob=false) const;
+ bool pollCheck(int fd, bool incoming, int timeout, bool oob=false) const;
int fd_;
};
diff --git a/project.el b/project.el
index 37d2b6929614de8d37228bd3d449bfc27463558b..703309fc0fc779b1e4b5ad845a05db22164269d0 100644
--- a/project.el
+++ b/project.el
@@ -1,6 +1,11 @@
;; Configuration file for cc-ide.el (Emacs C++ IDE extension, see http://g0dil.de)
- (defvar senf-c-style
+(defun check-namespace-indent (arg)
+ (save-excursion
+ (back-to-indentation)
+ (if (looking-at "namespace") [0] '+)))
+
+ (defconst senf-c-style
'((c-basic-offset . 4)
(c-backslash-column . 98)
(c-cleanup-list . (empty-defun-braces
@@ -16,9 +21,9 @@
(extern-lang-open after)
(inexpr-class-open after)
(inexpr-class-close before)))
- (c-offsets-alist . ((namespace-open . 0)
- (namespace-close . 0)
- (innamespace . +)
+ (c-offsets-alist . ((namespace-open . [0])
+ (namespace-close . [0])
+ (innamespace . check-namespace-indent)
(statement-block-intro . +)
(substatement-open . 0)
(label . 0)