[PATCH] moving task_struct

[PATCH] moving task_struct

[Roman Zippel]

Hi,

The patch below simply moves task_struct into its own header file.
This makes thread_info and task_struct indepedent from sched.h and will 
allows archs to decide themselves the dependencies between these
structures.

bye, Roman

diff -Nur -X /opt/home/roman/nodiff linux-2.5.6-pre2/include/linux/sched.h linux-task_struct/include/linux/sched.h
--- linux-2.5.6-pre2/include/linux/sched.h	Fri Mar  1 19:59:34 2002
+++ linux-task_struct/include/linux/sched.h	Fri Mar  1 20:10:21 2002
@@ -1,17 +1,13 @@
 #ifndef _LINUX_SCHED_H
 #define _LINUX_SCHED_H
 
-#include <asm/param.h>	/* for HZ */
-
 extern unsigned long event;
 
 #include <linux/config.h>
-#include <linux/capability.h>
+#include <linux/task_struct.h>
 #include <linux/tqueue.h>
 #include <linux/threads.h>
 #include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/times.h>
 #include <linux/timex.h>
 #include <linux/rbtree.h>
 #include <linux/thread_info.h>
@@ -24,7 +20,6 @@
 
 #include <linux/smp.h>
 #include <linux/sem.h>
-#include <linux/signal.h>
 #include <linux/securebits.h>
 #include <linux/fs_struct.h>
 #include <linux/compiler.h>
@@ -139,8 +134,6 @@
 extern rwlock_t tasklist_lock;
 extern spinlock_t mmlist_lock;
 
-typedef struct task_struct task_t;
-
 extern void sched_init(void);
 extern void init_idle(task_t *idle, int cpu);
 extern void show_state(void);
@@ -227,129 +220,6 @@
 
 extern struct user_struct root_user;
 #define INIT_USER (&root_user)
