You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/02/11 19:35:31 UTC
svn commit: r909100 - in
/incubator/trafficserver/traffic/trunk/proxy/logging: LogBuffer.cc
LogBuffer.h
Author: zwoop
Date: Thu Feb 11 18:35:30 2010
New Revision: 909100
URL: http://svn.apache.org/viewvc?rev=909100&view=rev
Log:
TS-159: Undo the initialization that was added to the ctor.
Reviewed: John
Modified:
incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc
incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.h
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc?rev=909100&r1=909099&r2=909100&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.cc Thu Feb 11 18:35:30 2010
@@ -61,24 +61,21 @@
};
enum
-{ FIELDLIST_CACHE_SIZE = 256 };
+{
+ FIELDLIST_CACHE_SIZE = 256
+};
+
FieldListCacheElement fieldlist_cache[FIELDLIST_CACHE_SIZE];
int fieldlist_cache_entries = 0;
-vink32
- LogBuffer::M_ID = 0;
+vink32 LogBuffer::M_ID = 0;
-iObjectActivator
- iObjectActivatorInstance; /* just to do ::Init() before main() */
+iObjectActivator iObjectActivatorInstance; /* just to do ::Init() before main() */
-iObject *
- iObject::free_heap = 0; /* list of free blocks */
-ink_mutex
- iObject::iObjectMutex; /* mutex for access iObject class global variables */
+iObject *iObject::free_heap = 0; /* list of free blocks */
+ink_mutex iObject::iObjectMutex; /* mutex for access iObject class global variables */
-iLogBufferBuffer *
- iLogBufferBuffer::free_heap = 0; /* list of free blocks */
-ink_mutex
- iLogBufferBuffer::iLogBufferBufferMutex; /* mutex for access iLogBufferBuffer class global variables */
+iLogBufferBuffer *iLogBufferBuffer::free_heap = 0; /* list of free blocks */
+ink_mutex iLogBufferBuffer::iLogBufferBufferMutex; /* mutex for access iLogBufferBuffer class global variables */
/* --------------------- iStaticBuf_LogBuffer::Init ------------------------ */
@@ -156,15 +153,14 @@
/* ---------------------------- iObject::new ------------------------------- */
void *
- iObject::operator
-new(size_t _size)
+iObject::operator new(size_t _size)
{
- iObject **objj, **objj_best = 0;
- iObject *ob = 0, *ob_best = 0;
+ iObject **objj, **objj_best = NULL;
+ iObject *ob = NULL, *ob_best = NULL;
size_t real_size = _size;
ink_mutex_acquire(&iObjectMutex);
- for (objj = &free_heap; (ob = *objj) != 0; objj = &(ob->next_object)) {
+ for (objj = &free_heap; (ob = *objj) != NULL; objj = &(ob->next_object)) {
if (ob->class_size == _size) {
*objj = ob->next_object;
break;
@@ -193,8 +189,7 @@
/* --------------------------- iObject::delete ----------------------------- */
void
- iObject::operator
-delete(void *p)
+iObject::operator delete(void *p)
{
iObject *ob = (iObject *) p;
@@ -270,13 +265,13 @@
-------------------------------------------------------------------------*/
LogBuffer::LogBuffer(LogObject * owner, size_t size, int buf_align_mask, int write_align_mask):
-sign(CLASS_SIGN_LOGBUFFER),
-next_flush(NULL),
-next_list(NULL),
-m_new_buffer(NULL),
-m_size(size),
-m_buf_align_mask(buf_align_mask),
-m_write_align_mask(write_align_mask), m_max_entries(Log::config->max_entries_per_buffer), m_owner(owner)
+ sign(CLASS_SIGN_LOGBUFFER),
+ next_flush(NULL),
+ next_list(NULL),
+ m_new_buffer(NULL),
+ m_size(size),
+ m_buf_align_mask(buf_align_mask),
+ m_write_align_mask(write_align_mask), m_max_entries(Log::config->max_entries_per_buffer), m_owner(owner)
{
size_t hdr_size;
@@ -307,15 +302,15 @@
}
LogBuffer::LogBuffer(LogObject * owner, LogBufferHeader * header):
-sign(CLASS_SIGN_LOGBUFFER),
-next_flush(NULL),
-next_list(NULL),
-m_bb(NULL),
-m_unaligned_buffer(NULL),
-m_buffer((char *) header),
-m_size(0),
-m_buf_align_mask(LB_DEFAULT_ALIGN_MASK),
-m_write_align_mask(MIN_ALIGN - 1), m_max_entries(0), m_expiration_time(0), m_owner(owner), m_header(header)
+ sign(CLASS_SIGN_LOGBUFFER),
+ next_flush(NULL),
+ next_list(NULL),
+ m_bb(NULL),
+ m_unaligned_buffer(NULL),
+ m_buffer((char *) header),
+ m_size(0),
+ m_buf_align_mask(LB_DEFAULT_ALIGN_MASK),
+ m_write_align_mask(MIN_ALIGN - 1), m_max_entries(0), m_expiration_time(0), m_owner(owner), m_header(header)
{
// This constructor does not allocate a buffer because it gets it as
// an argument. We set m_unaligned_buffer to NULL, which means that
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.h?rev=909100&r1=909099&r2=909100&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogBuffer.h Thu Feb 11 18:35:30 2010
@@ -108,10 +108,12 @@
LB_State():ival(0)
{
};
+
LB_State(volatile LB_State & vs)
{
ival = vs.ival;
};
+
LB_State & operator =(volatile LB_State & vs)
{
ival = vs.ival;
@@ -143,21 +145,22 @@
static void Init(void);
protected:
- iObject(const iObject &); /* declared; not implemented - block copying and assignment */
- iObject & operator=(const iObject &); /* ditto */
+ iObject(const iObject &); /* declared; not implemented - block copying and assignment */
+ iObject & operator=(const iObject &); /* ditto */
public:
void *operator new(size_t size);
void operator delete(void *p);
- iObject():class_size(0), next_object(NULL)
- { /* nop */
- }
- virtual ~ iObject()
- { /* nop */
- }
+ iObject()
+ { /* nop */
+ }
+
+ virtual ~iObject()
+ { /* nop */
+ }
- friend class iObjectActivator;
+ friend class iObjectActivator;
};
/* ------------------------------ iLogBufferBuffer ------------------------- */
@@ -172,13 +175,14 @@
static void Init(void);
- iLogBufferBuffer()
+ iLogBufferBuffer()
{
next = 0;
buf = 0;
real_buf_size = (size = 0);
}
- ~iLogBufferBuffer()
+
+ ~iLogBufferBuffer()
{
if (buf)
xfree(buf);
@@ -208,7 +212,8 @@
iObject::Init();
iLogBufferBuffer::Init();
}
- ~iObjectActivator()
+
+ ~iObjectActivator()
{ /* nop */
}
};