OSS/tanya
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Fix if EPOLLIN and EPOLLOUT come together

Browse Source
This commit is contained in:
Eugen Wissner 2017-01-13 10:20:11 +01:00
parent 4c4e65b373
commit 8973bdb2af
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/tanya/async/event/epoll.d
View File

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/** /**
* Copyright: Eugene Wissner 2016. * Copyright: Eugene Wissner 2016-2017.
* License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/, * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
* Mozilla Public License, v. 2.0). * Mozilla Public License, v. 2.0).
* Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner) * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -132,6 +132,7 @@ class EpollLoop : SelectorLoop
else if (events[i].events & EPOLLERR) else if (events[i].events & EPOLLERR)
{ {
kill(io, null); kill(io, null);
continue;
} }
else if (events[i].events & (EPOLLIN | EPOLLPRI | EPOLLHUP)) else if (events[i].events & (EPOLLIN | EPOLLPRI | EPOLLHUP))
{ {
@ -156,13 +157,14 @@ class EpollLoop : SelectorLoop
if (transport.socket.disconnected) if (transport.socket.disconnected)
{ {
kill(io, exception); kill(io, exception);
continue;
} }
else if (io.output.length) else if (io.output.length)
{ {
pendings.enqueue(io); pendings.enqueue(io);
} }
} }
else if (events[i].events & EPOLLOUT) if (events[i].events & EPOLLOUT)
{ {
auto transport = cast(SelectorStreamTransport) io.transport; auto transport = cast(SelectorStreamTransport) io.transport;
assert(transport !is null); assert(transport !is null);

4
source/tanya/async/loop.d
View File

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/** /**
* Copyright: Eugene Wissner 2016. * Copyright: Eugene Wissner 2016-2017.
* License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/, * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
* Mozilla Public License, v. 2.0). * Mozilla Public License, v. 2.0).
* Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner) * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -17,7 +17,7 @@
* { * {
* private DuplexTransport transport; * private DuplexTransport transport;
* *
* void received(ubyte[] data) @nogc * void received(in ubyte[] data) @nogc
* { * {
* transport.write(data); * transport.write(data);
* } * }

4
source/tanya/async/protocol.d
View File

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/** /**
* Copyright: Eugene Wissner 2016. * Copyright: Eugene Wissner 2016-2017.
* License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/, * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
* Mozilla Public License, v. 2.0). * Mozilla Public License, v. 2.0).
* Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner) * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -22,7 +22,7 @@ interface Protocol
* Params: * Params:
* data = Read data. * data = Read data.
*/ */
void received(ubyte[] data) @nogc; void received(in ubyte[] data) @nogc;
/** /**
* Called when a connection is made. * Called when a connection is made.

22
source/tanya/container/vector.d
View File

@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/** /**
* Copyright: Eugene Wissner 2016. * Copyright: Eugene Wissner 2016-2017.
* License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/, * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
* Mozilla Public License, v. 2.0). * Mozilla Public License, v. 2.0).
* Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner) * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -180,6 +180,11 @@ private struct Range(E)
return true; return true;
} }
@property inout(E[]) data() inout
{
return begin[0 .. length];
}
static if (isMutable!E) static if (isMutable!E)
{ {
bool opEquals(Range that) bool opEquals(Range that)
@ -1408,6 +1413,21 @@ struct Vector(T)
return vector[0 .. length]; return vector[0 .. length];
} }
///
unittest
{
auto v = Vector!int(IL(1, 2, 4));
assert(v.data[0] == 1);
assert(v.data[1] == 2);
assert(v.data[2] == 4);
assert(v.data.length == 3);
auto data = v[1 .. 2].data;
assert(data[0] == 2);
assert(data.length == 1);
}
mixin DefaultAllocator; mixin DefaultAllocator;
} }