-
-typedef struct prio_array prio_array_t;
-
-struct task_struct {
-	volatile long state;	/* -1 unrunnable, 0 runnable, >0 stopped */
-	struct thread_info *thread_info;
-	atomic_t usage;
-	unsigned long flags;	/* per process flags, defined below */
-	unsigned long ptrace;
-
-	int lock_depth;		/* Lock depth */
-
-	int prio, static_prio;
-	list_t run_list;
-	prio_array_t *array;
-
-	unsigned long sleep_avg;
-	unsigned long sleep_timestamp;
-
-	unsigned long policy;
-	unsigned long cpus_allowed;
-	unsigned int time_slice;
-
-	struct task_struct *next_task, *prev_task;
-
-	struct mm_struct *mm, *active_mm;
-	struct list_head local_pages;
-
-	unsigned int allocation_order, nr_local_pages;
-
-/* task state */
-	struct linux_binfmt *binfmt;
-	int exit_code, exit_signal;
-	int pdeath_signal;  /*  The signal sent when the parent dies  */
-	/* ??? */
-	unsigned long personality;
-	int did_exec:1;
-	pid_t pid;
-	pid_t pgrp;
-	pid_t tty_old_pgrp;
-	pid_t session;
-	pid_t tgid;
-	/* boolean value for session group leader */
-	int leader;
-	/* 
-	 * pointers to (original) parent process, youngest child, younger sibling,
-	 * older sibling, respectively.  (p->father can be replaced with 
-	 * p->p_pptr->pid)
-	 */
-	struct task_struct *p_opptr, *p_pptr, *p_cptr, *p_ysptr, *p_osptr;
-	struct list_head thread_group;
-
-	/* PID hash table linkage. */
-	struct task_struct *pidhash_next;
-	struct task_struct **pidhash_pprev;
-
-	wait_queue_head_t wait_chldexit;	/* for wait4() */
-	struct completion *vfork_done;		/* for vfork() */
-
-	unsigned long rt_priority;
-	unsigned long it_real_value, it_prof_value, it_virt_value;
-	unsigned long it_real_incr, it_prof_incr, it_virt_incr;
-	struct timer_list real_timer;
-	struct tms times;
-	unsigned long start_time;
-	long per_cpu_utime[NR_CPUS], per_cpu_stime[NR_CPUS];
-/* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */
-	unsigned long min_flt, maj_flt, nswap, cmin_flt, cmaj_flt, cnswap;
-	int swappable:1;
-/* process credentials */
-	uid_t uid,euid,suid,fsuid;
-	gid_t gid,egid,sgid,fsgid;
-	int ngroups;
-	gid_t	groups[NGROUPS];
-	kernel_cap_t   cap_effective, cap_inheritable, cap_permitted;
-	int keep_capabilities:1;
-	struct user_struct *user;
-/* limits */
-	struct rlimit rlim[RLIM_NLIMITS];
-	unsigned short used_math;
-	char comm[16];
-/* file system info */
-	int link_count, total_link_count;
-	struct tty_struct *tty; /* NULL if no tty */
-	unsigned int locks; /* How many file locks are being held */
-/* ipc stuff */
-	struct sem_undo *semundo;
-	struct sem_queue *semsleeping;
-/* CPU-specific state of this task */
-	struct thread_struct thread;
-/* filesystem information */
-	struct fs_struct *fs;
-/* open file information */
-	struct files_struct *files;
-/* namespace */
-	struct namespace *namespace;
-/* signal handlers */
-	spinlock_t sigmask_lock;	/* Protects signal and blocked */
-	struct signal_struct *sig;
-
-	sigset_t blocked;
-	struct sigpending pending;
-
-	unsigned long sas_ss_sp;
-	size_t sas_ss_size;
-	int (*notifier)(void *priv);
-	void *notifier_data;
-	sigset_t *notifier_mask;
-	
-/* Thread group tracking */
-   	u32 parent_exec_id;
-   	u32 self_exec_id;
-/* Protection of (de-)allocation: mm, files, fs, tty */
-	spinlock_t alloc_lock;
-
-/* journalling filesystem info */
-	void *journal_info;
-};
-
-extern void __put_task_struct(struct task_struct *tsk);
-#define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
-#define put_task_struct(tsk) \
-do { if (atomic_dec_and_test(&(tsk)->usage)) __put_task_struct(tsk); } while(0)
 
 /*
  * Per process flags
diff -Nur -X /opt/home/roman/nodiff linux-2.5.6-pre2/include/linux/task_struct.h linux-task_struct/include/linux/task_struct.h
--- linux-2.5.6-pre2/include/linux/task_struct.h	Thu Jan  1 01:00:00 1970
+++ linux-task_struct/include/linux/task_struct.h	Fri Mar  1 20:16:24 2002
@@ -0,0 +1,139 @@
+#ifndef _LINUX_TASK_STRUCT_H
+#define _LINUX_TASK_STRUCT_H
+
+#include <linux/list.h>
+#include <linux/capability.h>
+#include <linux/resource.h>
+#include <linux/signal.h>
+#include <linux/timer.h>
+#include <linux/times.h>
+#include <linux/wait.h>
+#include <linux/types.h>
+#include <asm/atomic.h>
+#include <asm/param.h>
+
+typedef struct task_struct task_t;
+typedef struct prio_array prio_array_t;
+
+struct task_struct {
+	volatile long state;	/* -1 unrunnable, 0 runnable, >0 stopped */
+	struct thread_info *thread_info;
+	atomic_t usage;
+	unsigned long flags;	/* per process flags, defined below */
+	unsigned long ptrace;
+
+	int lock_depth;		/* Lock depth */
+
+	int prio, static_prio;
+	list_t run_list;
+	prio_array_t *array;
+
+	unsigned long sleep_avg;
+	unsigned long sleep_timestamp;
+
+	unsigned long policy;
+	unsigned long cpus_allowed;
+	unsigned int time_slice;
+
+	struct task_struct *next_task, *prev_task;
+
+	struct mm_struct *mm, *active_mm;
+	struct list_head local_pages;
+
+	unsigned int allocation_order, nr_local_pages;
+
+/* task state */
+	struct linux_binfmt *binfmt;
+	int exit_code, exit_signal;
+	int pdeath_signal;  /*  The signal sent when the parent dies  */
+	/* ??? */
+	unsigned long personality;
+	int did_exec:1;
+	pid_t pid;
+	pid_t pgrp;
+	pid_t tty_old_pgrp;
+	pid_t session;
+	pid_t tgid;
+	/* boolean value for session group leader */
+	int leader;
+	/* 
+	 * pointers to (original) parent process, youngest child, younger sibling,
+	 * older sibling, respectively.  (p->father can be replaced with 
+	 * p->p_pptr->pid)
+	 */
+	struct task_struct *p_opptr, *p_pptr, *p_cptr, *p_ysptr, *p_osptr;
+	struct list_head thread_group;
+
+	/* PID hash table linkage. */
+	struct task_struct *pidhash_next;
+	struct task_struct **pidhash_pprev;
+
+	wait_queue_head_t wait_chldexit;	/* for wait4() */
+	struct completion *vfork_done;		/* for vfork() */
+
+	unsigned long rt_priority;
+	unsigned long it_real_value, it_prof_value, it_virt_value;
+	unsigned long it_real_incr, it_prof_incr, it_virt_incr;
+	struct timer_list real_timer;
+	struct tms times;
+	unsigned long start_time;
+	long per_cpu_utime[NR_CPUS], per_cpu_stime[NR_CPUS];
+/* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */
+	unsigned long min_flt, maj_flt, nswap, cmin_flt, cmaj_flt, cnswap;
+	int swappable:1;
+/* process credentials */
+	uid_t uid,euid,suid,fsuid;
+	gid_t gid,egid,sgid,fsgid;
+	int ngroups;
+	gid_t	groups[NGROUPS];
+	kernel_cap_t   cap_effective, cap_inheritable, cap_permitted;
+	int keep_capabilities:1;
+	struct user_struct *user;
+/* limits */
+	struct rlimit rlim[RLIM_NLIMITS];
+	unsigned short used_math;
+	char comm[16];
+/* file system info */
+	int link_count, total_link_count;
+	struct tty_struct *tty; /* NULL if no tty */
+	unsigned int locks; /* How many file locks are being held */
+/* ipc stuff */
+	struct sem_undo *semundo;
+	struct sem_queue *semsleeping;
+/* CPU-specific state of this task */
+	struct thread_struct thread;
+/* filesystem information */
+	struct fs_struct *fs;
+/* open file information */
+	struct files_struct *files;
+/* namespace */
+	struct namespace *namespace;
+/* signal handlers */
+	spinlock_t sigmask_lock;	/* Protects signal and blocked */
+	struct signal_struct *sig;
+
+	sigset_t blocked;
+	struct sigpending pending;
+
+	unsigned long sas_ss_sp;
+	size_t sas_ss_size;
+	int (*notifier)(void *priv);
+	void *notifier_data;
+	sigset_t *notifier_mask;
+	
+/* Thread group tracking */
+   	u32 parent_exec_id;
+   	u32 self_exec_id;
+/* Protection of (de-)allocation: mm, files, fs, tty */
+	spinlock_t alloc_lock;
+
+/* journalling filesystem info */
+	void *journal_info;
+};
+
+extern void __put_task_struct(struct task_struct *tsk);
+#define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
+#define put_task_struct(tsk) \
+do { if (atomic_dec_and_test(&(tsk)->usage)) __put_task_struct(tsk); } while(0)
+
+#endif	/* _LINUX_TASK_STRUCT_H */

