You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2010/05/13 19:44:13 UTC
svn commit: r943951 [9/19] - in /trafficserver/traffic/tags/2.1.0: ./ ci/
example/add-header/ example/app-template/ example/append-transform/
example/basic-auth/ example/blacklist-0/ example/blacklist-1/
example/bnull-transform/ example/cache_scan/ exa...
Modified: trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccess.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccess.cc?rev=943951&r1=943950&r2=943951&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccess.cc (original)
+++ trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccess.cc Thu May 13 17:43:56 2010
@@ -34,7 +34,7 @@
to provide support for marshalling and unmarshalling support for the other
LogAccess derived classes.
-
+
***************************************************************************/
#include "ink_unused.h"
@@ -58,7 +58,7 @@
#include "Log.h"
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::init
-------------------------------------------------------------------------*/
@@ -75,7 +75,7 @@ LogAccess::init()
initialized = true;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
The following functions provide a default implementation for the base
class marshalling routines so that each subsequent LogAccess* class only
has to implement those functions that are to override this default
@@ -88,7 +88,7 @@ LogAccess::marshal_client_host_ip(char *
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -97,7 +97,7 @@ LogAccess::marshal_client_auth_user_name
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -106,7 +106,7 @@ LogAccess::marshal_client_req_text(char
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -115,7 +115,7 @@ LogAccess::marshal_client_req_http_metho
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -124,7 +124,7 @@ LogAccess::marshal_client_req_url(char *
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -133,7 +133,7 @@ LogAccess::marshal_client_req_url_canon(
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -142,7 +142,7 @@ LogAccess::marshal_client_req_unmapped_u
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -151,7 +151,7 @@ LogAccess::marshal_client_req_unmapped_u
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -160,7 +160,7 @@ LogAccess::marshal_client_req_url_path(c
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -169,7 +169,7 @@ LogAccess::marshal_client_req_url_scheme
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
This case is special because it really stores 2 ints.
-------------------------------------------------------------------------*/
@@ -185,7 +185,7 @@ LogAccess::marshal_client_req_http_versi
return (2 * MIN_ALIGN);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -194,7 +194,7 @@ LogAccess::marshal_client_req_header_len
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -203,7 +203,7 @@ LogAccess::marshal_client_req_body_len(c
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -212,7 +212,7 @@ LogAccess::marshal_client_finish_status_
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -221,7 +221,7 @@ LogAccess::marshal_client_gid(char *buf)
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -230,7 +230,7 @@ LogAccess::marshal_client_accelerator_id
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -239,7 +239,7 @@ LogAccess::marshal_proxy_resp_content_ty
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -248,7 +248,7 @@ LogAccess::marshal_proxy_resp_squid_len(
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -257,7 +257,7 @@ LogAccess::marshal_proxy_resp_content_le
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -266,7 +266,7 @@ LogAccess::marshal_proxy_resp_status_cod
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -275,7 +275,7 @@ LogAccess::marshal_proxy_resp_header_len
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -284,7 +284,7 @@ LogAccess::marshal_proxy_resp_origin_byt
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -293,7 +293,7 @@ LogAccess::marshal_proxy_resp_cache_byte
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -302,7 +302,7 @@ LogAccess::marshal_proxy_finish_status_c
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -311,7 +311,7 @@ LogAccess::marshal_cache_result_code(cha
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -320,7 +320,7 @@ LogAccess::marshal_proxy_req_header_len(
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -329,7 +329,7 @@ LogAccess::marshal_proxy_req_body_len(ch
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -338,7 +338,7 @@ LogAccess::marshal_proxy_req_server_name
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -347,7 +347,7 @@ LogAccess::marshal_proxy_req_server_ip(c
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -367,7 +367,7 @@ LogAccess::marshal_client_retry_after_ti
}
#endif
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -386,7 +386,7 @@ LogAccess::marshal_proxy_host_name(char
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -407,7 +407,7 @@ LogAccess::marshal_proxy_host_ip(char *b
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -416,7 +416,7 @@ LogAccess::marshal_server_host_ip(char *
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -425,7 +425,7 @@ LogAccess::marshal_server_host_name(char
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -434,7 +434,7 @@ LogAccess::marshal_server_resp_status_co
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -443,7 +443,7 @@ LogAccess::marshal_server_resp_content_l
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -452,7 +452,7 @@ LogAccess::marshal_server_resp_header_le
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
This case is special because it really stores 2 ints.
-------------------------------------------------------------------------*/
@@ -480,7 +480,7 @@ LogAccess::marshal_cache_write_transform
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -495,7 +495,7 @@ LogAccess::marshal_transfer_time_s(char
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -504,7 +504,7 @@ LogAccess::marshal_bandwidth(char *buf)
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -513,7 +513,7 @@ LogAccess::marshal_file_size(char *buf)
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_time_to_first_client_byte_ms(char *buf)
@@ -521,7 +521,7 @@ LogAccess::marshal_time_to_first_client_
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_stream_type(char *buf)
@@ -529,7 +529,7 @@ LogAccess::marshal_stream_type(char *buf
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_external_plugin_transaction_id(char *buf)
@@ -537,7 +537,7 @@ LogAccess::marshal_external_plugin_trans
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
//MIXT SDK_VER_2
int
@@ -548,7 +548,7 @@ LogAccess::marshal_external_plugin_strin
//MIXT SDK_VER_2
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_stream_duration_ms(char *buf)
@@ -556,7 +556,7 @@ LogAccess::marshal_stream_duration_ms(ch
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_dns_name(char *buf)
@@ -564,7 +564,7 @@ LogAccess::marshal_client_dns_name(char
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_os(char *buf)
@@ -572,7 +572,7 @@ LogAccess::marshal_client_os(char *buf)
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_os_version(char *buf)
@@ -580,7 +580,7 @@ LogAccess::marshal_client_os_version(cha
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_cpu(char *buf)
@@ -588,7 +588,7 @@ LogAccess::marshal_client_cpu(char *buf)
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_player_version(char *buf)
@@ -596,7 +596,7 @@ LogAccess::marshal_client_player_version
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_player_language(char *buf)
@@ -604,7 +604,7 @@ LogAccess::marshal_client_player_languag
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_user_agent(char *buf)
@@ -612,7 +612,7 @@ LogAccess::marshal_client_user_agent(cha
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_referer_url(char *buf)
@@ -620,7 +620,7 @@ LogAccess::marshal_referer_url(char *buf
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_audio_codec(char *buf)
@@ -628,7 +628,7 @@ LogAccess::marshal_audio_codec(char *buf
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_video_codec(char *buf)
@@ -636,7 +636,7 @@ LogAccess::marshal_video_codec(char *buf
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_bytes_received(char *buf)
@@ -644,7 +644,7 @@ LogAccess::marshal_client_bytes_received
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_pkts_received(char *buf)
@@ -652,7 +652,7 @@ LogAccess::marshal_client_pkts_received(
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_lost_pkts(char *buf)
@@ -660,7 +660,7 @@ LogAccess::marshal_client_lost_pkts(char
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_lost_net_pkts(char *buf)
@@ -668,7 +668,7 @@ LogAccess::marshal_client_lost_net_pkts(
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_lost_continuous_pkts(char *buf)
@@ -676,7 +676,7 @@ LogAccess::marshal_client_lost_continuou
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_pkts_ecc_recover(char *buf)
@@ -684,7 +684,7 @@ LogAccess::marshal_client_pkts_ecc_recov
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_pkts_resent_recover(char *buf)
@@ -692,7 +692,7 @@ LogAccess::marshal_client_pkts_resent_re
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_resend_request(char *buf)
@@ -700,7 +700,7 @@ LogAccess::marshal_client_resend_request
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_buffer_count(char *buf)
@@ -708,7 +708,7 @@ LogAccess::marshal_client_buffer_count(c
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_buffer_ts(char *buf)
@@ -716,7 +716,7 @@ LogAccess::marshal_client_buffer_ts(char
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_client_quality_per(char *buf)
@@ -724,7 +724,7 @@ LogAccess::marshal_client_quality_per(ch
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
LogAccess::marshal_http_header_field(LogField::Container container, char *field, char *buf)
@@ -733,7 +733,7 @@ LogAccess::marshal_http_header_field(Log
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -742,12 +742,12 @@ LogAccess::marshal_http_header_field_esc
DEFAULT_STR_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
The following functions have a non-virtual base-class implementation.
-------------------------------------------------------------------------*/
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::marshal_client_req_timestamp_sec
This does nothing because the timestamp is already in the LogEntryHeader.
@@ -761,7 +761,7 @@ LogAccess::marshal_client_req_timestamp_
DEFAULT_INT_FIELD;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -774,7 +774,7 @@ LogAccess::marshal_entry_type(char *buf)
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -787,7 +787,7 @@ LogAccess::marshal_config_int_var(char *
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -960,11 +960,11 @@ LogAccess::marshal_record(char *record,
return max_chars;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
The following functions are helper functions for the LogAccess* classes
-------------------------------------------------------------------------*/
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::marshal_int
Place the given value into the buffer. Note that the buffer needs to be
@@ -991,7 +991,7 @@ LogAccess::marshal_int_no_byte_order_con
}
#endif
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::marshal_str
Copy the given string to the destination buffer, including the trailing
@@ -1023,7 +1023,7 @@ LogAccess::marshal_str(char *dest, const
#endif
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::marshal_mem
This is a version of marshal_str that works with unterminated strings.
@@ -1085,7 +1085,7 @@ LogAccess::unmarshal_with_map(LOG_INT co
return codeStrLen;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::unmarshal_int
Return the integer pointed at by the buffer and advance the buffer
@@ -1104,7 +1104,7 @@ LOG_INT LogAccess::unmarshal_int(char **
return val;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
unmarshal_itoa
This routine provides a fast conversion from a binary int to a string.
@@ -1137,7 +1137,7 @@ LOG_INT LogAccess::unmarshal_itoa(LOG_IN
return (int) (dest - p);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
unmarshal_itox
This routine provides a fast conversion from a binary int to a hex string.
@@ -1165,7 +1165,7 @@ LOG_INT LogAccess::unmarshal_itox(LOG_IN
return (int) (dest - p);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::unmarshal_int_to_str
Return the string representation of the integer pointed at by buf.
@@ -1188,7 +1188,7 @@ LogAccess::unmarshal_int_to_str(char **b
return -1;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::unmarshal_int_to_str_hex
Return the string representation (hexadecimal) of the integer pointed at by buf.
@@ -1213,7 +1213,7 @@ LogAccess::unmarshal_int_to_str_hex(char
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::unmarshal_str
Retrieve the string from the location pointed at by the buffer and
@@ -1252,7 +1252,7 @@ LogAccess::unmarshal_ttmsf(char **buf, c
return val_len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::unmarshal_http_method
Retrieve the int pointed at by the buffer and treat as an HttpMethod
@@ -1266,7 +1266,7 @@ LogAccess::unmarshal_http_method (char *
return unmarshal_str (buf, dest, len);
}
*/
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::unmarshal_http_version
The http version is marshalled as two consecutive integers, the first for
@@ -1309,7 +1309,7 @@ LogAccess::unmarshal_http_version(char *
return -1;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::unmarshal_http_text
The http text is simply the fields http_method (cqhm) + url (cqu) +
@@ -1345,7 +1345,7 @@ LogAccess::unmarshal_http_text(char **bu
return res1 + res2 + res3 + 2;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::unmarshal_http_status
An http response status code (pssc,sssc) is just an INT, but it's always
@@ -1370,7 +1370,7 @@ LogAccess::unmarshal_http_status(char **
return -1;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::unmarshal_ip
Retrieve the int pointed at by the buffer and treat as an IP address.
@@ -1388,7 +1388,7 @@ LogAccess::unmarshal_ip(char **buf, char
return (LogAccess::unmarshal_with_map(unmarshal_int(buf), dest, len, map));
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::unmarshal_hierarchy
Retrieve the int pointed at by the buffer and treat as a
@@ -1407,7 +1407,7 @@ LogAccess::unmarshal_hierarchy(char **bu
return (LogAccess::unmarshal_with_map(unmarshal_int(buf), dest, len, map, "INVALID_CODE"));
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::unmarshal_finish_status
Retrieve the int pointed at by the buffer and treat as a finish code.
@@ -1426,7 +1426,7 @@ LogAccess::unmarshal_finish_status(char
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::unmarshal_cache_code
Retrieve the int pointed at by the buffer and treat as a SquidLogCode.
@@ -1444,7 +1444,7 @@ LogAccess::unmarshal_cache_code(char **b
return (LogAccess::unmarshal_with_map(unmarshal_int(buf), dest, len, map, "ERROR_UNKNOWN"));
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::unmarshal_entry_type
-------------------------------------------------------------------------*/
@@ -1485,7 +1485,7 @@ LogAccess::unmarshal_record(char **buf,
return -1;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
resolve_logfield_string
This function resolves the given custom log format string using the given
Modified: trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccess.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccess.h?rev=943951&r1=943950&r2=943951&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccess.h (original)
+++ trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccess.h Thu May 13 17:43:56 2010
@@ -24,7 +24,7 @@
/***************************************************************************
Logging - LogAccess.h
-
+
***************************************************************************/
#if !defined (INK_NO_LOG)
#ifndef LOG_ACCESS_H
@@ -32,12 +32,12 @@
#include "inktomi++.h"
#include "LogField.h"
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess
This class defines the logging system interface for extracting
information required to process a log entry. This accessor is
- implemented as an abstract base class with virtual functions for
+ implemented as an abstract base class with virtual functions for
accessing the data based on the derived class.
NOTE that some accessors are declared non-virtual, meaning that they
@@ -45,7 +45,7 @@
OVERRIDDEN. This is used for fields that are already part of the
LogEntryHeader, and thus do not need to be marshalled. So, these
functions do nothing and return 0.
-
+
Each function has the ability to marshal its data into a buffer that is
provided, and return the number of bytes that were marshalled. In the
absence of a marshalling buffer, the routines will simply return the
@@ -54,9 +54,9 @@
movement.
Logging deals with values of just two possible data types: integers
- (including enum) and strings. Because the integers are multi-byte
- values that might need special alignment needs when being marshalled,
- this base class provides a static member function called marshal_int()
+ (including enum) and strings. Because the integers are multi-byte
+ values that might need special alignment needs when being marshalled,
+ this base class provides a static member function called marshal_int()
that handles this (including checking for a NULL buffer). The template
for implementing integer and enum marshalling routines is:
@@ -246,7 +246,7 @@ public:
inkcoreapi virtual int marshal_stream_duration_ms(char *); // INT
// streaming media fields
- //
+ //
inkcoreapi virtual int marshal_client_dns_name(char *); // STR
inkcoreapi virtual int marshal_client_os(char *); // STR
inkcoreapi virtual int marshal_client_os_version(char *); // STR
@@ -274,23 +274,23 @@ public:
inkcoreapi virtual int marshal_http_header_field(LogField::Container container, char *field, char *buf);
inkcoreapi virtual int marshal_http_header_field_escapify(LogField::Container container, char *field, char *buf);
- //
+ //
// named records.config int variables
//
int marshal_config_int_var(char *config_var, char *buf);
- //
+ //
// named records.config string variables
//
int marshal_config_str_var(char *config_var, char *buf);
- //
+ //
// generic record access
//
int marshal_record(char *record, char *buf);
//
- // unmarshalling routines
+ // unmarshalling routines
//
// They used to return a string; now they unmarshal directly into the
// destination buffer supplied.
@@ -343,7 +343,7 @@ LogAccess::round_strlen(int len)
return LOG_ACCESS_ROUND_TO(len, MIN_ALIGN);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccess::strlen
Take trailing null and alignment padding into account. This makes sure
@@ -372,7 +372,7 @@ LogAccess::marshal_int_no_byte_order_con
*((LOG_INT *) dest) = source;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
resolve_logfield_string
This external function takes a format string and a LogAccess context and
Modified: trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessHttp.cc?rev=943951&r1=943950&r2=943951&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessHttp.cc (original)
+++ trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessHttp.cc Thu May 13 17:43:56 2010
@@ -28,7 +28,7 @@
implements the accessor functions using information about an Http state
machine.
-
+
***************************************************************************/
#include "ink_unused.h"
@@ -43,7 +43,7 @@
#include "LogConfig.h"
#include "Log.h"
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccessHttp
Initialize the private data members and assert that we got a valid state
@@ -59,7 +59,7 @@ m_client_req_url_path_len(0), m_proxy_re
ink_assert(m_http_sm != NULL);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccessHttp::~LogAccessHttp
Deallocate space for any strings allocated in the init routine.
@@ -69,7 +69,7 @@ LogAccessHttp::~LogAccessHttp()
{
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccessHttp::init
Build some strings that will come in handy for processing later, such as
@@ -126,7 +126,7 @@ LogAccessHttp::init()
}
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
The marshalling routines ...
We know that m_http_sm is a valid pointer (we assert so in the ctor), but
@@ -134,7 +134,7 @@ LogAccessHttp::init()
routines.
-------------------------------------------------------------------------*/
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -149,7 +149,7 @@ LogAccessHttp::marshal_client_host_ip(ch
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
user authenticated to the proxy (RFC931)
-------------------------------------------------------------------------*/
@@ -233,7 +233,7 @@ LogAccessHttp::validate_unmapped_url_pat
}
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
This is the method, url, and version all rolled into one. Use the
respective marshalling routines to do the job.
-------------------------------------------------------------------------*/
@@ -253,7 +253,7 @@ LogAccessHttp::marshal_client_req_text(c
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -267,8 +267,8 @@ LogAccessHttp::marshal_client_req_http_m
str = (char *) m_client_request->method_get(&alen);
// calculate the the padded length only if the actual length
- // is not zero. We don't want the padded length to be zero
- // because marshal_mem should write the DEFAULT_STR to the
+ // is not zero. We don't want the padded length to be zero
+ // because marshal_mem should write the DEFAULT_STR to the
// buffer if str is nil, and we need room for this.
//
if (alen) {
@@ -281,7 +281,7 @@ LogAccessHttp::marshal_client_req_http_m
return plen;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -295,7 +295,7 @@ LogAccessHttp::marshal_client_req_url(ch
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -310,7 +310,7 @@ LogAccessHttp::marshal_client_req_url_ca
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -327,7 +327,7 @@ LogAccessHttp::marshal_client_req_unmapp
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -367,8 +367,8 @@ LogAccessHttp::marshal_client_req_url_sc
str = (char *) m_url->scheme_get(&alen);
// calculate the the padded length only if the actual length
- // is not zero. We don't want the padded length to be zero
- // because marshal_mem should write the DEFAULT_STR to the
+ // is not zero. We don't want the padded length to be zero
+ // because marshal_mem should write the DEFAULT_STR to the
// buffer if str is nil, and we need room for this.
//
if (alen) {
@@ -383,7 +383,7 @@ LogAccessHttp::marshal_client_req_url_sc
return plen;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
For this one we're going to marshal two INTs, one the first representing
the major number and the second representing the minor.
-------------------------------------------------------------------------*/
@@ -405,7 +405,7 @@ LogAccessHttp::marshal_client_req_http_v
return (2 * MIN_ALIGN);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -421,7 +421,7 @@ LogAccessHttp::marshal_client_req_header
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -458,7 +458,7 @@ LogAccessHttp::marshal_client_finish_sta
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -471,7 +471,7 @@ LogAccessHttp::marshal_proxy_resp_conten
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
Squid returns the content-length + header length as the total length.
-------------------------------------------------------------------------*/
@@ -485,7 +485,7 @@ LogAccessHttp::marshal_proxy_resp_squid_
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -498,7 +498,7 @@ LogAccessHttp::marshal_proxy_resp_conten
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -526,7 +526,7 @@ LogAccessHttp::marshal_proxy_resp_status
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -573,7 +573,7 @@ LogAccessHttp::marshal_proxy_finish_stat
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -586,7 +586,7 @@ LogAccessHttp::marshal_cache_result_code
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -602,7 +602,7 @@ LogAccessHttp::marshal_proxy_req_header_
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -650,7 +650,7 @@ LogAccessHttp::marshal_proxy_req_server_
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -663,7 +663,7 @@ LogAccessHttp::marshal_proxy_hierarchy_r
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -685,7 +685,7 @@ LogAccessHttp::marshal_server_host_ip(ch
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -718,7 +718,7 @@ LogAccessHttp::marshal_server_host_name(
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -756,7 +756,7 @@ LogAccessHttp::marshal_client_accelerato
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -774,7 +774,7 @@ LogAccessHttp::marshal_server_resp_statu
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -790,7 +790,7 @@ LogAccessHttp::marshal_server_resp_conte
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -894,7 +894,7 @@ LogAccessHttp::marshal_cache_write_trans
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -921,7 +921,7 @@ LogAccessHttp::marshal_transfer_time_s(c
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
Modified: trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessHttp.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessHttp.h?rev=943951&r1=943950&r2=943951&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessHttp.h (original)
+++ trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessHttp.h Thu May 13 17:43:56 2010
@@ -34,10 +34,10 @@
class HttpSM;
class URL;
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccessHttp
- This class extends the logging system interface as implemented by the
+ This class extends the logging system interface as implemented by the
HttpStateMachineGet class.
-------------------------------------------------------------------------*/
@@ -119,7 +119,7 @@ public:
virtual int marshal_transfer_time_ms(char *); // INT
virtual int marshal_transfer_time_s(char *); // INT
- //
+ //
// named fields from within a http header
//
virtual int marshal_http_header_field(LogField::Container container, char *field, char *buf);
Modified: trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessICP.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessICP.cc?rev=943951&r1=943950&r2=943951&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessICP.cc (original)
+++ trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessICP.cc Thu May 13 17:43:56 2010
@@ -29,7 +29,7 @@
relevant to ICP logging, and for those we simply return a default value
(NULL strings, 0 values).
-
+
***************************************************************************/
#ifndef TS_MICRO
#include "inktomi++.h"
@@ -40,7 +40,7 @@
#include "LogAccessICP.h"
#include "LogUtils.h"
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccessICP
-------------------------------------------------------------------------*/
@@ -50,7 +50,7 @@ LogAccessICP::LogAccessICP(ICPlog * icp_
ink_assert(m_icp_log != NULL);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccessICP::~LogAccessICP
-------------------------------------------------------------------------*/
@@ -58,11 +58,11 @@ LogAccessICP::~LogAccessICP()
{
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
The marshalling routines ...
-------------------------------------------------------------------------*/
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -76,7 +76,7 @@ LogAccessICP::marshal_client_host_ip(cha
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -90,7 +90,7 @@ LogAccessICP::marshal_client_auth_user_n
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -108,7 +108,7 @@ LogAccessICP::marshal_client_req_text(ch
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -123,7 +123,7 @@ LogAccessICP::marshal_client_req_http_me
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -137,7 +137,7 @@ LogAccessICP::marshal_client_req_url(cha
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -159,7 +159,7 @@ LogAccessICP::marshal_client_req_url_can
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -179,7 +179,7 @@ LogAccessICP::marshal_proxy_resp_content
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -192,7 +192,7 @@ LogAccessICP::marshal_proxy_resp_squid_l
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -205,7 +205,7 @@ LogAccessICP::marshal_proxy_resp_content
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -218,7 +218,7 @@ LogAccessICP::marshal_proxy_resp_status_
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -231,7 +231,7 @@ LogAccessICP::marshal_cache_result_code(
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -244,7 +244,7 @@ LogAccessICP::marshal_proxy_hierarchy_ro
return MIN_ALIGN;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -258,7 +258,7 @@ LogAccessICP::marshal_server_host_name(c
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
Modified: trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessICP.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessICP.h?rev=943951&r1=943950&r2=943951&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessICP.h (original)
+++ trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessICP.h Thu May 13 17:43:56 2010
@@ -30,10 +30,10 @@
class ICPlog;
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccessICP
- This class extends the logging system interface as implemented by the
+ This class extends the logging system interface as implemented by the
ICPlog class.
-------------------------------------------------------------------------*/
Modified: trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessTest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessTest.cc?rev=943951&r1=943950&r2=943951&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessTest.cc (original)
+++ trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessTest.cc Thu May 13 17:43:56 2010
@@ -24,11 +24,11 @@
/***************************************************************************
LogAccessTest.cc
-
+
***************************************************************************/
#include "ink_unused.h"
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
Ok, the name of the game here is to generate 'random' data, with strings
of varying length, so that we can use these accessor objects to test the
hell out the logging system without relying on the rest of the proxy to
@@ -43,25 +43,25 @@
#include <stdio.h>
#include "LogAccessTest.h"
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
LogAccessTest::LogAccessTest()
{
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
LogAccessTest::~LogAccessTest()
{
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
The marshalling routines ...
-------------------------------------------------------------------------*/
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -74,7 +74,7 @@ LogAccessTest::marshal_client_host_ip(ch
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -88,7 +88,7 @@ LogAccessTest::marshal_client_auth_user_
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -102,7 +102,7 @@ LogAccessTest::marshal_client_req_text(c
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -115,7 +115,7 @@ LogAccessTest::marshal_client_req_http_m
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -129,7 +129,7 @@ LogAccessTest::marshal_client_req_url(ch
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -142,7 +142,7 @@ LogAccessTest::marshal_client_req_http_v
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -155,7 +155,7 @@ LogAccessTest::marshal_client_req_header
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -168,7 +168,7 @@ LogAccessTest::marshal_client_req_body_l
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -181,7 +181,7 @@ LogAccessTest::marshal_client_finish_sta
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -195,7 +195,7 @@ LogAccessTest::marshal_proxy_resp_conten
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -208,7 +208,7 @@ LogAccessTest::marshal_proxy_resp_squid_
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -221,7 +221,7 @@ LogAccessTest::marshal_proxy_resp_conten
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -234,7 +234,7 @@ LogAccessTest::marshal_proxy_resp_status
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -247,7 +247,7 @@ LogAccessTest::marshal_proxy_resp_header
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -260,7 +260,7 @@ LogAccessTest::marshal_proxy_finish_stat
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -273,7 +273,7 @@ LogAccessTest::marshal_cache_result_code
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -286,7 +286,7 @@ LogAccessTest::marshal_proxy_req_header_
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -299,7 +299,7 @@ LogAccessTest::marshal_proxy_req_body_le
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -312,7 +312,7 @@ LogAccessTest::marshal_proxy_hierarchy_r
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -325,7 +325,7 @@ LogAccessTest::marshal_server_host_ip(ch
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -339,7 +339,7 @@ LogAccessTest::marshal_server_host_name(
return len;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -352,7 +352,7 @@ LogAccessTest::marshal_server_resp_statu
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -365,7 +365,7 @@ LogAccessTest::marshal_server_resp_conte
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -378,7 +378,7 @@ LogAccessTest::marshal_server_resp_heade
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
@@ -391,7 +391,7 @@ LogAccessTest::marshal_transfer_time_ms(
return sizeof(LOG_INT);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
int
Modified: trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessTest.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessTest.h?rev=943951&r1=943950&r2=943951&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessTest.h (original)
+++ trafficserver/traffic/tags/2.1.0/proxy/logging/LogAccessTest.h Thu May 13 17:43:56 2010
@@ -28,7 +28,7 @@
#include "LogAccess.h"
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogAccessTest
This class is used to test the logging system standalone from the proxy
@@ -91,7 +91,7 @@ public:
//
virtual int marshal_transfer_time_ms(char *); // INT
- //
+ //
// named fields from within a http header
//
virtual int marshal_http_header_field(char *header_symbol, char *field, char *buf);
Modified: trafficserver/traffic/tags/2.1.0/proxy/logging/LogBuffer.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.0/proxy/logging/LogBuffer.cc?rev=943951&r1=943950&r2=943951&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.0/proxy/logging/LogBuffer.cc (original)
+++ trafficserver/traffic/tags/2.1.0/proxy/logging/LogBuffer.cc Thu May 13 17:43:56 2010
@@ -28,7 +28,7 @@
for recording log entries. See the header file LogBuffer.h for more
information on the structure of a LogBuffer.
-
+
***************************************************************************/
#include "inktomi++.h"
@@ -200,9 +200,9 @@ iObject::operator delete(void *p)
ink_mutex_release(&iObjectMutex);
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
The following LogBufferHeader routines are used to grab strings out from
- the data section using the offsets held in the buffer header.
+ the data section using the offsets held in the buffer header.
-------------------------------------------------------------------------*/
char *
@@ -298,7 +298,7 @@ LogBuffer::LogBuffer(LogObject * owner,
m_expiration_time = LogUtils::timestamp() + Log::config->max_secs_per_buffer;
-// Debug("log2-logbuffer","[%p] Created buffer %u for %s at address %p, size %d",
+// Debug("log2-logbuffer","[%p] Created buffer %u for %s at address %p, size %d",
// this_ethread(), m_id, m_owner->get_base_filename(), m_buffer, (int)size);
}
@@ -313,8 +313,8 @@ LogBuffer::LogBuffer(LogObject * owner,
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
+ // This constructor does not allocate a buffer because it gets it as
+ // an argument. We set m_unaligned_buffer to NULL, which means that
// no checkout writes or checkin writes are allowed. This is enforced
// by the asserts in checkout_write and checkin_write
@@ -326,7 +326,7 @@ LogBuffer::LogBuffer(LogObject * owner,
//
m_id = (inku32) ink_atomic_increment((pvink32) & M_ID, 1);
-// Debug("log2-logbuffer","[%p] Created buffer %u for %s at address %p",
+// Debug("log2-logbuffer","[%p] Created buffer %u for %s at address %p",
// this_ethread(), m_id, m_owner->get_base_filename(), m_buffer);
}
@@ -344,7 +344,7 @@ LogBuffer::~LogBuffer()
m_bb = iLogBufferBuffer::Delete_iLogBufferBuffer(m_bb);
// Debug("log2-logbuffer", "[%p] Deleted buffer %u", this_ethread(), m_id);
}
-// else
+// else
// Debug("log2-logbuffer", "Incorrect signature 0x%08lX inside LogBuffer::~LogBuffer()", sign);
}
@@ -387,7 +387,7 @@ LogBuffer::LB_ResultCode LogBuffer::chec
ret_val = LB_RETRY;
break;
} else {
- // determine what the state would be if nobody changes it
+ // determine what the state would be if nobody changes it
// before we do
if (write_offset) {
@@ -413,7 +413,7 @@ LogBuffer::LB_ResultCode LogBuffer::chec
}
}
} else {
- // this is a request to set the buffer as full
+ // this is a request to set the buffer as full
// (write_offset == NULL)
if (old_s.s.num_entries) {
@@ -437,7 +437,7 @@ LogBuffer::LB_ResultCode LogBuffer::chec
ret_val = LB_BUSY;
} while (--retries);
- // add the entry header to the buffer if this was a real checkout and
+ // add the entry header to the buffer if this was a real checkout and
// the checkout was successful
//
if (write_offset && ret_val == LB_OK) {
@@ -458,7 +458,7 @@ LogBuffer::LB_ResultCode LogBuffer::chec
*write_offset = offset + sizeof(LogEntryHeader);
}
-// Debug("log2-logbuffer","[%p] %s for buffer %u (%s) returning %d",
+// Debug("log2-logbuffer","[%p] %s for buffer %u (%s) returning %d",
// this_ethread(),
// (write_offset ? "checkout_write" : "force_new_buffer"),
// m_id, m_owner->get_base_filename(), ret_val);
@@ -547,7 +547,7 @@ LogBuffer::_add_buffer_header()
m_header->id = lrand48();
#endif // defined(LOG_BUFFER_TRACKING)
- //
+ //
// The remaining header fields actually point into the data section of
// the buffer. Write the data into the buffer and update the total
// size of the buffer header.
@@ -623,7 +623,7 @@ size_t LogBuffer::max_entry_bytes()
return (Log::config->log_buffer_size - sizeof(LogBufferHeader));
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogBuffer::resolve_custom_entry
-------------------------------------------------------------------------*/
@@ -940,7 +940,7 @@ LogBuffer::to_ascii(LogEntryHeader * ent
return ret;
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogBuffer::convert_to_network_order
This routine will convert all of the integer fields in the buffer header
@@ -1000,7 +1000,7 @@ LogBuffer::convert_to_network_order(LogB
header->log_object_signature = ((inku64) sig[1] << 32) | sig[0];
}
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
LogBuffer::convert_to_host_order
This routine will convert all of the integer fields in the buffer header
Modified: trafficserver/traffic/tags/2.1.0/proxy/logging/LogBuffer.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.0/proxy/logging/LogBuffer.h?rev=943951&r1=943950&r2=943951&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.0/proxy/logging/LogBuffer.h (original)
+++ trafficserver/traffic/tags/2.1.0/proxy/logging/LogBuffer.h Thu May 13 17:43:56 2010
@@ -87,13 +87,13 @@ struct LogBufferHeader
unsigned fmt_name_offset; // offset to format name string
unsigned fmt_fieldlist_offset; // offset to format fieldlist string
- unsigned fmt_printf_offset; // offset to format printf string
+ unsigned fmt_printf_offset; // offset to format printf string
unsigned src_hostname_offset; // offset to source (client) hostname
unsigned log_filename_offset; // offset to log filename
- unsigned data_offset; // offset to start of data entry
+ unsigned data_offset; // offset to start of data entry
// section
- // some helper functions to return the header strings
+ // some helper functions to return the header strings
char *fmt_name(); // not used
char *fmt_fieldlist();
@@ -153,7 +153,7 @@ public:
void *operator new(size_t size);
void operator delete(void *p);
- iObject()
+ iObject()
{ /* nop */
}
@@ -314,7 +314,7 @@ private:
volatile LB_State m_state; // buffer state
- int m_max_entries; // max number of entries allowed
+ int m_max_entries; // max number of entries allowed
long m_expiration_time; // buffer expiration time
LogObject *m_owner; // the LogObject that owns this buf.
Modified: trafficserver/traffic/tags/2.1.0/proxy/logging/LogCollationAccept.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.0/proxy/logging/LogCollationAccept.cc?rev=943951&r1=943950&r2=943951&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.0/proxy/logging/LogCollationAccept.cc (original)
+++ trafficserver/traffic/tags/2.1.0/proxy/logging/LogCollationAccept.cc Thu May 13 17:43:56 2010
@@ -21,7 +21,7 @@
limitations under the License.
*/
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
// include files
//-------------------------------------------------------------------------
@@ -32,7 +32,7 @@
#include "LogCollationAccept.h"
#include "LogCollationHostSM.h"
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
// LogCollationAccept::LogCollationAccept
//-------------------------------------------------------------------------
@@ -53,7 +53,7 @@ m_pending_event(NULL)
}
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
// LogCollationAccept::~LogCollationAccept
//-------------------------------------------------------------------------
@@ -87,7 +87,7 @@ LogCollationAccept::~LogCollationAccept(
}
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
// LogCollationAccept::accept_event
//-------------------------------------------------------------------------
Modified: trafficserver/traffic/tags/2.1.0/proxy/logging/LogCollationHostSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.0/proxy/logging/LogCollationHostSM.cc?rev=943951&r1=943950&r2=943951&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.0/proxy/logging/LogCollationHostSM.cc (original)
+++ trafficserver/traffic/tags/2.1.0/proxy/logging/LogCollationHostSM.cc Thu May 13 17:43:56 2010
@@ -87,12 +87,12 @@ m_read_buffer(NULL), m_read_bytes_wanted
}
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
//
// handlers
//
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
@@ -139,13 +139,13 @@ LogCollationHostSM::read_handler(int eve
}
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
//
// host states
//
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
// LogCollationHostSM::host_auth
@@ -200,7 +200,7 @@ LogCollationHostSM::host_auth(int event,
}
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
// LogCollationHostSM::host_done
// next: none
//-------------------------------------------------------------------------
@@ -353,15 +353,15 @@ LogCollationHostSM::host_recv(int event,
}
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
//
// read states
//
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
// LogCollationHostSM::read_start
// next: read_hdr
//-------------------------------------------------------------------------
@@ -380,7 +380,7 @@ LogCollationHostSM::read_start()
}
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
// LogCollationHostSM::read_hdr
// next: read_body || read_done
//-------------------------------------------------------------------------
@@ -434,7 +434,7 @@ LogCollationHostSM::read_hdr(int event,
}
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
// LogCollationHostSM::read_body
// next: read_body || read_done
//-------------------------------------------------------------------------
@@ -490,7 +490,7 @@ LogCollationHostSM::read_body(int event,
}
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
// LogCollationHostSM::read_done
// next: give control back to host state-machine
//-------------------------------------------------------------------------
@@ -504,7 +504,7 @@ LogCollationHostSM::read_done(int event,
}
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
// LogCollationHostSM::read_partial
//-------------------------------------------------------------------------