Author: zwoop
Date: Wed Sep 7 02:53:15 2011
New Revision: 1165974
URL: http://svn.apache.org/viewvc?rev=1165974&view=rev
Log:
TS-567 First set of xmalloc -> ats_malloc conversion
Modified:
trafficserver/traffic/trunk/iocore/cache/CacheDir.cc
trafficserver/traffic/trunk/iocore/cache/CacheWrite.cc
trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
trafficserver/traffic/trunk/lib/ts/Resource.cc
trafficserver/traffic/trunk/lib/ts/ink_string.cc
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc
trafficserver/traffic/trunk/proxy/logging/LogAccess.cc
Modified: trafficserver/traffic/trunk/iocore/cache/CacheDir.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CacheDir.cc?rev=1165974&r1=1165973&r2=1165974&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CacheDir.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CacheDir.cc Wed Sep 7 02:53:15
2011
@@ -1096,7 +1096,7 @@ Vol::dir_check(bool fix)
{
NOWARN_UNUSED(fix);
int hist[HIST_DEPTH + 1] = { 0 };
- int *shist = (int*)xmalloc(segments * sizeof(int));
+ int *shist = (int*)ats_malloc(segments * sizeof(int));
memset(shist, 0, segments * sizeof(int));
int j;
int stale = 0, full = 0, empty = 0;
Modified: trafficserver/traffic/trunk/iocore/cache/CacheWrite.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CacheWrite.cc?rev=1165974&r1=1165973&r2=1165974&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CacheWrite.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CacheWrite.cc Wed Sep 7 02:53:15
2011
@@ -1231,7 +1231,7 @@ CacheVC::openWriteCloseDataDone(int even
else {
if (fragment-1 >= INTEGRAL_FRAGS && IS_POWER_2((uint32)(fragment-1))) {
Frag *t = frag;
- frag = (Frag*)xmalloc(sizeof(Frag) * (fragment-1)*2);
+ frag = (Frag*)ats_malloc(sizeof(Frag) * (fragment-1)*2);
memcpy(frag, t, sizeof(Frag) * (fragment-1));
if (t != integral_frags)
xfree(t);
@@ -1333,7 +1333,7 @@ CacheVC::openWriteWriteDone(int event, E
else {
if (fragment-1 >= INTEGRAL_FRAGS &&
IS_POWER_2((uint32_t)(fragment-1))) {
Frag *t = frag;
- frag = (Frag*)xmalloc(sizeof(Frag) * (fragment-1)*2);
+ frag = (Frag*)ats_malloc(sizeof(Frag) * (fragment-1)*2);
memcpy(frag, t, sizeof(Frag) * (fragment-1));
if (t != integral_frags)
xfree(t);
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc?rev=1165974&r1=1165973&r2=1165974&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc Wed Sep 7
02:53:15 2011
@@ -660,8 +660,7 @@ bool ClusterHandler::check_channel(int c
if (local_channel(i)) {
if (i > LAST_DEDICATED_CHANNEL) {
channels[i] = (ClusterVConnection *) 1; // mark as invalid
- channel_data[i] = (struct ChannelData *)
- xmalloc(sizeof(struct ChannelData));
+ channel_data[i] = (struct ChannelData *)ats_malloc(sizeof(struct
ChannelData));
memset(channel_data[i], 0, sizeof(struct ChannelData));
channel_data[i]->channel_number = i;
free_local_channels.enqueue(channel_data[i]);
Modified: trafficserver/traffic/trunk/lib/ts/Resource.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/Resource.cc?rev=1165974&r1=1165973&r2=1165974&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/Resource.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/Resource.cc Wed Sep 7 02:53:15 2011
@@ -36,7 +36,7 @@
void *
operator new(size_t size)
{
- return xmalloc((unsigned int) size);
+ return ats_malloc((unsigned int) size);
}
/*-------------------------------------------------------------------------
@@ -45,7 +45,7 @@ operator new(size_t size)
void operator
delete(void *p)
{
- _xfree(p);
+ ats_free(p);
}
/*-------------------------------------------------------------------------
@@ -53,7 +53,7 @@ delete(void *p)
void *
operator new[] (size_t size)
{
- return xmalloc((unsigned int) size);
+ return ats_malloc((unsigned int) size);
}
/*-------------------------------------------------------------------------
@@ -62,7 +62,7 @@ operator new[] (size_t size)
void
operator delete[] (void *p)
{
- _xfree(p);
+ ats_free(p);
}
#endif /* TRACK_MEMORY */
Modified: trafficserver/traffic/trunk/lib/ts/ink_string.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_string.cc?rev=1165974&r1=1165973&r2=1165974&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_string.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_string.cc Wed Sep 7 02:53:15 2011
@@ -275,8 +275,7 @@ ink_string_mpath(int nstrings, ...)
return e[slash];
} else {
const size_t nsSize = ts + 1;
- p = (ns = (char *) xmalloc(nsSize));
- ink_assert(ns);
+ p = (ns = (char *)ats_malloc(nsSize));
for (i = slash; i < nstrings - 1; i++) {
ink_strncpy(p, e[i], (nsSize - (p - ns)));
p += s[i];
@@ -308,7 +307,7 @@ ink_string_mcopy(char *source)
if (likely(source)) {
const size_t nSize = strlen(source) + 1;
- n = (char *) xmalloc(nSize);
+ n = (char *)ats_malloc(nSize);
ink_strncpy(n, source, nSize);
}
return n;
@@ -353,7 +352,7 @@ ink_string_mjoin(int nstrings, ...)
}
}
const size_t nsSize = ts + 1;
- p = (ns = (char *) xmalloc(nsSize));
+ p = (ns = (char *)ats_malloc(nsSize));
for (i = slash; i < nstrings - 1; i++) {
ink_strncpy(p, e[i], (nsSize - (p - ns)));
p += s[i];
@@ -376,7 +375,8 @@ ink_strndup(const char *str, size_t n)
if (likely(str)) {
size_t len = strlen(str);
- cstr = (char *)xmalloc(len + 1);
+ cstr = (char *)ats_malloc(len + 1);
+ // TODO: TS-567 do we really want to deal with strndup of size 0?
if (cstr == NULL)
return (NULL);
memcpy(cstr, str, len);
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1165974&r1=1165973&r2=1165974&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Wed Sep 7 02:53:15 2011
@@ -750,7 +750,7 @@ FileImpl::fread(void *buf, int length)
if (!m_buf) {
m_bufpos = 0;
m_bufsize = 1024;
- m_buf = (char *) xmalloc(m_bufsize);
+ m_buf = (char *)ats_malloc(m_bufsize);
}
if (m_bufpos < length) {
@@ -803,7 +803,7 @@ FileImpl::fwrite(const void *buf, int le
if (!m_buf) {
m_bufpos = 0;
m_bufsize = 1024;
- m_buf = (char *) xmalloc(m_bufsize);
+ m_buf = (char *)ats_malloc(m_bufsize);
}
p = (const char *) buf;
@@ -1642,7 +1642,8 @@ api_init()
void *
_TSmalloc(size_t size, const char *path)
{
- return _xmalloc(size, path);
+ NOWARN_UNUSED(path);
+ return ats_malloc(size);
}
void *
@@ -1661,7 +1662,7 @@ _TSstrdup(const char *str, int64_t lengt
void
_TSfree(void *ptr)
{
- _xfree(ptr);
+ ats_free(ptr);
}
////////////////////////////////////////////////////////////////////
@@ -2285,11 +2286,7 @@ TSUrlHttpFragmentSet(TSMBuffer bufp, TSM
TSMimeParser
TSMimeParserCreate(void)
{
- TSMimeParser parser;
-
- parser = reinterpret_cast<TSMimeParser>(xmalloc(sizeof(MIMEParser)));
- // TODO: Should remove this when memory allocation can't fail.
- sdk_assert(sdk_sanity_check_mime_parser(parser) == TS_SUCCESS);
+ TSMimeParser parser =
reinterpret_cast<TSMimeParser>(ats_malloc(sizeof(MIMEParser)));
mime_parser_init((MIMEParser *) parser);
return parser;
@@ -3324,11 +3321,7 @@ TSMimeHdrFieldValueDelete(TSMBuffer bufp
TSHttpParser
TSHttpParserCreate(void)
{
- TSHttpParser parser;
-
- // xmalloc should be set to not fail IMO.
- parser = reinterpret_cast<TSHttpParser>(xmalloc(sizeof(HTTPParser)));
- sdk_assert(sdk_sanity_check_http_parser(parser) == TS_SUCCESS);
+ TSHttpParser parser =
reinterpret_cast<TSHttpParser>(ats_malloc(sizeof(HTTPParser)));
http_parser_init((HTTPParser *) parser);
return parser;
@@ -3861,7 +3854,7 @@ TSCacheKeyHostNameSet(TSCacheKey key, co
CacheInfo *i = (CacheInfo *) key;
/* need to make a copy of the hostname. The caller
might deallocate it anytime in the future */
- i->hostname = (char *) xmalloc(host_len);
+ i->hostname = (char *)ats_malloc(host_len);
memcpy(i->hostname, hostname, host_len);
i->len = host_len;
return TS_SUCCESS;
@@ -6817,7 +6810,7 @@ TSMatcherExtractIPRange(char *match_str,
TSMatcherLine
TSMatcherLineCreate(void)
{
- return reinterpret_cast<TSMatcherLine>(xmalloc(sizeof(matcher_line)));
+ return reinterpret_cast<TSMatcherLine>(ats_malloc(sizeof(matcher_line)));
}
void
@@ -6915,7 +6908,7 @@ TSICPCachedReqGet(TSCont contp, TSMBuffe
HdrHeapSDKHandle **handle = &(sm->_cache_req_hdr_heap_handle);
if (*handle == NULL) {
- *handle = (HdrHeapSDKHandle *) xmalloc(sizeof(HdrHeapSDKHandle));
+ *handle = (HdrHeapSDKHandle *)ats_malloc(sizeof(HdrHeapSDKHandle));
(*handle)->m_heap = cached_hdr->m_heap;
}
@@ -6948,7 +6941,7 @@ TSICPCachedRespGet(TSCont contp, TSMBuff
HdrHeapSDKHandle **handle = &(sm->_cache_resp_hdr_heap_handle);
if (*handle == NULL) {
- *handle = (HdrHeapSDKHandle *) xmalloc(sizeof(HdrHeapSDKHandle));
+ *handle = (HdrHeapSDKHandle *)ats_malloc(sizeof(HdrHeapSDKHandle));
(*handle)->m_heap = cached_hdr->m_heap;
}
@@ -7015,11 +7008,7 @@ TSRedirectUrlSet(TSHttpTxn txnp, const c
sm->redirect_url_len = 0;
}
- sm->redirect_url = (char*)xmalloc(url_len + 1);
- // TODO: Should remove this when malloc is guaranteed to fail.
- sdk_assert(sdk_sanity_check_null_ptr((void*)sm->redirect_url) == TS_SUCCESS);
-
-
+ sm->redirect_url = (char*)ats_malloc(url_len + 1);
ink_strncpy(sm->redirect_url, (char*)url, url_len + 1);
sm->redirect_url_len = url_len;
// have to turn redirection on for this transaction if user wants to
redirect to another URL
Modified: trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc?rev=1165974&r1=1165973&r2=1165974&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc Wed Sep 7
02:53:15 2011
@@ -161,7 +161,7 @@ is_inkeylist(char *key, ...)
/**
Cleanup *char[] array - each item in array must be allocated via
- xmalloc or similar "x..." function.
+ ats_malloc or similar "x..." function.
*/
static void
@@ -1347,10 +1347,7 @@ UrlRewrite::BuildTable()
if (unlikely(fromHostLen >= (int) sizeof(fromHost_lower_buf))) {
- if (unlikely((fromHost_lower = (fromHost_lower_ptr = (char *)
xmalloc(fromHostLen + 1))) == NULL)) {
- fromHost_lower = &fromHost_lower_buf[0];
- fromHostLen = (int) (sizeof(fromHost_lower_buf) - 1);
- }
+ fromHost_lower = (fromHost_lower_ptr = (char *)ats_malloc(fromHostLen +
1));
} else {
fromHost_lower = &fromHost_lower_buf[0];
}
Modified: trafficserver/traffic/trunk/proxy/logging/LogAccess.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogAccess.cc?rev=1165974&r1=1165973&r2=1165974&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogAccess.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogAccess.cc Wed Sep 7 02:53:15
2011
@@ -1238,7 +1238,7 @@ LogAccess::unmarshal_record(char **buf,
resolve_logfield_string
This function resolves the given custom log format string using the given
- LogAccess context and returns the resulting string, which is xmalloc'd.
+ LogAccess context and returns the resulting string, which is ats_malloc'd.
The caller is responsible for xfree'ing the return result. If there are
any problems, NULL is returned.
-------------------------------------------------------------------------*/
@@ -1295,9 +1295,9 @@ resolve_logfield_string(LogAccess *conte
Debug("log-resolve", "Marshaling data from LogAccess into buffer ...");
context->init();
unsigned bytes_needed = fields.marshal_len(context);
- char *buf = (char *) xmalloc(bytes_needed);
- ink_assert(buf != NULL);
+ char *buf = (char *) ats_malloc(bytes_needed);
unsigned bytes_used = fields.marshal(context, buf);
+
ink_assert(bytes_needed == bytes_used);
Debug("log-resolve", " %u bytes marshalled", bytes_used);
@@ -1307,7 +1307,7 @@ resolve_logfield_string(LogAccess *conte
// we're not sure how much space it will take when it's unmarshalled.
// So, we'll just guess.
//
- char *result = (char *) xmalloc(8192);
+ char *result = (char *) ats_malloc(8192);
unsigned bytes_resolved = LogBuffer::resolve_custom_entry(&fields,
printf_str, buf, result,
8191,
LogUtils::timestamp(), 0,
LOG_SEGMENT_VERSION);
