ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-08 04:10:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

resource_yield test: fix race condition

Browse Source
This commit is contained in:
Norman Feske 2014-07-02 10:33:47 +02:00
parent 6de13fd71c
commit db45a0d10d
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
repos/os/src/test/resource_yield/main.cc
View File

@ -247,8 +247,7 @@ class Parent : Genode::Slave_policy
Parent() Parent()
: :
Genode::Slave_policy("test-resource_yield", _entrypoint(), Genode::Slave_policy("test-resource_yield", _entrypoint(),
Genode::env()->ram_session()), Genode::env()->ram_session())
_yield_blockade(Genode::Lock::LOCKED)
{ {
configure("<config child=\"yes\" />"); configure("<config child=\"yes\" />");
} }
@ -268,6 +267,18 @@ class Parent : Genode::Slave_policy
void yield_response() void yield_response()
{ {
_yield_blockade.unlock(); _yield_blockade.unlock();
/*
* At this point, the ownership of '_yield_blockade' will be passed
* to the main program. By trying to aquire it here, we block until
* the main program is ready.
*
* This way, we ensure that the main program validates the
* statistics before the 'yield_response' RPC call returns.
* Otherwise, the child might allocate new resources before the
* main program is able to see the amount of yielded resources.
*/
Genode::Lock::Guard guard(_yield_blockade);
} }
}; };
@ -311,6 +322,7 @@ int Parent::main()
*/ */
PLOG("wait for yield response"); PLOG("wait for yield response");
_yield_blockade.lock(); _yield_blockade.lock();
_yield_blockade.lock();
PLOG("got yield response"); PLOG("got yield response");
_print_status(); _print_status();
@ -321,6 +333,9 @@ int Parent::main()
PERR("child has not yielded enough resources"); PERR("child has not yielded enough resources");
return -1; return -1;
} }
/* let the 'yield_response' RPC call return */
_yield_blockade.unlock();
} }
printf("--- test-resource_yield finished ---\n"); printf("--- test-resource_yield finished ---\n");