~vorlon/ubuntu/raring/upstart/lp.1199778

« back to all changes in this revision

Viewing changes to init/state.h

Committer: Steve Langasek
Date: 2012-12-14 20:55:41 UTC
mfrom: (1182.58.1 upstart)
mto: (1182.58.7 upstart)
mto: This revision was merged to the branch mainline in revision 1427.
Revision ID: steve.langasek@canonical.com-20121214205541-b48yqd4aarbnut6m

Sync up with trunk

files added:
init/tests/data

init/tests/data/upstart-1.6.json

files modified:
ChangeLog

NEWS

dbus/com.ubuntu.Upstart.xml

init/Makefile.am

init/control.c

init/control.h

init/job_class.c

init/job_process.c

init/job_process.h

init/log.c

init/man/init.5

init/session.h

init/state.c

init/state.h

init/tests/test_job_process.c

init/tests/test_state.c

po/upstart.pot

scripts/initctl2dot.py

util/Makefile.am

util/man/telinit.8

util/telinit.c

Show diffs side-by-side

added added

removed removed

init/state.h

367

#define STATE_WAIT_SECS_ENV "UPSTART_STATE_WAIT_SECS"

368

369

/**

370

* STATE_FILE:

371

372

* Name of file that is written below the job log directory if the

373

* newly re-exec'ed init instance failed to understand the JSON sent to

374

* it by the old instance.

375

376

* This could happen for example if the old instance generated invalid

377

* JSON, or JSON in an unexected format.

378

**/

379

#define STATE_FILE "upstart.state"

380

381

/**

370

382

* state_get_timeout:

371

383

372

384

* @var: name of long integer var to set to timeout value.

Older »