timoreo/matrix-3ds-sdk
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

get sync loop wrapper to not crash

Browse source
This commit is contained in:
Sorunome 2019-10-17 20:31:00 +02:00
parent 2fab919532
commit 0abfac1ff4
No known key found for this signature in database
GPG key ID: 63E31F7B5993A9C4
1 changed files with 38 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
source/matrixclient.cpp
View file

@ -15,6 +15,14 @@
#define SOC_BUFFERSIZE 0x100000 #define SOC_BUFFERSIZE 0x100000
#define SYNC_TIMEOUT 10000 #define SYNC_TIMEOUT 10000
#define DEBUG 1
#if DEBUG
#define D
#else
#define D for(;0;)
#endif
namespace Matrix { namespace Matrix {
static u32 *SOC_buffer = NULL; static u32 *SOC_buffer = NULL;
@ -193,7 +201,7 @@ void Client::startSyncLoop() {
isSyncing = true; isSyncing = true;
stopSyncing = false; stopSyncing = false;
s32 prio = 0; s32 prio = 0;
printf("%lld\n", (u64)this); D printf("%lld\n", (u64)this);
svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); svcGetThreadPriority(&prio, CUR_THREAD_HANDLE);
syncThread = threadCreate(startSyncLoopWithoutClass, this, 8*1024, prio-1, -2, true); syncThread = threadCreate(startSyncLoopWithoutClass, this, 8*1024, prio-1, -2, true);
} }
@ -234,30 +242,29 @@ void Client::processSync(json_t* sync) {
if (joinedRooms) { if (joinedRooms) {
json_object_foreach(joinedRooms, roomId, room) { json_object_foreach(joinedRooms, roomId, room) {
// rooms that we are joined // rooms that we are joined
printf(roomId); D printf("%s:\n", roomId);
printf(":\n");
json_t* timeline = json_object_get(room, "timeline"); json_t* timeline = json_object_get(room, "timeline");
if (!timeline) { if (!timeline) {
printf("no timeline\n"); D printf("no timeline\n");
continue; continue;
} }
json_t* events = json_object_get(timeline, "events"); json_t* events = json_object_get(timeline, "events");
if (!events) { if (!events) {
printf("no events\n"); D printf("no events\n");
continue; continue;
} }
size_t index; size_t index;
json_t* event; json_t* event;
json_array_foreach(events, index, event) { json_array_foreach(events, index, event) {
json_t* eventType = json_object_get(event, "type"); json_t* eventType = json_object_get(event, "type");
printf(json_string_value(eventType)); D printf("%s\n", json_string_value(eventType));
printf("\n");
} }
} }
} }
} }
void Client::startSync() { void Client::startSync() {
while (true) {
std::string token = store->getSyncToken(); std::string token = store->getSyncToken();
if (stopSyncing) { if (stopSyncing) {
return; return;
@ -267,21 +274,21 @@ void Client::startSync() {
// set the token for the next batch // set the token for the next batch
json_t* token = json_object_get(ret, "next_batch"); json_t* token = json_object_get(ret, "next_batch");
if (token) { if (token) {
printf("Found next batch\n"); D printf("Found next batch\n");
store->setSyncToken(json_string_value(token)); store->setSyncToken(json_string_value(token));
} else { } else {
printf("No next batch\n"); D printf("No next batch\n");
store->setSyncToken(""); store->setSyncToken("");
} }
processSync(ret); processSync(ret);
json_decref(ret); json_decref(ret);
} }
svcSleepThread((u64)1000000ULL * (u64)200); svcSleepThread((u64)1000000ULL * (u64)200);
startSync(); }
} }
json_t* Client::doSync(std::string token) { json_t* Client::doSync(std::string token) {
printf("Doing sync with token %s\n", token.c_str()); D printf("Doing sync with token %s\n", token.c_str());
std::string query = "?full_state=false&timeout=" + std::to_string(SYNC_TIMEOUT); std::string query = "?full_state=false&timeout=" + std::to_string(SYNC_TIMEOUT);
if (token != "") { if (token != "") {
@ -299,7 +306,7 @@ json_t* Client::doRequest(const char* method, std::string path, json_t* body) {
std::string url = hsUrl + path; std::string url = hsUrl + path;
requestId++; requestId++;
printf("Opening Request\n%s\n", url.c_str()); D printf("Opening Request %d\n%s\n", requestId, url.c_str());
if (!SOC_buffer) { if (!SOC_buffer) {
SOC_buffer = (u32*)memalign(0x1000, 0x100000); SOC_buffer = (u32*)memalign(0x1000, 0x100000);
@ -314,7 +321,7 @@ json_t* Client::doRequest(const char* method, std::string path, json_t* body) {
CURL* curl = curl_easy_init(); CURL* curl = curl_easy_init();
CURLcode res; CURLcode res;
if (!curl) { if (!curl) {
printf("curl init failed\n"); D printf("curl init failed\n");
return NULL; return NULL;
} }
std::string readBuffer; std::string readBuffer;
@ -346,15 +353,15 @@ json_t* Client::doRequest(const char* method, std::string path, json_t* body) {
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
if (res != CURLE_OK) { if (res != CURLE_OK) {
printf("curl res not ok %d\n", res); D printf("curl res not ok %d\n", res);
return NULL; return NULL;
} }
printf("%s\n", readBuffer.c_str()); // D printf("%s\n", readBuffer.c_str());
json_error_t error; json_error_t error;
json_t* content = json_loads(readBuffer.c_str(), 0, &error); json_t* content = json_loads(readBuffer.c_str(), 0, &error);
if (!content) { if (!content) {
printf("Failed to parse json\n"); D printf("Failed to parse json\n");
return NULL; return NULL;
} }
return content; return content;