From 93c39c86f7617d9c71161d74ca0d8b88dbe47d4b Mon Sep 17 00:00:00 2001 From: Janet Anderson Date: Mon, 1 Nov 2010 14:35:49 -0500 Subject: [PATCH 1/3] Added includes for host's CONFIG_SITE files. Changed all to -include. --- configure/os/CONFIG.cygwin-x86.cygwin-x86-debug | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure/os/CONFIG.cygwin-x86.cygwin-x86-debug b/configure/os/CONFIG.cygwin-x86.cygwin-x86-debug index 3a7f3c2b9..67f380a9d 100644 --- a/configure/os/CONFIG.cygwin-x86.cygwin-x86-debug +++ b/configure/os/CONFIG.cygwin-x86.cygwin-x86-debug @@ -7,8 +7,10 @@ # Sites may override these definitions in CONFIG_SITE.cygwin-x86.cygwin-x86-debug #------------------------------------------------------- -include $(CONFIG)/os/CONFIG.Common.cygwin-x86 -include $(CONFIG)/os/CONFIG.cygwin-x86.cygwin-x86 +-include $(CONFIG)/os/CONFIG.Common.cygwin-x86 +-include $(CONFIG)/os/CONFIG.cygwin-x86.cygwin-x86 +-include $(CONFIG)/os/CONFIG_SITE.Common.cygwin-x86 +-include $(CONFIG)/os/CONFIG_SITE.cygwin-x86.cygwin-x86 BUILD_CLASS = HOST From 3ad06eb0a373e13e7e7fbfdd67c301d1083c2aea Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Mon, 1 Nov 2010 15:00:02 -0600 Subject: [PATCH 2/3] fixed request and response bytes amount was revered in printf --- src/rsrv/caservertask.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rsrv/caservertask.c b/src/rsrv/caservertask.c index fd576086d..e8c3a28e3 100644 --- a/src/rsrv/caservertask.c +++ b/src/rsrv/caservertask.c @@ -416,8 +416,8 @@ static void log_one_client (struct client *client, unsigned level) send_delay, recv_delay); printf( "\tUnprocessed request bytes=%u, Undelivered response bytes=%u\n", - client->send.stk, - client->recv.cnt - client->recv.stk ); + client->recv.cnt - client->recv.stk, + client->send.stk ); printf( "\tState=%s%s%s\n", state[client->disconnect?1:0], From e372a830966bfca1374fb2a5fddcbd5f669a70e3 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Mon, 1 Nov 2010 15:01:04 -0600 Subject: [PATCH 3/3] neglected to unlock on error return path --- src/rsrv/camessage.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rsrv/camessage.c b/src/rsrv/camessage.c index 4888a2aa8..09015f667 100644 --- a/src/rsrv/camessage.c +++ b/src/rsrv/camessage.c @@ -1566,6 +1566,7 @@ static void putNotifyErrorReply ( struct client *client, caHdrLargeArray *mp, in 0u, mp->m_dataType, mp->m_count, statusCA, mp->m_available, 0 ); if ( status != ECA_NORMAL ) { + SEND_UNLOCK ( client ); errlogPrintf ("%s at %d: should always get sufficent space for put notify error reply\n", __FILE__, __LINE__); return; @@ -2144,6 +2145,7 @@ static void search_fail_reply ( caHdrLargeArray *mp, void *pPayload, struct clie status = cas_copy_in_header ( client, CA_PROTO_NOT_FOUND, 0u, mp->m_dataType, mp->m_count, mp->m_cid, mp->m_available, NULL ); if ( status != ECA_NORMAL ) { + SEND_UNLOCK ( client ); errlogPrintf ( "%s at %d: should always get sufficent space for search fail reply?\n", __FILE__, __LINE__ ); return;