|
11 | 11 | #include <boost/bind.hpp>
|
12 | 12 | #include <boost/python.hpp>
|
13 | 13 | #include <boost/python/eventloop.hpp>
|
| 14 | +#include <boost/mpl/vector.hpp> |
| 15 | +#include <Python.h> |
14 | 16 |
|
15 | 17 |
|
16 | 18 | namespace boost { namespace python { namespace asio {
|
| 19 | +namespace |
| 20 | +{ |
| 21 | + |
| 22 | +void _sock_recv_handler(std::promise<std::vector<char>>& prom, size_t nbytes, int fd, size_t& nbytes_read) |
| 23 | +{ |
| 24 | + std::vector<char> buffer(nbytes); |
| 25 | + nbytes_read = read(fd, buffer.data(), nbytes); |
| 26 | + prom.set_value(std::move(buffer)); |
| 27 | +} |
| 28 | + |
| 29 | +void _sock_send_handler(std::promise<size_t>& prom, int fd, const char *py_str, size_t len) |
| 30 | +{ |
| 31 | + size_t nwrite = write(fd, py_str, len); |
| 32 | + prom.set_value(nwrite); |
| 33 | +} |
| 34 | + |
| 35 | +} |
17 | 36 |
|
18 | 37 | void event_loop::_add_reader_or_writer(int fd, object f, int key)
|
19 | 38 | {
|
@@ -76,19 +95,41 @@ void event_loop::call_at(double when, object f)
|
76 | 95 | return call_soon(f);
|
77 | 96 | }
|
78 | 97 |
|
79 |
| -void event_loop::sock_recv(object sock, int bytes) |
| 98 | +object event_loop::sock_recv(object sock, size_t nbytes) |
80 | 99 | {
|
81 |
| - |
| 100 | + int fd = extract<int>(sock.attr("fileno")()); |
| 101 | + std::promise<std::vector<char>> prom; |
| 102 | + std::future<std::vector<char>> fut = prom.get_future(); |
| 103 | + size_t nbytes_read; |
| 104 | + add_reader(fd, make_function(bind(_sock_recv_handler, std::ref(prom), nbytes, fd, nbytes_read), |
| 105 | + default_call_policies(), boost::mpl::vector<void, object>())); |
| 106 | + return object(handle<>(PyBytes_FromStringAndSize(fut.get().data(), nbytes))); |
82 | 107 | }
|
83 | 108 |
|
84 |
| -void event_loop::sock_recv_into(object sock, object buffer) |
| 109 | +size_t event_loop::sock_recv_into(object sock, object buffer) |
85 | 110 | {
|
86 |
| - |
| 111 | + int fd = extract<int>(sock.attr("fileno")()); |
| 112 | + size_t nbytes = extract<size_t>(buffer.attr("__len__")()); |
| 113 | + std::promise<std::vector<char>> prom; |
| 114 | + std::future<std::vector<char>> fut = prom.get_future(); |
| 115 | + size_t nbytes_read; |
| 116 | + add_reader(fd, make_function(bind(_sock_recv_handler, std::ref(prom), nbytes, fd, nbytes_read), |
| 117 | + default_call_policies(), boost::mpl::vector<void, object>())); |
| 118 | + buffer = object(handle<>(PyBytes_FromStringAndSize(fut.get().data(), nbytes))); |
| 119 | + return nbytes_read; |
87 | 120 | }
|
88 | 121 |
|
89 |
| -void event_loop::sock_sendall(object sock, object data) |
| 122 | +object event_loop::sock_sendall(object sock, object data) |
90 | 123 | {
|
91 |
| - |
| 124 | + int fd = extract<int>(sock.attr("fileno")()); |
| 125 | + char const* py_str = extract<char const*>(data.attr("decode")()); |
| 126 | + size_t len = extract<size_t>(data.attr("__len__")()); |
| 127 | + std::promise<size_t> prom; |
| 128 | + std::future<size_t> fut = prom.get_future(); |
| 129 | + add_writer(fd, make_function(bind(_sock_send_handler, std::ref(prom), fd, py_str, len), |
| 130 | + default_call_policies(), boost::mpl::vector<void, object>())); |
| 131 | + fut.wait(); |
| 132 | + return object(); |
92 | 133 | }
|
93 | 134 |
|
94 | 135 | void event_loop::sock_connect(object sock, object address)
|
|
0 commit comments