remove_wait_queue(&log_full, &wait);
}
-#if CONFIG_TUX_DEBUG
+#ifdef CONFIG_TUX_DEBUG
#define CHECK_LOGPTR(ptr) \
do { \
if ((ptr < log_buffer) || (ptr > log_buffer + LOG_LEN)) { \
* Log the reply status (success, or type of failure)
*/
if (!tux_log_incomplete && (!req->status || (req->bytes_sent == -1))) {
-
+
Dprintk("not logging req %p: {%s} [%d/%d]\n", req, req->uri_str, req->status, req->bytes_sent);
return;
}
Dprintk("version_str: {%s} [%d]\n", req->version_str, req->version_len);
len += req->version_len + 1;
-#if CONFIG_TUX_EXTENDED_LOG
+#ifdef CONFIG_TUX_EXTENDED_LOG
Dprintk("user_agent_str: {%s} [%d]\n", req->user_agent_str, req->user_agent_len);
len += req->user_agent_len + 1;
#endif
len++;
inc = 5*sizeof(u32) + len;
-#if CONFIG_TUX_EXTENDED_LOG
+#ifdef CONFIG_TUX_EXTENDED_LOG
inc += 7*sizeof(u32);
#endif
* and other damage. The signature also servers as a log format
* version identifier.
*/
-#if CONFIG_TUX_EXTENDED_LOG
+#ifdef CONFIG_TUX_EXTENDED_LOG
*(u32 *)str = 0x2223beef;
#else
*(u32 *)str = 0x1112beef;
str += sizeof(u32);
CHECK_LOGPTR(str);
-#if CONFIG_TUX_EXTENDED_LOG
+#ifdef CONFIG_TUX_EXTENDED_LOG
/*
* Log the client port number:
*/
str += sizeof(u32);
CHECK_LOGPTR(str);
-#if CONFIG_TUX_EXTENDED_LOG
+#ifdef CONFIG_TUX_EXTENDED_LOG
*(u32 *)str = req->accept_timestamp; str += sizeof(u32);
*(u32 *)str = req->parse_timestamp; str += sizeof(u32);
*(u32 *)str = req->output_timestamp; str += sizeof(u32);
CHECK_LOGPTR(str);
}
*str++ = 0;
-#if CONFIG_TUX_EXTENDED_LOG
+#ifdef CONFIG_TUX_EXTENDED_LOG
if (req->user_agent_len) {
memcpy(str, req->user_agent_str, req->user_agent_len);
str += req->user_agent_len;
void tux_push_pending (struct sock *sk)
{
- struct tcp_opt *tp = tcp_sk(sk);
+ struct tcp_sock *tp = tcp_sk(sk);
+ struct inet_connection_sock *icsk = inet_csk(sk);
Dprintk("pushing pending frames on sock %p.\n", sk);
lock_sock(sk);
if ((sk->sk_state == TCP_ESTABLISHED) && !sk->sk_err) {
- tp->ack.pingpong = tux_ack_pingpong;
+ icsk->icsk_ack.pingpong = tux_ack_pingpong;
tp->nonagle = 1;
__tcp_push_pending_frames(sk, tp, tcp_current_mss(sk, 0), TCP_NAGLE_OFF);
}
TUX_BUG();
if (req->ti->thread != current)
TUX_BUG();
-#if CONFIG_TUX_DEBUG
+#ifdef CONFIG_TUX_DEBUG
if (req->bytes_expected && (req->bytes_sent != req->bytes_expected)) {
printk("hm, bytes_expected: %d != bytes_sent: %d!\n",
req->bytes_expected, req->bytes_sent);
req->post_data_len = 0;
SET_TIMESTAMP(req->accept_timestamp);
-#if CONFIG_TUX_EXTENDED_LOG
+#ifdef CONFIG_TUX_EXTENDED_LOG
req->parse_timestamp = 0;
req->output_timestamp = 0;
req->flush_timestamp = 0;
req->total_bytes += req->bytes_sent;
req->bytes_sent = 0;
-#if CONFIG_TUX_DEBUG
+#ifdef CONFIG_TUX_DEBUG
req->bytes_expected = 0;
#endif
req->body_len = 0;
inode = log_filp->f_dentry->d_inode;
mapping = inode->i_mapping;
if (mapping->nrpages > 256) { /* batch stuff up */
- down(&inode->i_sem);
+ mutex_lock(&inode->i_mutex);
filemap_fdatawrite(inode->i_mapping);
/*
*/
invalidate_mapping_pages(mapping, 0, log_filp_last_index);
log_filp_last_index = log_filp->f_pos >> PAGE_CACHE_SHIFT;
- up(&inode->i_sem);
+ mutex_unlock(&inode->i_mutex);
}
out_lock:
oldmm = get_fs();
set_fs(KERNEL_DS);
printk(KERN_NOTICE "TUX: logger thread started.\n");
-#if CONFIG_SMP
+#ifdef CONFIG_SMP
{
cpumask_t map;