Re: [PATCH] moving task_struct

[Jeff Garzik]

> The patch below simply moves task_struct into its own header file.
> This makes thread_info and task_struct indepedent from sched.h and will 
> allows archs to decide themselves the dependencies between these
> structures.

nice...   In addition to your second patch, this first patch may be a
small step in paving the way for further unraveling of nasty include
dependencies.

Regards,

	Jeff



-- 
Jeff Garzik      |
Building 1024    |
MandrakeSoft     | Choose life.

Re: [PATCH] moving task_struct

[Dave Jones]

On Fri, Mar 01, 2002 at 03:55:37PM -0500, Jeff Garzik wrote:
 > > The patch below simply moves task_struct into its own header file.
 > > This makes thread_info and task_struct indepedent from sched.h and will 
 > > allows archs to decide themselves the dependencies between these
 > > structures.
 > 
 > nice...   In addition to your second patch, this first patch may be a
 > small step in paving the way for further unraveling of nasty include
 > dependencies.

 Indeedy doody. Roman has a nice set of Ruby scripts, which in 
 conjunction with acme's dependancy graph scripts make for some
 interesting reading.

 It's tedious work unraveling some of the dependancies, but it's
 paid off quite a bit already.  (For a real horror story, see
 the raid includes. They pull in an obscene amount of extra
 headers 8-)

-- 
| Dave Jones.        http://www.codemonkey.org.uk
| SuSE Labs

Re: [PATCH] moving task_struct

[Daniel Phillips]

On March 1, 2002 09:55 pm, Jeff Garzik wrote:
> > The patch below simply moves task_struct into its own header file.
> > This makes thread_info and task_struct indepedent from sched.h and will 
> > allows archs to decide themselves the dependencies between these
> > structures.
> 
> nice...   In addition to your second patch, this first patch may be a
> small step in paving the way for further unraveling of nasty include
> dependencies.

Apropo of that, struct page needs to be defined before mmzone.h is
included, so that inlines in mmzone.h can do arithmetic involving
sizeof(struct page), instead of using macros.

-- 
Daniel

Re: [PATCH] moving task_struct

[Robert Love]

On Mon, 2002-03-04 at 06:16, Daniel Phillips wrote:

> On March 1, 2002 09:55 pm, Jeff Garzik wrote:
> > nice...   In addition to your second patch, this first patch may be a
> > small step in paving the way for further unraveling of nasty include
> > dependencies.
> 
> Apropo of that, struct page needs to be defined before mmzone.h is
> included, so that inlines in mmzone.h can do arithmetic involving
> sizeof(struct page), instead of using macros.

Yep.

The preempt patch in 2.4 hit some of the uglies of sched.h.  Thankfully,
in 2.5 we use thread_info exclusive and Linus helped me remove all
sched.h dependencies - it is a big cleanup.  sched.h and its related and
interrelated dependencies are _not_ pretty.

Anything you do helps, Daniel ;)

	Robert Love