lp:~jamesodhunt/upstart/serialise-remaining-objects

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1479

James Hunt: Needs Resubmitting on 2013-05-29

Steve Langasek: Needs Fixing on 2013-05-28

Diff: 58491 lines (+56824/-375)

26 files modified

ChangeLog (+274/-0)
init/Makefile.am (+1/-1)
init/conf.c (+651/-11)
init/conf.h (+57/-1)
init/control.h (+25/-25)
init/event.c (+14/-4)
init/event_operator.c (+311/-3)
init/event_operator.h (+26/-1)
init/job.c (+56/-46)
init/job.h (+2/-2)
init/job_class.c (+288/-131)
init/job_class.h (+9/-3)
init/main.c (+4/-0)
init/paths.h (+9/-0)
init/state.c (+87/-30)
init/state.h (+5/-8)
init/tests/data/upstart-1.8+apparmor.json (+7962/-0)
init/tests/data/upstart-1.8+full_serialisation+apparmor.json (+18886/-0)
init/tests/data/upstart-1.8+full_serialisation-apparmor.json (+18201/-0)
init/tests/data/upstart-1.8.json (+8651/-0)
init/tests/test_conf.c (+306/-3)
init/tests/test_event_operator.c (+25/-5)
init/tests/test_job.c (+31/-10)
init/tests/test_state.c (+845/-90)
init/tests/test_util.c (+85/-0)
init/tests/test_util.h (+13/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1489. By James Hunt on 2013-06-05

* Sync with lp:upstart.

1488. By James Hunt on 2013-06-05

* init/state.c: state_from_string(): Check if ConfSources
  exist in the serialisation data to allow distinction between
  ConfSources not present and failing to deserialise them.

1487. By James Hunt on 2013-06-05

* init/tests/data/upstart-1.8+full_serialisation+apparmor.json: New test
  data file.
* init/tests/test_state.c:
  - test_upstart_full_serialise_with_apparmor_upgrade(): New test to ensure
    Upstart can parse the current 1.8 format JSON with the addition of the full
    serialisation data (EventOperator, etc), and the AppArmor serialisation.

1486. By James Hunt on 2013-06-05

* init/tests/data/upstart-1.8+apparmor.json: New test data file.
* init/tests/test_state.c:
  - test_upgrade(): Re-initialise lists and hashes as a convenience to
    the tests.
  - test_upstart_with_apparmor_upgrade(): New test to ensure Upstart can
    parse the current 1.8 format JSON with the addition of the AppArmor
    serialisation (but crucially *without* the full serialisation data
    (EventOperator, etc).
  - test_upstart_full_serialise_without_apparmor_upgrade(): New test to
    ensure Upstart can parse the current 1.8 format JSON with the
    addition of the full serialisation data (EventOperator, etc),
    but _without_ the AppArmor serialisation.

1485. By James Hunt on 2013-06-04

* init/event.c: event_deserialise(): Revert to checking JSON for
  blockers to avoid reliance on JSON serialisation data format version.
* init/event_operator.h: Fix misplacement of NIH_END_EXTERN.
* init/state.c: Remove serialisation version code since the autoconf
  approach of detecting the format of the JSON is safer.
* init/state.h: Remove STATE_VERSION.

1484. By James Hunt on 2013-05-29

* Sync with lp:upstart.
* init/tests/test_state.c: test_upstart_pre_security_upgrade(): Tweaks
  to work with new TestDataFile structure and requirement that no
  conf_sources exist just prior to deserialisation.

1483. By James Hunt on 2013-05-13

* init/state.c: stateful_reexec(): Specify all values for array
  initialiser.

1482. By James Hunt on 2013-05-10

Revert to not supporting deserialisation of JobClasses with associated
user/chroot sessions to avoid behavioural change for now.

* init/job_class.c:
  - job_class_deserialise(): Revert to failing if associated session is
    non-NULL.
  - job_class_deserialise_all(): Revert to ignoring failure to
    deserialise a JobClass iff it has a non-NULL associated session.
* init/state.c:
  - state_to_string(): Provide some diagnostics if serialisation fails.
  - state_from_string(): Provide some diagnostics if deserialisation fails.
  - state_deserialise_resolve_deps(): Ignore failure to lookup JobClass
    iff it has an associated user/chroot session.
  - state_deserialise_blocking(): Revert to ignoring failure to
    deserialise a Blocked object that is associated with a Job whose
    JobClass has a non-NULL session.
* init/tests/test_state.c: test_blocking(): Revert test to assert that
  blocked job with non-NULL session is ignored.

1481. By James Hunt on 2013-05-09

* Merge of lp:upstart.

1480. By James Hunt on 2013-05-09

* init/job.c: job_serialise(): Corrected logic for handling 'stop on'
  condition.
* init/job_class.c: job_class_deserialise(): Only check type after JSON
  queried (thanks Coverity).