945
|
|
* init/job_class.c (job_class_consider, job_class_reconsider): Separate out the actual meat of the functions, since it's largely duplicated between the two. This makes the difference between the two functions clearer, consider always stages an election no matter which is registered, reconsider only stages an election if the current class is registered. (job_class_select, job_class_remove): Functions containing the common code, which now also handle registering and unregistering the class with D-Bus. Here is the right place, not in new, since we only export the current best class of a given name. (job_class_register, job_class_unregister): Function to register a job and its instances, and to unregister a job (we assert that there must be no instances for us to do this). * init/job_class.h: Add prototypes. * init/tests/test_job_class.c (test_consider, test_reconsider): Check that D-Bus registration and unregistration happens as expected. (test_register, test_unregister): test on their own. * init/job.c (job_new): Register instances with D-Bus, since instances can only ever exist for active classes, all instances are always registered on the bus. (job_register): Function to register an instance on the bus. * init/job.h: Add prototype. * init/tests/test_job.c (test_new): Test creating a job with an active d-bus connection, which should have it registered. (test_register): Test registration on its own. * init/control.c (control_register_all): Make this always succeed, and register existing jobs on the new connection. (control_server_connect, control_bus_open): registration is always successful. * init/tests/test_control.c (test_server_connect, test_bus_open): Test with existing jobs when we get a connection or create the bus connection, ensure that the jobs and instances are registered.
|
Scott James Remnant |
16 years ago
|
|
|
944
|
|
|
Scott James Remnant |
16 years ago
|
|
|
943
|
|
* init/control.c (control_server_open, control_server_close) (control_server_connect): Create and manage a listening d-bus server that is used for private direct connections to Upstart for when the d-bus daemon is not available. Each new connection has the same objects as the d-bus system bus, they only differ in their method. (control_conns, control_init): Cache the open connections, including the bus daemon and any private connections; we'll iterate this list when sending signals. (control_bus_open): Store connection in the list, don't worry about setting close-on-exec, we check that by test case and rely on d-bus to do it. (control_bus_disconnected): Rename to control_disconnected (control_disconnected): Work for system bus and private connections, remove from the connections list. * init/control.h: Add prototypes, remove global definition of bus name to just being private again. * init/tests/test_control.c (test_server_open, test_server_close) (test_server_connect): Test the new functions. (test_bus_open): add check for list entry (test_bus_disconnected): rename to test_disconnected * init/main.c: Open the listening server, warning if we're unable to do so (but we won't treat it as a hard error since there's the d-bus daemon as the default anyway). * init/init.supp: suppress the fact that the control connections list stays around.
|
Scott James Remnant |
16 years ago
|
|
|
942
|
|
|
Scott James Remnant |
16 years ago
|
|
|
941
|
|
|
Scott James Remnant |
16 years ago
|
|
|
940
|
|
|
Scott James Remnant |
16 years ago
|
|
|
939
|
|
|
Scott James Remnant |
16 years ago
|
|
|
938
|
|
|
Scott James Remnant |
16 years ago
|
|
|
937
|
|
|
Scott James Remnant |
16 years ago
|
|
|
936
|
|
|
Scott James Remnant |
16 years ago
|
|
|
935
|
|
|
Scott James Remnant |
16 years ago
|
|
|
934
|
|
|
Scott James Remnant |
16 years ago
|
|
|
933
|
|
|
Scott James Remnant |
16 years ago
|
|
|
932
|
|
|
Scott James Remnant |
16 years ago
|
|
|
931
|
|
|
Scott James Remnant |
16 years ago
|
|
|
930
|
|
|
Scott James Remnant |
16 years ago
|
|
|
929
|
|
|
Scott James Remnant |
16 years ago
|
|
|
928
|
|
|
Scott James Remnant |
16 years ago
|
|
|
927
|
|
|
Scott James Remnant |
16 years ago
|
|
|
926
|
|
|
Scott James Remnant |
16 years ago
|
|
|