X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fkernel%2Fsched.h;h=60569ab94b33650d0391081836a5150c7caf45a7;hb=faa778968d1a7dfeaebc9fe4b847e691dc62fd15;hp=9db06e54add360473b4196477a7368453e0a12a8;hpb=1143450520d6c67b48184d529afe91a9ab799817;p=util-vserver.git diff --git a/util-vserver/kernel/sched.h b/util-vserver/kernel/sched.h index 9db06e5..60569ab 100644 --- a/util-vserver/kernel/sched.h +++ b/util-vserver/kernel/sched.h @@ -1,152 +1,25 @@ -#if defined(__KERNEL__) && defined(_VX_INFO_DEF_) - -#include -#include -#include -#include -#include - -/* context sub struct */ - -struct _vx_sched { - spinlock_t tokens_lock; /* lock for this structure */ - - int fill_rate; /* Fill rate: add X tokens... */ - int interval; /* Divisor: per Y jiffies */ - atomic_t tokens; /* number of CPU tokens in this context */ - int tokens_min; /* Limit: minimum for unhold */ - int tokens_max; /* Limit: no more than N tokens */ - uint32_t jiffies; /* add an integral multiple of Y to this */ - - uint64_t ticks; /* token tick events */ - cpumask_t cpus_allowed; /* cpu mask for context */ -}; - -static inline void vx_info_init_sched(struct _vx_sched *sched) -{ - /* scheduling; hard code starting values as constants */ - sched->fill_rate = 1; - sched->interval = 4; - sched->tokens_min = HZ >> 4; - sched->tokens_max = HZ >> 1; - sched->jiffies = jiffies; - sched->tokens_lock = SPIN_LOCK_UNLOCKED; - - atomic_set(&sched->tokens, HZ >> 2); - sched->cpus_allowed = CPU_MASK_ALL; -} - -static inline int vx_info_proc_sched(struct _vx_sched *sched, char *buffer) -{ - return sprintf(buffer, - "Ticks:\t%16lld\n" - "Token:\t\t%8d\n" - "FillRate:\t%8d\n" - "Interval:\t%8d\n" - "TokensMin:\t%8d\n" - "TokensMax:\t%8d\n" - ,sched->ticks - ,atomic_read(&sched->tokens) - ,sched->fill_rate - ,sched->interval - ,sched->tokens_min - ,sched->tokens_max - ); -} - - -#else /* _VX_INFO_DEF_ */ #ifndef _VX_SCHED_H #define _VX_SCHED_H -#include "switch.h" - -/* sched vserver commands */ - -#define VCMD_set_sched VC_CMD(SCHED, 1, 2) - -struct vcmd_set_sched_v2 { - int32_t fill_rate; - int32_t interval; - int32_t tokens; - int32_t tokens_min; - int32_t tokens_max; - uint64_t cpu_mask; -}; - -struct vcmd_set_sched_v3 { - uint32_t set_mask; - int32_t fill_rate; - int32_t interval; - int32_t tokens; - int32_t tokens_min; - int32_t tokens_max; - int32_t priority_bias; -}; - -#define VXSM_FILL_RATE 0x0001 -#define VXSM_INTERVAL 0x0002 -#define VXSM_TOKENS 0x0010 -#define VXSM_TOKENS_MIN 0x0020 -#define VXSM_TOKENS_MAX 0x0030 -#define VXSM_PRIO_BIAS 0x0100 - - -#define SCHED_KEEP (-2) - #ifdef __KERNEL__ -extern int vc_set_sched_v1(uint32_t, void __user *); -extern int vc_set_sched(uint32_t, void __user *); +struct timespec; +void vx_vsi_uptime(struct timespec *, struct timespec *); -#define VAVAVOOM_RATIO 50 -#include "context.h" +struct vx_info; +void vx_update_load(struct vx_info *); -/* scheduling stuff */ - -int effective_vavavoom(struct task_struct *, int); - -int vx_tokens_recalc(struct vx_info *); -/* new stuff ;) */ +struct task_struct; -static inline int vx_tokens_avail(struct vx_info *vxi) -{ - return atomic_read(&vxi->sched.tokens); -} - -static inline void vx_consume_token(struct vx_info *vxi) -{ - atomic_dec(&vxi->sched.tokens); -} - -static inline int vx_need_resched(struct task_struct *p) -{ -#ifdef CONFIG_VSERVER_HARDCPU - struct vx_info *vxi = p->vx_info; - - if (vxi) { - int tokens; - - p->time_slice--; - if (atomic_read(&vxi->vx_refcount) < 1) - printk("need_resched: p=%p, s=%ld, ref=%d, id=%d/%d\n", - p, p->state, atomic_read(&vxi->vx_refcount), - vxi->vx_id, p->xid); - if ((tokens = vx_tokens_avail(vxi)) > 0) - vx_consume_token(vxi); - return ((p->time_slice == 0) || (tokens < 1)); - } -#endif - p->time_slice--; - return (p->time_slice == 0); -} +int vx_effective_vavavoom(struct vx_info *, int); +int vx_tokens_recalc(struct vx_info *); #endif /* __KERNEL__ */ - +#else /* _VX_SCHED_H */ +#warning duplicate inclusion #endif /* _VX_SCHED_H */ -#endif