@@ -31,8 +31,11 @@ inline constexpr int32_t errno_einval = EINVAL;
3131inline constexpr int32_t errno_enodata = ENODATA;
3232inline constexpr int32_t errno_efault = EFAULT;
3333inline constexpr int32_t errno_enomem = ENOMEM;
34+ inline constexpr int32_t errno_eshutdown = ESHUTDOWN;
35+ inline constexpr int32_t errno_ecanceled = ECANCELED;
3436
35- inline constexpr uint64_t INVALID_PLATFORM_DESCRIPTOR = 0 ;
37+ using descriptor = uint64_t ;
38+ inline constexpr k2::descriptor INVALID_PLATFORM_DESCRIPTOR = 0 ;
3639
3740enum class stream_kind : uint8_t { component, udp, tcp };
3841
@@ -106,52 +109,52 @@ inline int32_t uname(struct utsname* addr) noexcept {
106109 return k2_uname (addr);
107110}
108111
109- inline int32_t open (uint64_t * stream_d , size_t name_len, const char * name) noexcept {
110- return k2_open (stream_d , name_len, name);
112+ inline int32_t open (k2::descriptor* descriptor , size_t name_len, const char * name) noexcept {
113+ return k2_open (descriptor , name_len, name);
111114}
112115
113- inline void stream_status (uint64_t stream_d , StreamStatus* status) noexcept {
114- k2_stream_status (stream_d , status);
116+ inline void stream_status (k2::descriptor descriptor , StreamStatus* status) noexcept {
117+ k2_stream_status (descriptor , status);
115118}
116119
117- inline size_t write (uint64_t stream_d , size_t data_len, const void * data) noexcept {
118- return k2_write (stream_d , data_len, data);
120+ inline size_t write (k2::descriptor descriptor , size_t data_len, const void * data) noexcept {
121+ return k2_write (descriptor , data_len, data);
119122}
120123
121124inline size_t stderr_write (size_t data_len, const void * data) noexcept {
122125 return k2_stderr_write (data_len, data);
123126}
124127
125- inline size_t read (uint64_t stream_d , size_t buf_len, void * buf) noexcept {
126- return k2_read (stream_d , buf_len, buf);
128+ inline size_t read (k2::descriptor descriptor , size_t buf_len, void * buf) noexcept {
129+ return k2_read (descriptor , buf_len, buf);
127130}
128131
129- inline void please_shutdown (uint64_t stream_d ) noexcept {
130- k2_please_shutdown (stream_d );
132+ inline void please_shutdown (k2::descriptor descriptor ) noexcept {
133+ k2_please_shutdown (descriptor );
131134}
132135
133- inline void shutdown_write (uint64_t stream_d ) noexcept {
134- k2_shutdown_write (stream_d );
136+ inline void shutdown_write (k2::descriptor descriptor ) noexcept {
137+ k2_shutdown_write (descriptor );
135138}
136139
137140inline void instant (TimePoint* time_point) noexcept {
138141 k2_instant (time_point);
139142}
140143
141- inline int32_t new_timer (uint64_t * descriptor, uint64_t duration_ns) noexcept {
144+ inline int32_t new_timer (k2::descriptor * descriptor, uint64_t duration_ns) noexcept {
142145 return k2_new_timer (descriptor, duration_ns);
143146}
144147
145- inline int32_t timer_deadline (uint64_t d , TimePoint* deadline) noexcept {
146- return k2_timer_deadline (d , deadline);
148+ inline int32_t timer_deadline (k2::descriptor descriptor , TimePoint* deadline) noexcept {
149+ return k2_timer_deadline (descriptor , deadline);
147150}
148151
149- inline void free_descriptor (uint64_t descriptor) noexcept {
152+ inline void free_descriptor (k2::descriptor descriptor) noexcept {
150153 k2_free_descriptor (descriptor);
151154}
152155
153- inline uint8_t take_update (uint64_t * update_d ) noexcept {
154- return k2_take_update (update_d );
156+ inline uint8_t take_update (k2::descriptor* descriptor ) noexcept {
157+ return k2_take_update (descriptor );
155158}
156159
157160inline void log (size_t level, size_t len, const char * str) noexcept {
@@ -218,12 +221,12 @@ inline struct tm* localtime_r(const time_t* timer, struct tm* result) noexcept {
218221 return k2_localtime_r (timer, result);
219222}
220223
221- inline int32_t udp_connect (uint64_t * socket_d , const char * host, size_t host_len) noexcept {
222- return k2_udp_connect (socket_d , host, host_len);
224+ inline int32_t udp_connect (k2::descriptor* descriptor , const char * host, size_t host_len) noexcept {
225+ return k2_udp_connect (descriptor , host, host_len);
223226}
224227
225- inline int32_t tcp_connect (uint64_t * socket_d , const char * host, size_t host_len) noexcept {
226- return k2_tcp_connect (socket_d , host, host_len);
228+ inline int32_t tcp_connect (k2::descriptor* descriptor , const char * host, size_t host_len) noexcept {
229+ return k2_tcp_connect (descriptor , host, host_len);
227230}
228231
229232inline int32_t iconv_open (void ** iconv_cd, const char * tocode, const char * fromcode) noexcept {
0 commit comments