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 */
+ 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 {
- int max_threads; /* maximum allowed threads */
+// int max_threads; /* maximum allowed threads */
atomic_t nr_threads; /* number of current threads */
atomic_t nr_running; /* number of running threads */
atomic_t nr_uninterruptible; /* number of uninterruptible threads */
struct _vx_syslog syslog;
};
+
+#ifdef CONFIG_VSERVER_DEBUG
+
+static inline void __dump_vx_cvirt(struct _vx_cvirt *cvirt)
+{
+ printk("\t_vx_cvirt:\n");
+ printk("\t threads: %4d, %4d, %4d, %4d\n",
+ atomic_read(&cvirt->nr_threads),
+ atomic_read(&cvirt->nr_running),
+ atomic_read(&cvirt->nr_uninterruptible),
+ atomic_read(&cvirt->nr_onhold));
+ /* add rest here */
+ printk("\t total_forks = %d\n", atomic_read(&cvirt->total_forks));
+}
+
+#endif
+
+
struct _vx_sock_acc {
atomic_t count;
atomic_t total;
/* context sub struct */
struct _vx_cacct {
- unsigned long total_forks;
-
struct _vx_sock_acc sock[5][3];
};
+#ifdef CONFIG_VSERVER_DEBUG
+
+static inline void __dump_vx_cacct(struct _vx_cacct *cacct)
+{
+ int i,j;
+
+ printk("\t_vx_cacct:");
+ for (i=0; i<5; i++) {
+ struct _vx_sock_acc *ptr = cacct->sock[i];
+
+ printk("\t [%d] =", i);
+ for (j=0; j<3; j++) {
+ printk(" [%d] = %8d, %8d", j,
+ atomic_read(&ptr[j].count),
+ atomic_read(&ptr[j].total));
+ }
+ printk("\n");
+ }
+}
+
+#endif
+
#endif /* _VX_CVIRT_DEF_H */
extern unsigned int vx_debug_net;
extern unsigned int vx_debug_limit;
extern unsigned int vx_debug_dlim;
+extern unsigned int vx_debug_quota;
extern unsigned int vx_debug_cvirt;
+extern unsigned int vx_debug_misc;
#define VX_LOGLEVEL "vxD: "
({ static char _buffer[PATH_MAX]; \
d_path((d), (m), _buffer, sizeof(_buffer)); })
+
+void dump_vx_info(struct vx_info *, int);
+void dump_vx_info_inactive(int);
+
#else /* CONFIG_VSERVER_DEBUG */
#define vx_debug_switch 0
#define vxd_path "<none>"
+
#endif /* CONFIG_VSERVER_DEBUG */
struct _vx_hist_entry *vxh_advance(void *loc);
-#define VXH_HERE() \
- ({ __label__ here; \
- here:; \
- &&here; })
-
-
-static inline void __vxh_copy_vxi(struct _vx_hist_entry *entry, struct vx_info *vxi)
+static inline
+void __vxh_copy_vxi(struct _vx_hist_entry *entry, struct vx_info *vxi)
{
entry->vxi.ptr = vxi;
if (vxi) {
}
-#define __VXH_BODY(__type, __data) \
+#define __HERE__ \
+ ({ __label__ __vxh_label; __vxh_label:; &&__vxh_label; })
+
+#define __VXH_BODY(__type, __data, __here) \
struct _vx_hist_entry *entry; \
\
preempt_disable(); \
- entry = vxh_advance(VXH_HERE()); \
+ entry = vxh_advance(__here); \
__data; \
entry->type = __type; \
preempt_enable();
/* pass vxi only */
-#define __VXH_SIMPLE \
+
+#define __VXH_SMPL \
__vxh_copy_vxi(entry, vxi)
-#define VXH_SIMPLE(__name, __type) \
-static inline void __name(struct vx_info *vxi) \
-{ \
- __VXH_BODY(__type, __VXH_SIMPLE) \
+static inline
+void __vxh_smpl(struct vx_info *vxi, int __type, void *__here)
+{
+ __VXH_BODY(__type, __VXH_SMPL, __here)
}
/* pass vxi and data (void *) */
+
#define __VXH_DATA \
__vxh_copy_vxi(entry, vxi); \
entry->sc.data = data
-#define VXH_DATA(__name, __type) \
-static inline \
-void __name(struct vx_info *vxi, void *data) \
-{ \
- __VXH_BODY(__type, __VXH_DATA) \
+static inline
+void __vxh_data(struct vx_info *vxi, void *data,
+ int __type, void *__here)
+{
+ __VXH_BODY(__type, __VXH_DATA, __here)
}
/* pass vxi and arg (long) */
-#define __VXH_LARG \
+
+#define __VXH_LONG \
__vxh_copy_vxi(entry, vxi); \
entry->ll.arg = arg
-#define VXH_LARG(__name, __type) \
-static inline \
-void __name(struct vx_info *vxi, long arg) \
-{ \
- __VXH_BODY(__type, __VXH_LARG) \
+static inline
+void __vxh_long(struct vx_info *vxi, long arg,
+ int __type, void *__here)
+{
+ __VXH_BODY(__type, __VXH_LONG, __here)
}
-static inline void vxh_throw_oops(void)
+static inline
+void __vxh_throw_oops(void *__here)
{
- __VXH_BODY(VXH_THROW_OOPS, {});
+ __VXH_BODY(VXH_THROW_OOPS, {}, __here);
/* prevent further acquisition */
vxh_active = 0;
}
-VXH_SIMPLE(vxh_get_vx_info, VXH_GET_VX_INFO);
-VXH_SIMPLE(vxh_put_vx_info, VXH_PUT_VX_INFO);
-VXH_DATA(vxh_init_vx_info, VXH_INIT_VX_INFO);
-VXH_DATA(vxh_set_vx_info, VXH_SET_VX_INFO);
-VXH_DATA(vxh_clr_vx_info, VXH_CLR_VX_INFO);
+#define vxh_throw_oops() __vxh_throw_oops(__HERE__);
+
+#define __vxh_get_vx_info(v,h) __vxh_smpl(v, VXH_GET_VX_INFO, h);
+#define __vxh_put_vx_info(v,h) __vxh_smpl(v, VXH_PUT_VX_INFO, h);
+
+#define __vxh_init_vx_info(v,d,h) \
+ __vxh_data(v,d, VXH_INIT_VX_INFO, h);
+#define __vxh_set_vx_info(v,d,h) \
+ __vxh_data(v,d, VXH_SET_VX_INFO, h);
+#define __vxh_clr_vx_info(v,d,h) \
+ __vxh_data(v,d, VXH_CLR_VX_INFO, h);
-VXH_DATA(vxh_claim_vx_info, VXH_CLAIM_VX_INFO);
-VXH_DATA(vxh_release_vx_info, VXH_RELEASE_VX_INFO);
+#define __vxh_claim_vx_info(v,d,h) \
+ __vxh_data(v,d, VXH_CLAIM_VX_INFO, h);
+#define __vxh_release_vx_info(v,d,h) \
+ __vxh_data(v,d, VXH_RELEASE_VX_INFO, h);
-VXH_SIMPLE(vxh_alloc_vx_info, VXH_ALLOC_VX_INFO);
-VXH_SIMPLE(vxh_dealloc_vx_info, VXH_DEALLOC_VX_INFO);
+#define vxh_alloc_vx_info(v) \
+ __vxh_smpl(v, VXH_ALLOC_VX_INFO, __HERE__);
+#define vxh_dealloc_vx_info(v) \
+ __vxh_smpl(v, VXH_DEALLOC_VX_INFO, __HERE__);
-VXH_SIMPLE(vxh_hash_vx_info, VXH_HASH_VX_INFO);
-VXH_SIMPLE(vxh_unhash_vx_info, VXH_UNHASH_VX_INFO);
+#define vxh_hash_vx_info(v) \
+ __vxh_smpl(v, VXH_HASH_VX_INFO, __HERE__);
+#define vxh_unhash_vx_info(v) \
+ __vxh_smpl(v, VXH_UNHASH_VX_INFO, __HERE__);
-VXH_LARG(vxh_loc_vx_info, VXH_LOC_VX_INFO);
-VXH_LARG(vxh_lookup_vx_info, VXH_LOOKUP_VX_INFO);
-VXH_LARG(vxh_create_vx_info, VXH_CREATE_VX_INFO);
+#define vxh_loc_vx_info(v,l) \
+ __vxh_long(v,l, VXH_LOC_VX_INFO, __HERE__);
+#define vxh_lookup_vx_info(v,l) \
+ __vxh_long(v,l, VXH_LOOKUP_VX_INFO, __HERE__);
+#define vxh_create_vx_info(v,l) \
+ __vxh_long(v,l, VXH_CREATE_VX_INFO, __HERE__);
extern void vxh_dump_history(void);
#else /* CONFIG_VSERVER_HISTORY */
+#define __HERE__ 0
#define vxh_throw_oops() do { } while (0)
-#define vxh_get_vx_info(v) do { } while (0)
-#define vxh_put_vx_info(v) do { } while (0)
+#define __vxh_get_vx_info(v,h) do { } while (0)
+#define __vxh_put_vx_info(v,h) do { } while (0)
-#define vxh_init_vx_info(v,d) do { } while (0)
-#define vxh_set_vx_info(v,d) do { } while (0)
-#define vxh_clr_vx_info(v,d) do { } while (0)
+#define __vxh_init_vx_info(v,d,h) do { } while (0)
+#define __vxh_set_vx_info(v,d,h) do { } while (0)
+#define __vxh_clr_vx_info(v,d,h) do { } while (0)
-#define vxh_claim_vx_info(v,d) do { } while (0)
-#define vxh_release_vx_info(v,d) do { } while (0)
+#define __vxh_claim_vx_info(v,d,h) do { } while (0)
+#define __vxh_release_vx_info(v,d,h) do { } while (0)
#define vxh_alloc_vx_info(v) do { } while (0)
#define vxh_dealloc_vx_info(v) do { } while (0)
#ifdef CONFIG_VSERVER_DEBUG
#define vxd_assert_lock(l) assert_spin_locked(l)
+#define vxd_assert(c,f,x...) vxlprintk(!(c), \
+ "assertion [" f "] failed.", ##x, __FILE__, __LINE__)
#else
#define vxd_assert_lock(l) do { } while (0)
+#define vxd_assert(c,f,x...) do { } while (0)
#endif