Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
capnproto
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
capnproto
Commits
44e4afcd
Commit
44e4afcd
authored
Apr 01, 2014
by
Kenton Varda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build on OSX and also GCC 4.7.
parent
5e2f41de
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
8 deletions
+7
-8
async-unix.c++
c++/src/kj/async-unix.c++
+4
-5
async-unix.h
c++/src/kj/async-unix.h
+1
-1
mega-test-quick.cfg
mega-test-quick.cfg
+2
-2
No files found.
c++/src/kj/async-unix.c++
View file @
44e4afcd
...
...
@@ -29,7 +29,7 @@
#include <inttypes.h>
#include <limits>
#include <set>
#include <
time.h
>
#include <
chrono
>
namespace
kj
{
...
...
@@ -211,7 +211,7 @@ UnixEventPort::UnixEventPort()
pthread_once
(
&
registerReservedSignalOnce
,
&
registerReservedSignal
);
}
UnixEventPort
::~
UnixEventPort
()
{}
UnixEventPort
::~
UnixEventPort
()
noexcept
(
false
)
{}
Promise
<
short
>
UnixEventPort
::
onFdEvent
(
int
fd
,
short
eventMask
)
{
return
newAdaptedPromise
<
short
,
PollPromiseAdapter
>
(
*
this
,
fd
,
eventMask
);
...
...
@@ -419,9 +419,8 @@ void UnixEventPort::gotSignal(const siginfo_t& siginfo) {
}
TimePoint
UnixEventPort
::
currentSteadyTime
()
{
struct
timespec
tp
;
KJ_SYSCALL
(
clock_gettime
(
CLOCK_MONOTONIC
,
&
tp
));
return
origin
<
TimePoint
>
()
+
(
tp
.
tv_sec
*
SECONDS
+
tp
.
tv_sec
*
NANOSECONDS
);
return
origin
<
TimePoint
>
()
+
std
::
chrono
::
duration_cast
<
std
::
chrono
::
nanoseconds
>
(
std
::
chrono
::
steady_clock
::
now
().
time_since_epoch
()).
count
()
*
NANOSECONDS
;
}
void
UnixEventPort
::
processTimers
()
{
...
...
c++/src/kj/async-unix.h
View file @
44e4afcd
...
...
@@ -50,7 +50,7 @@ class UnixEventPort: public EventPort {
public
:
UnixEventPort
();
~
UnixEventPort
();
~
UnixEventPort
()
noexcept
(
false
)
;
Promise
<
short
>
onFdEvent
(
int
fd
,
short
eventMask
);
// `eventMask` is a bitwise-OR of poll events (e.g. `POLLIN`, `POLLOUT`, etc.). The next time
...
...
mega-test-quick.cfg
View file @
44e4afcd
linux-gcc-4.7 9
29
./super-test.sh tmpdir capnp-gcc-4.7 quick gcc-4.7
linux-gcc-4.8 9
30
./super-test.sh tmpdir capnp-gcc-4.8 quick gcc-4.8
linux-gcc-4.7 9
30
./super-test.sh tmpdir capnp-gcc-4.7 quick gcc-4.7
linux-gcc-4.8 9
29
./super-test.sh tmpdir capnp-gcc-4.8 quick gcc-4.8
linux-clang 959 ./super-test.sh tmpdir capnp-clang quick clang
mac 884 ./super-test.sh remote beat caffeinate quick
cygwin 923 ./super-test.sh remote Kenton@flashman quick
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment