mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-12-27 17:00:27 +00:00
Code Issues 1 Releases Wiki Activity

Improve windows error messages on write failures.

Browse Source
This commit is contained in:
Calvin Rose 2020-11-14 15:48:21 -06:00
parent b53dd67e74
commit 7a98f9aa02
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/ev.c
View File

@ -884,7 +884,7 @@ JanetListenerState *janet_listen(JanetStream *stream, JanetListener behavior, in
} while (status == -1 && errno == EINTR); } while (status == -1 && errno == EINTR);
if (status == -1) { if (status == -1) {
janet_unlisten_impl(state); janet_unlisten_impl(state);
janet_panicf("failed to schedule event: %s", strerror(errno)); janet_panicv(janet_ev_lasterr());
} }
return state; return state;
} }
@ -903,7 +903,7 @@ static void janet_unlisten(JanetListenerState *state) {
status = epoll_ctl(janet_vm_epoll, op, stream->handle, &ev); status = epoll_ctl(janet_vm_epoll, op, stream->handle, &ev);
} while (status == -1 && errno == EINTR); } while (status == -1 && errno == EINTR);
if (status == -1) { if (status == -1) {
janet_panicf("failed to unschedule event: %s", strerror(errno)); janet_panicv(janet_ev_lasterr());
} }
} }
/* Destroy state machine and free memory */ /* Destroy state machine and free memory */
@ -1463,7 +1463,7 @@ JanetAsyncStatus ev_machine_write(JanetListenerState *s, JanetAsyncEvent event)
status = WSASend(sock, &state->wbuf, 1, NULL, state->flags, &state->overlapped, NULL); status = WSASend(sock, &state->wbuf, 1, NULL, state->flags, &state->overlapped, NULL);
} }
if (status && (WSA_IO_PENDING != WSAGetLastError())) { if (status && (WSA_IO_PENDING != WSAGetLastError())) {
janet_cancel(s->fiber, janet_cstringv("failed to write to stream")); janet_cancel(s->fiber, janet_ev_lasterr());
return JANET_ASYNC_STATUS_DONE; return JANET_ASYNC_STATUS_DONE;
} }
} else } else
@ -1471,7 +1471,7 @@ JanetAsyncStatus ev_machine_write(JanetListenerState *s, JanetAsyncEvent event)
{ {
status = WriteFile(s->stream->handle, bytes, len, NULL, &state->overlapped); status = WriteFile(s->stream->handle, bytes, len, NULL, &state->overlapped);
if (status && (ERROR_IO_PENDING != WSAGetLastError())) { if (status && (ERROR_IO_PENDING != WSAGetLastError())) {
janet_cancel(s->fiber, janet_cstringv("failed to write to stream")); janet_cancel(s->fiber, janet_ev_lasterr());
return JANET_ASYNC_STATUS_DONE; return JANET_ASYNC_STATUS_DONE;
} }
} }
@ -1688,7 +1688,6 @@ static Janet cfun_ev_pipe(int32_t argc, Janet *argv) {
* so we lift from the windows source code and modify for our own version. * so we lift from the windows source code and modify for our own version.
*/ */
JanetHandle rhandle, whandle; JanetHandle rhandle, whandle;
DWORD dwError;
UCHAR PipeNameBuffer[MAX_PATH]; UCHAR PipeNameBuffer[MAX_PATH];
sprintf(PipeNameBuffer, sprintf(PipeNameBuffer,
"\\\\.\\Pipe\\JanetExeAnon.%08x.%08x", "\\\\.\\Pipe\\JanetExeAnon.%08x.%08x",