wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 782614 - Don't return nsresult from main() (xpcom/); r=bsmedberg

Browse Source
This commit is contained in:
Aryeh Gregor 2012-08-07 20:17:27 +03:00
parent 11091e0a72
commit 5ea6a83221
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
xpcom/tests/TestDeadlockDetector.cpp
View File

@ -257,13 +257,13 @@ CheckForDeadlock(const char* test, const char* const* findTokens)
// Single-threaded sanity tests
// Stupidest possible deadlock.
nsresult
int
Sanity_Child()
{
mozilla::Mutex m1("dd.sanity.m1");
m1.Lock();
m1.Lock();
return NS_OK; // not reached
return 0; // not reached
}
nsresult
@ -285,7 +285,7 @@ Sanity()
}
// Slightly less stupid deadlock.
nsresult
int
Sanity2_Child()
{
mozilla::Mutex m1("dd.sanity2.m1");
@ -293,7 +293,7 @@ Sanity2_Child()
m1.Lock();
m2.Lock();
m1.Lock();
return NS_OK; // not reached
return 0; // not reached
}
nsresult
@ -316,7 +316,7 @@ Sanity2()
}
nsresult
int
Sanity3_Child()
{
mozilla::Mutex m1("dd.sanity3.m1");
@ -335,7 +335,7 @@ Sanity3_Child()
m4.Lock();
m1.Lock();
return NS_OK;
return 0;
}
nsresult
@ -359,7 +359,7 @@ Sanity3()
}
nsresult
int
Sanity4_Child()
{
mozilla::ReentrantMonitor m1("dd.sanity4.m1");
@ -367,7 +367,7 @@ Sanity4_Child()
m1.Enter();
m2.Lock();
m1.Enter();
return NS_OK;
return 0;
}
nsresult
@ -413,7 +413,7 @@ TwoThreads_thread(void* arg)
}
}
nsresult
int
TwoThreads_Child()
{
ttM1 = new mozilla::Mutex("dd.twothreads.m1");
@ -427,7 +427,7 @@ TwoThreads_Child()
PRThread* t2 = spawn(TwoThreads_thread, (void*) 1);
PR_JoinThread(t2);
return NS_OK;
return 0;
}
nsresult
@ -469,7 +469,7 @@ ContentionNoDeadlock_thread(void* arg)
}
}
nsresult
int
ContentionNoDeadlock_Child()
{
PRThread* threads[3];
@ -486,7 +486,7 @@ ContentionNoDeadlock_Child()
for (PRUint32 i = 0; i < ArrayLength(cndMs); ++i)
delete cndMs[i];
return NS_OK;
return 0;
}
nsresult
@ -538,7 +538,8 @@ main(int argc, char** argv)
if (!strcmp("ContentionNoDeadlock", test))
return ContentionNoDeadlock_Child();
FAIL("unknown child test");
fail("%s | %s - unknown child test", __FILE__, __FUNCTION__);
return 2;
}
ScopedXPCOM xpcom("XPCOM deadlock detector correctness (" __FILE__ ")");