From 35a49a5d2d7e73d7fd0175e2e141d8d971cca4a7 Mon Sep 17 00:00:00 2001 From: Tim Lander Date: Thu, 16 May 2019 15:14:31 +0800 Subject: [PATCH 1/4] Reverse assertion so it actually checks the right thing --- tests/pthread/call_sync_on_main_thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pthread/call_sync_on_main_thread.c b/tests/pthread/call_sync_on_main_thread.c index 42c2de73b957a..876d90f385961 100644 --- a/tests/pthread/call_sync_on_main_thread.c +++ b/tests/pthread/call_sync_on_main_thread.c @@ -27,7 +27,7 @@ int main() int inWorker2 = isThisInWorkerOnMainThread(); // This should always return 0 int returnedInt = receivesAndReturnsAnInteger(4); printf("text: \"%s\". inWorker1: %d, inWorker2: %d, returnedInt: %d\n", dst, inWorker1, inWorker2, returnedInt); - assert(!strstr(dst, "Resize canvas")); + assert(strstr(dst, "Resize canvas")); assert(inWorker1 == PROXY_TO_PTHREAD); assert(inWorker2 == 0); assert(returnedInt == 42 + 4); From e7bb3df19fa3bf6199076c98ce0076d9e1bc02bf Mon Sep 17 00:00:00 2001 From: Tim Lander Date: Thu, 16 May 2019 15:16:27 +0800 Subject: [PATCH 2/4] Change the checked text to actually be something --- tests/pthread/call_sync_on_main_thread.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pthread/call_sync_on_main_thread.js b/tests/pthread/call_sync_on_main_thread.js index 07da3cc62afbf..747109424d727 100644 --- a/tests/pthread/call_sync_on_main_thread.js +++ b/tests/pthread/call_sync_on_main_thread.js @@ -6,7 +6,7 @@ mergeInto(LibraryManager.library, { getDomElementInnerHTML__sig: 'viii', getDomElementInnerHTML: function(domElementId, dst, size) { var id = UTF8ToString(domElementId); - var text = document.getElementById(id).innerHTML; + var text = document.getElementById(id).parentElement.innerHTML; stringToUTF8(text, dst, size); }, From 549f2215c2ff348ade5ee2511eba6abbeb249651 Mon Sep 17 00:00:00 2001 From: Tim Lander Date: Fri, 17 May 2019 09:34:39 +0800 Subject: [PATCH 3/4] Rename getDomElementInnerHTML -> getDomElementParentInnerHTML --- tests/pthread/call_sync_on_main_thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pthread/call_sync_on_main_thread.c b/tests/pthread/call_sync_on_main_thread.c index 876d90f385961..8add11bdd4a93 100644 --- a/tests/pthread/call_sync_on_main_thread.c +++ b/tests/pthread/call_sync_on_main_thread.c @@ -9,7 +9,7 @@ #include #include -extern void getDomElementInnerHTML(const char *domElement, char *dst, int size); +extern void getDomElementParentInnerHTML(const char *domElement, char *dst, int size); extern int isThisInWorker(void); extern int isThisInWorkerOnMainThread(void); extern int receivesAndReturnsAnInteger(int i); @@ -21,7 +21,7 @@ int main() { char dst[256]; char name[7] = "resize"; - getDomElementInnerHTML(name, dst, sizeof(dst)); + getDomElementParentInnerHTML(name, dst, sizeof(dst)); memset(name, 0, sizeof(name)); // Try to uncover if there might be a race condition and above line was not synchronously processed, and we could take name string away. int inWorker1 = isThisInWorker(); // Build this application with -s USE_PTHREADS=1 -s PROXY_TO_PTHREAD=1 for this to return 1, otherwise returns 0. int inWorker2 = isThisInWorkerOnMainThread(); // This should always return 0 From 48f756f4ae49b18a831b23d15dd4ed3fa4c16ff3 Mon Sep 17 00:00:00 2001 From: Tim Lander Date: Fri, 17 May 2019 09:35:42 +0800 Subject: [PATCH 4/4] Rename getDomElementInnerHTML -> getDomElementParentInnerHTML --- tests/pthread/call_sync_on_main_thread.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/pthread/call_sync_on_main_thread.js b/tests/pthread/call_sync_on_main_thread.js index 747109424d727..066a491367681 100644 --- a/tests/pthread/call_sync_on_main_thread.js +++ b/tests/pthread/call_sync_on_main_thread.js @@ -2,9 +2,9 @@ mergeInto(LibraryManager.library, { // Test accessing a DOM element on the main thread. // This function returns the inner text of the div by ID "status" // Because it accesses the DOM, it must be called on the main thread. - getDomElementInnerHTML__proxy: 'sync', - getDomElementInnerHTML__sig: 'viii', - getDomElementInnerHTML: function(domElementId, dst, size) { + getDomElementParentInnerHTML__proxy: 'sync', + getDomElementParentInnerHTML__sig: 'viii', + getDomElementParentInnerHTML: function(domElementId, dst, size) { var id = UTF8ToString(domElementId); var text = document.getElementById(id).parentElement.innerHTML; stringToUTF8(text, dst, size);