turn negative options into positive options

[elogind.git] / src / execute.h

diff --git a/src/execute.h b/src/execute.h
index e6180494977311f8a56f624083bbb97ac5ac2be3..2e0e6cca3c7bc7f983f5d59cc8e83ea2b05bb1fc 100644 (file)
--- a/src/execute.h
+++ b/src/execute.h
@@ -67,8 +67,8 @@ typedef enum ExecOutput {
 } ExecOutput;
 
 struct ExecStatus {
 } ExecOutput;
 
 struct ExecStatus {

-        usec_t start_timestamp;
-        usec_t exit_timestamp;
+        dual_timestamp start_timestamp;
+        dual_timestamp exit_timestamp;

         pid_t pid;
         int code;     /* as in siginfo_t::si_code */
         int status;   /* as in sigingo_t::si_status */
         pid_t pid;
         int code;     /* as in siginfo_t::si_code */
         int status;   /* as in sigingo_t::si_status */


@@ -93,8 +93,9 @@ struct ExecContext {
         int cpu_sched_policy;
         int cpu_sched_priority;
 
         int cpu_sched_policy;
         int cpu_sched_priority;
 

-        cpu_set_t cpu_affinity;
-        unsigned long timer_slack_ns;
+        cpu_set_t *cpuset;
+        unsigned cpuset_ncpus;
+        unsigned long timer_slack_nsec;

 
         ExecInput std_input;
         ExecOutput std_output;
 
         ExecInput std_input;
         ExecOutput std_output;


@@ -102,7 +103,7 @@ struct ExecContext {
 
         int syslog_priority;
         char *syslog_identifier;
 
         int syslog_priority;
         char *syslog_identifier;

-        bool syslog_no_prefix;
+        bool syslog_level_prefix;

 
         char *tcpwrap_name;
 
 
         char *tcpwrap_name;
 


@@ -134,15 +135,14 @@ struct ExecContext {
         bool nice_set:1;
         bool ioprio_set:1;
         bool cpu_sched_set:1;
         bool nice_set:1;
         bool ioprio_set:1;
         bool cpu_sched_set:1;

-        bool cpu_affinity_set:1;
-        bool timer_slack_ns_set:1;
+        bool timer_slack_nsec_set:1;

 
         /* This is not exposed to the user but available
          * internally. We need it to make sure that whenever we spawn
          * /bin/mount it is run in the same process group as us so
          * that the autofs logic detects that it belongs to us and we
          * don't enter a trigger loop. */
 
         /* This is not exposed to the user but available
          * internally. We need it to make sure that whenever we spawn
          * /bin/mount it is run in the same process group as us so
          * that the autofs logic detects that it belongs to us and we
          * don't enter a trigger loop. */

-        bool no_setsid:1;
+        bool same_pgrp;

 };
 
 typedef enum ExitStatus {
 };
 
 typedef enum ExitStatus {


@@ -217,7 +217,8 @@ void exec_context_init(ExecContext *c);
 void exec_context_done(ExecContext *c);
 void exec_context_dump(ExecContext *c, FILE* f, const char *prefix);
 
 void exec_context_done(ExecContext *c);
 void exec_context_dump(ExecContext *c, FILE* f, const char *prefix);
 

-void exec_status_fill(ExecStatus *s, pid_t pid, int code, int status);
+void exec_status_start(ExecStatus *s, pid_t pid);
+void exec_status_exit(ExecStatus *s, pid_t pid, int code, int status);

 void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix);
 
 const char* exec_output_to_string(ExecOutput i);
 void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix);
 
 const char* exec_output_to_string(ExecOutput i);