MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated websocket.c to notify once per event cycle

This commit is contained in:
Justin Wong 2020-04-12 15:58:37 +08:00
parent 3994ef0f2e
commit c0b3782578
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/websocket.c
View File

@ -46,6 +46,8 @@ static bool ws_exit = false;
static short events; static short events;
// Event mask of events processed by the writeable callback // Event mask of events processed by the writeable callback
static short write_events; static short write_events;
// Counter for events to keep track of when to write
static unsigned short write_events_counter;
@ -77,6 +79,7 @@ callback_http(struct lws *wsi, enum lws_callback_reasons reason, void *user, voi
struct ws_session_data_notify struct ws_session_data_notify
{ {
short events; short events;
unsigned short counter; // to keep track of whether this user has already written
}; };
/* /*
@ -263,6 +266,7 @@ callback_notify(struct lws *wsi, enum lws_callback_reasons reason, void *user, v
case LWS_CALLBACK_ESTABLISHED: case LWS_CALLBACK_ESTABLISHED:
// Initialize session data for new connections // Initialize session data for new connections
memset(session_data, 0, sizeof(struct ws_session_data_notify)); memset(session_data, 0, sizeof(struct ws_session_data_notify));
session_data->counter = write_events_counter;
break; break;
case LWS_CALLBACK_RECEIVE: case LWS_CALLBACK_RECEIVE:
@ -270,9 +274,10 @@ callback_notify(struct lws *wsi, enum lws_callback_reasons reason, void *user, v
break; break;
case LWS_CALLBACK_SERVER_WRITEABLE: case LWS_CALLBACK_SERVER_WRITEABLE:
if (write_events) if (write_events && (write_events_counter != session_data->counter))
{ {
send_notify_reply(write_events, wsi); send_notify_reply(write_events, wsi);
session_data->counter = write_events_counter;
} }
break; break;
@ -324,6 +329,7 @@ websocket(void *arg)
if (events) if (events)
{ {
write_events = events; write_events = events;
write_events_counter++;
events = 0; events = 0;
lws_callback_on_writable_all_protocol(context, &protocols[WS_PROTOCOL_NOTIFY]); lws_callback_on_writable_all_protocol(context, &protocols[WS_PROTOCOL_NOTIFY]);
} }
@ -398,7 +404,7 @@ websocket_init(void)
return -1; return -1;
} }
write_events_counter = 0;
ret = pthread_create(&tid_websocket, NULL, websocket, NULL); ret = pthread_create(&tid_websocket, NULL, websocket, NULL);
if (ret < 0) if (ret < 0)
{ {