Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

WebSocketServer: Tiny code cleanup

Browse Source
This commit is contained in:
tt2468 2021-12-10 22:33:52 -08:00
parent 43e2860709
commit 5ac813b897
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/websocketserver/WebSocketServer_RequestBatchProcessing.cpp
View File

@ -156,13 +156,12 @@ static void ObsTickCallback(void *param, float)
serialFrameBatch->frameCount++; serialFrameBatch->frameCount++;
if (serialFrameBatch->sleepUntilFrame) { if (serialFrameBatch->sleepUntilFrame) {
if (serialFrameBatch->frameCount < serialFrameBatch->sleepUntilFrame) { if (serialFrameBatch->frameCount < serialFrameBatch->sleepUntilFrame)
// Do not process any requests if in "sleep mode" // Do not process any requests if in "sleep mode"
return; return;
} else { else
// Reset frame sleep until counter if not being used // Reset frame sleep until counter if not being used
serialFrameBatch->sleepUntilFrame = 0; serialFrameBatch->sleepUntilFrame = 0;
}
} }
// Begin recursing any unprocessed requests // Begin recursing any unprocessed requests
@ -194,9 +193,8 @@ static void ObsTickCallback(void *param, float)
} }
// If request queue is empty, we can notify the paused worker thread // If request queue is empty, we can notify the paused worker thread
if (serialFrameBatch->requests.empty()) { if (serialFrameBatch->requests.empty())
serialFrameBatch->condition.notify_one(); serialFrameBatch->condition.notify_one();
}
} }
void WebSocketServer::ProcessRequestBatch(SessionPtr session, RequestBatchExecutionType::RequestBatchExecutionType executionType, const std::vector<json> &requests, std::vector<json> &results, json &variables, bool haltOnFailure) void WebSocketServer::ProcessRequestBatch(SessionPtr session, RequestBatchExecutionType::RequestBatchExecutionType executionType, const std::vector<json> &requests, std::vector<json> &results, json &variables, bool haltOnFailure)