summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ACE/ChangeLog21
-rw-r--r--ACE/ace/CDR_Stream.cpp3
-rw-r--r--ACE/ace/CDR_Stream.h2
-rw-r--r--ACE/ace/Default_Constants.h21
-rw-r--r--ACE/ace/Log_Msg_IPC.cpp4
-rw-r--r--ACE/ace/Log_Msg_IPC.h2
-rw-r--r--ACE/ace/Message_Block.cpp13
-rw-r--r--ACE/ace/Message_Block.inl2
-rw-r--r--ACE/netsvcs/lib/Client_Logging_Handler.cpp12
-rw-r--r--ACE/netsvcs/lib/Client_Logging_Handler.h4
10 files changed, 56 insertions, 28 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index aff78712202..12403b15443 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,24 @@
+Thu Feb 19 14:01:33 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/Default_Constants.h:
+ * ace/Log_Msg_IPC.cpp:
+ * ace/Log_Msg_IPC.h:
+ * netsvcs/lib/Client_Logging_Handler.cpp:
+ * netsvcs/lib/Client_Logging_Handler.h:
+ Added new ACE_HAS_STREAM_LOG_MSG_IPC which controls whether the
+ ACE Log_Msg IPC should use streams or not. When ACE_HAS_STREAM_PIPES
+ is defined we default to 1, else to 0. We do see that using stream
+ pipes causes problems on at least Solaris, so the user can decide
+ to set this value explicitly to 0
+
+ * ace/CDR_Stream.cpp:
+ * ace/CDR_Stream.h:
+ * ace/Message_Block.inl:
+ Doxygen and layout changes
+
+ * ace/Message_Block.cpp:
+ Use %@ for pointers
+
Wed Feb 18 20:51:33 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/MakeProjectCreator/config/minizip.mpb:
diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp
index 2657a5373cd..f00a4c0c5b3 100644
--- a/ACE/ace/CDR_Stream.cpp
+++ b/ACE/ace/CDR_Stream.cpp
@@ -1894,8 +1894,7 @@ ACE_InputCDR::clone_from (ACE_InputCDR &cdr)
ACE_CDR::mb_align (&this->start_);
- ACE_Data_Block *db =
- this->start_.data_block ();
+ ACE_Data_Block *db = this->start_.data_block ();
// If the size of the data that needs to be copied are higher than
// what is available, then do a reallocation.
diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h
index 66ff235da18..fbd87ddbda6 100644
--- a/ACE/ace/CDR_Stream.h
+++ b/ACE/ace/CDR_Stream.h
@@ -919,7 +919,7 @@ public:
*/
void exchange_data_blocks (ACE_InputCDR &cdr);
- /// Copy the data portion from the @c cdr to this cdr and return the
+ /// Copy the data portion from the @a cdr to this cdr and return the
/// data content (ie. the ACE_Data_Block) from this CDR to the
/// caller.
/**
diff --git a/ACE/ace/Default_Constants.h b/ACE/ace/Default_Constants.h
index 61369d3d158..95da65760e3 100644
--- a/ACE/ace/Default_Constants.h
+++ b/ACE/ace/Default_Constants.h
@@ -200,7 +200,7 @@
# define ACE_DEFAULT_TIME_SERVER_STR "ACE_TS_TIME"
# endif /* ACE_DEFAULT_TIME_SERVER_STR */
-// Used by the FIFO tests and the Client_Logging_Handler netsvc.
+// Used by the FIFO tests
# if !defined (ACE_DEFAULT_RENDEZVOUS)
# if defined (ACE_HAS_STREAM_PIPES)
# define ACE_DEFAULT_RENDEZVOUS ACE_TEXT("/tmp/fifo.ace")
@@ -214,13 +214,20 @@
# define ACE_DEFAULT_SYSLOG_FACILITY LOG_USER
# endif /* ACE_DEFAULT_SYSLOG_FACILITY */
-# if !defined (ACE_DEFAULT_LOGGER_KEY)
+# if !defined (ACE_HAS_STREAM_LOG_MSG_IPC)
+# if defined (ACE_HAS_STREAM_PIPES)
+# define ACE_HAS_STREAM_LOG_MSG_IPC 1
+# else
+# define ACE_HAS_STREAM_LOG_MSG_IPC 0
+# endif /* ACE_HAS_STREAM_PIPES */
+# endif /* !ACE_HAS_STREAM_LOG_MSG_IPC */
-# if defined (ACE_HAS_STREAM_PIPES)
-# define ACE_DEFAULT_LOGGER_KEY ACE_TEXT ("/tmp/server_daemon")
-# else
-# define ACE_DEFAULT_LOGGER_KEY ACE_TEXT ("localhost:20012")
-# endif /* ACE_HAS_STREAM_PIPES */
+# if !defined (ACE_DEFAULT_LOGGER_KEY)
+# if (ACE_HAS_STREAM_LOG_MSG_IPC == 1)
+# define ACE_DEFAULT_LOGGER_KEY ACE_TEXT ("/tmp/server_daemon")
+# else
+# define ACE_DEFAULT_LOGGER_KEY ACE_TEXT ("localhost:20012")
+# endif /* ACE_HAS_STREAM_LOG_MSG_IPC==1 */
# endif /* ACE_DEFAULT_LOGGER_KEY */
// The way to specify the local host for loopback IP. This is usually
diff --git a/ACE/ace/Log_Msg_IPC.cpp b/ACE/ace/Log_Msg_IPC.cpp
index 969a985498d..f78a56564b6 100644
--- a/ACE/ace/Log_Msg_IPC.cpp
+++ b/ACE/ace/Log_Msg_IPC.cpp
@@ -90,7 +90,7 @@ ACE_Log_Msg_IPC::log (ACE_Log_Record &log_record)
iov[1].iov_base = payload.begin ()->rd_ptr ();
iov[1].iov_len = length;
-#if defined (ACE_HAS_STREAM_PIPES)
+#if (ACE_HAS_STREAM_LOG_MSG_IPC == 1)
// Use the <putpmsg> API if supported to ensure correct message
// queueing according to priority.
@@ -108,7 +108,7 @@ ACE_Log_Msg_IPC::log (ACE_Log_Record &log_record)
// We're running over sockets, so send header and payload
// efficiently using "gather-write".
return this->message_queue_.sendv_n (iov, 2);
-#endif /* ACE_HAS_STREAM_PIPES */
+#endif /* ACE_HAS_STREAM_LOG_MSG_IPC */
}
ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Log_Msg_IPC.h b/ACE/ace/Log_Msg_IPC.h
index 8b39b9ec551..51c8c3b017d 100644
--- a/ACE/ace/Log_Msg_IPC.h
+++ b/ACE/ace/Log_Msg_IPC.h
@@ -23,7 +23,7 @@
// IPC conduit between sender and client daemon. This should be
// included in the ACE_Log_Msg class, but due to "order of include"
// problems it can't be...
-#if defined (ACE_HAS_STREAM_PIPES)
+#if (ACE_HAS_STREAM_LOG_MSG_IPC == 1)
# include "ace/SPIPE_Connector.h"
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
typedef ACE_SPIPE_Stream ACE_LOG_MSG_IPC_STREAM;
diff --git a/ACE/ace/Message_Block.cpp b/ACE/ace/Message_Block.cpp
index 9f0db1c3c36..cac8a6f9a79 100644
--- a/ACE/ace/Message_Block.cpp
+++ b/ACE/ace/Message_Block.cpp
@@ -154,7 +154,7 @@ ACE_Data_Block::dump (void) const
ACE_TEXT ("cur_size_ = %u\n")
ACE_TEXT ("max_size_ = %u\n")
ACE_TEXT ("flags_ = %u\n")
- ACE_TEXT ("base_ = %u\n")
+ ACE_TEXT ("base_ = %@\n")
ACE_TEXT ("locking_strategy_ = %u\n")
ACE_TEXT ("reference_count_ = %u\n")
ACE_TEXT ("---------------------------\n"),
@@ -179,11 +179,11 @@ ACE_Message_Block::dump (void) const
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("-----( Message Block )-----\n")
ACE_TEXT ("priority_ = %d\n")
- ACE_TEXT ("next_ = %u\n")
- ACE_TEXT ("prev_ = %u\n")
- ACE_TEXT ("cont_ = %u\n")
- ACE_TEXT ("rd_ptr_ = %u\n")
- ACE_TEXT ("wr_ptr_ = %u\n")
+ ACE_TEXT ("next_ = %@\n")
+ ACE_TEXT ("prev_ = %@\n")
+ ACE_TEXT ("cont_ = %@\n")
+ ACE_TEXT ("rd_ptr_ = %@\n")
+ ACE_TEXT ("wr_ptr_ = %@\n")
ACE_TEXT ("---------------------------\n"),
this->priority_,
this->next_,
@@ -984,6 +984,7 @@ ACE_Message_Block::~ACE_Message_Block (void)
this->prev_ = 0;
this->next_ = 0;
+ this->cont_ = 0;
}
ACE_Data_Block *
diff --git a/ACE/ace/Message_Block.inl b/ACE/ace/Message_Block.inl
index 71537e9fc16..89d615582a4 100644
--- a/ACE/ace/Message_Block.inl
+++ b/ACE/ace/Message_Block.inl
@@ -397,7 +397,7 @@ ACE_Message_Block::replace_data_block (ACE_Data_Block *db)
if (db != 0)
{
// Set the read and write pointers in the <Message_Block> to point
- // to the buffer in the <ACE_Data_Block>.
+ // to the buffer in the ACE_Data_Block.
this->rd_ptr (this->data_block ()->base ());
this->wr_ptr (this->data_block ()->base ());
}
diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.cpp b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
index 0ef1f7bd05e..84a59ac7d1f 100644
--- a/ACE/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
@@ -123,7 +123,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
// Align the Message Block for a CDR stream
ACE_CDR::mb_align (header.get ());
-#if defined (ACE_HAS_STREAM_PIPES)
+#if (ACE_HAS_STREAM_LOG_MSG_IPC == 1)
// We're getting a logging message from a local application using
// STREAM pipes, which are nicely prioritized for us.
ACE_Str_Buf header_msg (header->wr_ptr (),
@@ -193,7 +193,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
// Just fall through in this case..
break;
}
-#endif /* ACE_HAS_STREAM_PIPES */
+#endif /* ACE_HAS_STREAM_LOG_MSG_IPC == 1 */
// Reflect addition of 8 bytes for the header.
header->wr_ptr (8);
@@ -231,7 +231,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
// Ensure there's sufficient room for log record payload.
ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length);
-#if defined (ACE_HAS_STREAM_PIPES)
+#if (ACE_HAS_STREAM_LOG_MSG_IPC == 1)
ACE_Str_Buf payload_msg (payload->wr_ptr (),
0,
length);
@@ -281,7 +281,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
ACE_OS::closesocket (handle);
return 0;
}
-#endif /* ACE_HAS_STREAM_PIPES */
+#endif /* ACE_HAS_STREAM_LOG_MSG_IPC == 1 */
// Reflect additional bytes for the message.
payload->wr_ptr (length);
@@ -569,7 +569,7 @@ ACE_Client_Logging_Acceptor::init (int argc, ACE_TCHAR *argv[])
ACE_SOCK_Stream stream;
ACE_INET_Addr server_addr;
-#if defined (ACE_HAS_STREAM_PIPES)
+#if (ACE_HAS_STREAM_LOG_MSG_IPC == 1)
ACE_SPIPE_Addr lserver_addr;
// Figure out what local port we're really bound to.
@@ -599,7 +599,7 @@ ACE_Client_Logging_Acceptor::init (int argc, ACE_TCHAR *argv[])
ACE_TEXT ("bounded to local port %d on handle %u\n"),
lserver_addr.get_port_number (),
this->acceptor ().get_handle ()));
-#endif /* ACE_HAS_STREAM_PIPES */
+#endif /* ACE_HAS_STREAM_LOG_MSG_IPC == 1 */
if (con.connect (stream,
this->server_addr_,
diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.h b/ACE/netsvcs/lib/Client_Logging_Handler.h
index a83260f083c..6a36c2be8e9 100644
--- a/ACE/netsvcs/lib/Client_Logging_Handler.h
+++ b/ACE/netsvcs/lib/Client_Logging_Handler.h
@@ -24,7 +24,7 @@
#include "ace/Svc_Handler.h"
#include "ace/svc_export.h"
-#if defined (ACE_HAS_STREAM_PIPES)
+#if (ACE_HAS_STREAM_LOG_MSG_IPC == 1)
#define LOGGING_STREAM ACE_SPIPE_STREAM
#define LOGGING_ACCEPTOR ACE_SPIPE_ACCEPTOR
#define LOGGING_ADDR ACE_SPIPE_Addr
@@ -32,7 +32,7 @@
#define LOGGING_STREAM ACE_SOCK_STREAM
#define LOGGING_ACCEPTOR ACE_SOCK_ACCEPTOR
#define LOGGING_ADDR ACE_INET_Addr
-#endif /* ACE_HAS_STREAM_PIPES */
+#endif /* ACE_HAS_STREAM_LOG_MSG_IPC == 1 */
#if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
template class ACE_Svc_Export ACE_Svc_Handler<LOGGING_STREAM, ACE_NULL_SYNCH>;
View Lorry Controller Status