X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvserver%2Fcvirt_def.h;h=23aa246f51299f590d5209db82720ac8675204ea;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=bf4bd848ad08451bc4a87d661496a9ac2190cfbf;hpb=ae17e7656036804d46ec431260821023d4c8cb83;p=linux-2.6.git diff --git a/include/linux/vserver/cvirt_def.h b/include/linux/vserver/cvirt_def.h index bf4bd848a..23aa246f5 100644 --- a/include/linux/vserver/cvirt_def.h +++ b/include/linux/vserver/cvirt_def.h @@ -4,6 +4,7 @@ #include #include #include +#include #include #include @@ -18,6 +19,19 @@ struct _vx_usage_stat { uint64_t iowait; }; +struct _vx_syslog { + wait_queue_head_t log_wait; + spinlock_t logbuf_lock; /* lock for the log buffer */ + + unsigned long log_start; /* next char to be read by syslog() */ + unsigned long con_start; /* next char to be sent to consoles */ + unsigned long log_end; /* most-recently-written-char + 1 */ + unsigned long logged_chars; /* #chars since last read+clear operation */ + + char log_buf[1024]; +}; + + /* context sub struct */ struct _vx_cvirt { @@ -40,7 +54,11 @@ struct _vx_cvirt { uint32_t load_last; /* last time load was cacled */ uint32_t load[3]; /* load averages 1,5,15 */ + atomic_t total_forks; /* number of forks so far */ + struct _vx_usage_stat cpustat[NR_CPUS]; + + struct _vx_syslog syslog; }; struct _vx_sock_acc {