aljaz/ttyd
1
1
Fork 0
mirror of https://github.com/tsl0922/ttyd.git synced 2025-12-23 04:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix for upgrade of libwebsockets 3.2.0, it removes the poll which breaks every second in the previous version.

Browse Source 
Reference:
[1] https://github.com/warmcat/libwebsockets/issues/1685
[2] https://libwebsockets.org/git/libwebsockets/tree/READMEs/README.lws_sul.md
This commit is contained in:
ideal
2019-09-14 18:06:18 +08:00
committed by Shuanglei Tao
parent 46064ee86e
commit 4ad0cc86b7
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/protocol.c
View File

@@ -161,10 +161,24 @@ cleanup:
pthread_mutex_destroy(&client->mutex); pthread_mutex_destroy(&client->mutex);
#if LWS_LIBRARY_VERSION_NUMBER >= 3002000
lws_sul_schedule(context, 0, &client->sul_stagger, NULL, LWS_SET_TIMER_USEC_CANCEL);
#endif
// remove from client list // remove from client list
tty_client_remove(client); tty_client_remove(client);
} }
#if LWS_LIBRARY_VERSION_NUMBER >= 3002000
void
stagger_callback(lws_sorted_usec_list_t *sul) {
struct tty_client *client = lws_container_of(sul, struct tty_client, sul_stagger);
lws_callback_on_writable(client->wsi);
lws_sul_schedule(context, 0, sul, stagger_callback, 10 * LWS_US_PER_MS);
}
#endif
void * void *
thread_run_command(void *args) { thread_run_command(void *args) {
struct tty_client *client = (struct tty_client *) args; struct tty_client *client = (struct tty_client *) args;
@@ -357,6 +371,10 @@ callback_tty(struct lws *wsi, enum lws_callback_reasons reason,
// check if there are more fragmented messages // check if there are more fragmented messages
if (lws_remaining_packet_payload(wsi) > 0 || !lws_is_final_fragment(wsi)) { if (lws_remaining_packet_payload(wsi) > 0 || !lws_is_final_fragment(wsi)) {
return 0; return 0;
} else {
#if LWS_LIBRARY_VERSION_NUMBER >= 3002000
lws_sul_schedule(context, 0, &client->sul_stagger, stagger_callback, 10);
#endif
} }
switch (command) { switch (command) {

7
src/server.c
View File

@@ -18,10 +18,6 @@
#define TTYD_VERSION "unknown" #define TTYD_VERSION "unknown"
#endif #endif
#if LWS_LIBRARY_VERSION_NUMBER == 3002000
#error "libwebsockets 3.2.0 is not compatible with ttyd."
#endif
volatile bool force_exit = false; volatile bool force_exit = false;
struct lws_context *context; struct lws_context *context;
struct tty_server *server; struct tty_server *server;
@@ -497,6 +493,9 @@ main(int argc, char **argv) {
} }
pthread_mutex_unlock(&server->mutex); pthread_mutex_unlock(&server->mutex);
lws_service(context, 10); lws_service(context, 10);
#if LWS_LIBRARY_VERSION_NUMBER >= 3002000
usleep(10 * LWS_US_PER_MS);
#endif
} }
lws_context_destroy(context); lws_context_destroy(context);

3
src/server.h
View File

@@ -36,6 +36,9 @@ struct tty_client {
int argc; int argc;
struct lws *wsi; struct lws *wsi;
#if LWS_LIBRARY_VERSION_NUMBER >= 3002000
lws_sorted_usec_list_t sul_stagger;
#endif
struct winsize size; struct winsize size;
char *buffer; char *buffer;
size_t len; size_t len;