Changeset 1591

Timestamp:

06/20/08 22:30:45 (4 months ago)

Author:

alo

Message:

Files:

cherokee/trunk/ChangeLog

r1590	r1591
1	1	2008-06-20 Alvaro Lopez Ortega <alvaro@alobbs.com>
	2
	3	* cherokee/common-internal.h (CHEROKEE_THREAD_SELF): New macro.
	4
	5	* cherokee/trace.c: Added support for printing the thread IDs.
2	6
3	7	* cherokee/buffer.c (cherokee_buffer_read_from_fd): Added EBADF

r1568	r1591
87	87	# define CHEROKEE_RWLOCK_T(n) pthread_rwlock_t n
88	88	# define CHEROKEE_THREAD_JOIN(t) pthread_join(t,NULL)
	89	# define CHEROKEE_THREAD_SELF pthread_self()
89	90
90	91	# define CHEROKEE_MUTEX_LOCK(m) pthread_mutex_lock(m)
…	…
105	106	# define CHEROKEE_RWLOCK_T(n)
106	107	# define CHEROKEE_THREAD_JOIN(t)
	108	# define CHEROKEE_THREAD_SELF 0
107	109
108	110	# define CHEROKEE_MUTEX_LOCK(m)

r1564	r1591
36	36	cherokee_boolean_t use_syslog;
37	37	cherokee_boolean_t print_time;
	38	cherokee_boolean_t print_thread;
38	39	} cherokee_trace_t;
39	40
…	…
41	42	static cherokee_trace_t trace = {
42	43	CHEROKEE_BUF_INIT,
	44	false,
43	45	false,
44	46	false
…	…
80	82	/* Check the special properties
81	83	*/
82		trace.use_syslog = (strstr (modules->buf, "syslog") != NULL);
83		trace.print_time = (strstr (modules->buf, "time") != NULL);
	84	trace.use_syslog = (strstr (modules->buf, "syslog") != NULL);
	85	trace.print_time = (strstr (modules->buf, "time") != NULL);
	86	trace.print_thread = (strstr (modules->buf, "thread") != NULL);
84	87
85	88	return ret_ok;
…	…
142	145	*/
143	146	cherokee_buffer_clean (&entries);
	147	if (trace.print_thread) {
	148	cherokee_buffer_add_va (&entries, "{%p} ", CHEROKEE_THREAD_SELF);
	149	}
	150
144	151	if (trace.print_time) {
145	152	now_time = time(NULL);
…	…
153	160	now.tm_sec);
154	161	}
155
	162
156	163	cherokee_buffer_add_va (&entries, "%18s:%04d (%30s): ", file, line, func);
157	164