Author: zwoop
Date: Wed Sep 7 18:43:15 2011
New Revision: 1166309
URL: http://svn.apache.org/viewvc?rev=1166309&view=rev
Log:
TS-567 Change existing malloc() calls to use ats_malloc
Modified:
trafficserver/traffic/trunk/example/remap/remap.cc
trafficserver/traffic/trunk/iocore/aio/AIO.cc
trafficserver/traffic/trunk/iocore/cache/Cache.cc
trafficserver/traffic/trunk/iocore/cache/CacheDisk.cc
trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc
trafficserver/traffic/trunk/iocore/net/UnixNet.cc
trafficserver/traffic/trunk/lib/ts/MMH.cc
trafficserver/traffic/trunk/lib/ts/defalloc.h
trafficserver/traffic/trunk/lib/ts/ink_memory.cc
trafficserver/traffic/trunk/lib/ts/ink_unused.h
trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc
trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc
trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc
trafficserver/traffic/trunk/proxy/CoreUtils.cc
trafficserver/traffic/trunk/proxy/ParentSelection.cc
trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc
trafficserver/traffic/trunk/proxy/hdrs/HdrToken.cc
trafficserver/traffic/trunk/proxy/hdrs/HdrUtils.cc
trafficserver/traffic/trunk/proxy/hdrs/load_http_hdr.cc
Modified: trafficserver/traffic/trunk/example/remap/remap.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/remap/remap.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/remap/remap.cc (original)
+++ trafficserver/traffic/trunk/example/remap/remap.cc Wed Sep 7 18:43:15 2011
@@ -87,7 +87,7 @@ remap_entry::remap_entry(int _argc, char
{
int i;
- if (_argc > 0 && _argv && (argv = (char **) malloc(sizeof(char *) * (_argc +
1))) != 0) {
+ if (_argc > 0 && _argv && (argv = (char **)TSmalloc(sizeof(char *) * (_argc
+ 1))) != 0) {
argc = _argc;
for (i = 0; i < argc; i++)
argv[i] = TSstrdup(_argv[i]);
Modified: trafficserver/traffic/trunk/iocore/aio/AIO.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/aio/AIO.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/aio/AIO.cc (original)
+++ trafficserver/traffic/trunk/iocore/aio/AIO.cc Wed Sep 7 18:43:15 2011
@@ -214,7 +214,7 @@ aio_init_fildes(int fildes, int fromAPI
{
char thr_name[MAX_THREAD_NAME_LENGTH];
int i;
- AIO_Reqs *request = (AIO_Reqs *) malloc(sizeof(AIO_Reqs));
+ AIO_Reqs *request = (AIO_Reqs *)ats_malloc(sizeof(AIO_Reqs));
memset(request, 0, sizeof(AIO_Reqs));
Modified: trafficserver/traffic/trunk/iocore/cache/Cache.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Cache.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Cache.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/Cache.cc Wed Sep 7 18:43:15 2011
@@ -1032,7 +1032,7 @@ Vol::init(char *s, off_t blocks, off_t d
dir_skip = ROUND_TO_STORE_BLOCK((dir_skip < START_POS ? START_POS :
dir_skip));
path = xstrdup(s);
const size_t hash_id_size = strlen(s) + 32;
- hash_id = (char *) malloc(hash_id_size);
+ hash_id = (char *)ats_malloc(hash_id_size);
ink_strncpy(hash_id, s, hash_id_size);
const size_t s_size = strlen(s);
snprintf(hash_id + s_size, (hash_id_size - s_size), " %" PRIu64 ":%" PRIu64
"",
@@ -1054,7 +1054,7 @@ Vol::init(char *s, off_t blocks, off_t d
evacuate_size = (int) (len / EVACUATION_BUCKET_SIZE) + 2;
int evac_len = (int) evacuate_size * sizeof(DLL<EvacuationBlock>);
- evacuate = (DLL<EvacuationBlock> *)malloc(evac_len);
+ evacuate = (DLL<EvacuationBlock> *)ats_malloc(evac_len);
memset(evacuate, 0, evac_len);
#if !defined (_WIN32)
@@ -1068,7 +1068,7 @@ Vol::init(char *s, off_t blocks, off_t d
we never free this */
size_t alignment = getpagesize();
size_t mem_to_alloc = vol_dirlen(this) + (alignment - 1);
- raw_dir = (char *) malloc(mem_to_alloc);
+ raw_dir = (char *)ats_malloc(mem_to_alloc);
raw_dir = (char *) align_pointer_forward(raw_dir, alignment);
#endif
@@ -1222,7 +1222,7 @@ Vol::handle_recover_from_data(int event,
recover_pos = start;
}
#if defined(_WIN32)
- io.aiocb.aio_buf = (char *) malloc(RECOVERY_SIZE);
+ io.aiocb.aio_buf = (char *)ats_malloc(RECOVERY_SIZE);
#else
io.aiocb.aio_buf = (char *) valloc(RECOVERY_SIZE);
#endif
Modified: trafficserver/traffic/trunk/iocore/cache/CacheDisk.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CacheDisk.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CacheDisk.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CacheDisk.cc Wed Sep 7 18:43:15
2011
@@ -56,7 +56,7 @@ CacheDisk::open(char *s, off_t blocks, o
num_usable_blocks = (off_t(len * STORE_BLOCK_SIZE) - (start - askip)) >>
STORE_BLOCK_SHIFT;
#if defined(_WIN32)
- header = (DiskHeader *) malloc(header_len);
+ header = (DiskHeader *)ats_malloc(header_len);
#else
header = (DiskHeader *) valloc(header_len);
#endif
Modified: trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc Wed Sep 7 18:43:15
2011
@@ -319,7 +319,7 @@ _zorch_file(void *arg)
char *vals;
if (info) {
- if ((vals = (char *) malloc(MAX_ZORCH_BUFFER)) != NULL) {
+ if ((vals = (char *)ats_malloc(MAX_ZORCH_BUFFER)) != NULL) {
memset(vals, info->val, MAX_ZORCH_BUFFER);
while (info->fsize < info->size) {
amount = MAX_ZORCH_BUFFER;
Modified: trafficserver/traffic/trunk/iocore/net/UnixNet.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNet.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNet.cc Wed Sep 7 18:43:15 2011
@@ -206,7 +206,7 @@ initialize_thread_for_net(EThread *threa
#endif
thread->signal_hook = net_signal_hook_function;
- thread->ep = (EventIO*)malloc(sizeof(EventIO));
+ thread->ep = (EventIO*)ats_malloc(sizeof(EventIO));
thread->ep->type = EVENTIO_ASYNC_SIGNAL;
#if TS_HAS_EVENTFD
thread->ep->start(pd, thread->evfd, 0, EVENTIO_READ);
Modified: trafficserver/traffic/trunk/lib/ts/MMH.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/MMH.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/MMH.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/MMH.cc Wed Sep 7 18:43:15 2011
@@ -489,8 +489,8 @@ main()
uint32_t h[4];
} h;
- xxh = (i4_t *) malloc(4 * sizeof(uint32_t) * TEST_COLLISIONS);
- xf = (double *) malloc(sizeof(double) * TEST_COLLISIONS);
+ xxh = (i4_t *)ats_malloc(4 * sizeof(uint32_t) * TEST_COLLISIONS);
+ xf = (double *)ats_malloc(sizeof(double) * TEST_COLLISIONS);
printf("test collisions\n");
char *sc1 = "http://npdev:19080/1.6664000000/4000";;
@@ -522,13 +522,13 @@ main()
unsigned char *s = (unsigned char *) MMH_x;
int l = sizeof(MMH_x);
- unsigned char *s1 = (unsigned char *) malloc(l + 3);
+ unsigned char *s1 = (unsigned char *)ats_malloc(l + 3);
s1 += 1;
memcpy(s1, s, l);
- unsigned char *s2 = (unsigned char *) malloc(l + 3);
+ unsigned char *s2 = (unsigned char *)ats_malloc(l + 3);
s2 += 2;
memcpy(s2, s, l);
- unsigned char *s3 = (unsigned char *) malloc(l + 3);
+ unsigned char *s3 = (unsigned char *)ats_malloc(l + 3);
s3 += 3;
memcpy(s3, s, l);
Modified: trafficserver/traffic/trunk/lib/ts/defalloc.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/defalloc.h?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/defalloc.h (original)
+++ trafficserver/traffic/trunk/lib/ts/defalloc.h Wed Sep 7 18:43:15 2011
@@ -23,9 +23,11 @@
#ifndef _defalloc_H_
#define _defalloc_H_
+#include "ink_memory.h"
+
class DefaultAlloc { public:
- static void *alloc(int s) { return ::malloc(s); }
- static void free(void *p) { ::free(p); }
+ static void *alloc(int s) { return ats_malloc(s); }
+ static void free(void *p) { ats_free(p); }
};
#endif
Modified: trafficserver/traffic/trunk/lib/ts/ink_memory.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_memory.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_memory.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_memory.cc Wed Sep 7 18:43:15 2011
@@ -133,7 +133,7 @@ ats_memalign(size_t alignment, size_t si
case 4:
case 8:
case 16:
- return malloc(size);
+ return ats_malloc(size);
case 32:
case 64:
case 128:
Modified: trafficserver/traffic/trunk/lib/ts/ink_unused.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_unused.h?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_unused.h (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_unused.h Wed Sep 7 18:43:15 2011
@@ -44,7 +44,6 @@
# define __pure __attribute__ ((pure))
# define __const __attribute__ ((const))
# define __noreturn __attribute__ ((noreturn))
-# define __malloc __attribute__ ((malloc))
# define __must_check __attribute__ ((warn_unused_result))
# define __deprecated __attribute__ ((deprecated))
# define __used __attribute__ ((used))
Modified: trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc (original)
+++ trafficserver/traffic/trunk/lib/wccp/WccpMsg.cc Wed Sep 7 18:43:15 2011
@@ -92,7 +92,7 @@ CacheIdBox&
CacheIdBox::require(size_t n) {
if (m_cap < n) {
if (m_base && m_cap) free(m_base);
- m_base = static_cast<CacheIdElt*>(malloc(n));
+ m_base = static_cast<CacheIdElt*>(ats_malloc(n));
m_cap = n;
}
memset(m_base, 0, m_cap);
@@ -1540,7 +1540,7 @@ detail::Assignment::fill(cache::GroupDat
+ 4096;
if (m_buffer.getSize() < size) {
free(m_buffer.getBase());
- m_buffer.set(malloc(size), size);
+ m_buffer.set(ats_malloc(size), size);
}
m_buffer.reset();
Modified: trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cli/ConfigCmd.cc Wed Sep 7 18:43:15 2011
@@ -225,10 +225,10 @@ Cmd_Config(ClientData clientData, Tcl_In
Tcl_Eval(interp, "info commands config* ");
size_t cmdinfo_len = strlen(Tcl_GetStringResult(interp)) + 2;
- cmdinfo = (char *) malloc(sizeof(char) * cmdinfo_len);
+ cmdinfo = (char *)ats_malloc(sizeof(char) * cmdinfo_len);
ink_strncpy(cmdinfo, Tcl_GetStringResult(interp), cmdinfo_len);
size_t temp_len = strlen(cmdinfo) + 20;
- temp = (char *) malloc(sizeof(char) * temp_len);
+ temp = (char *)ats_malloc(sizeof(char) * temp_len);
ink_strncpy(temp, "lsort \"", temp_len);
strncat(temp, cmdinfo, temp_len - strlen(temp));
strncat(temp, "\"", temp_len - strlen(temp));
Modified: trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cli/ShowCmd.cc Wed Sep 7 18:43:15 2011
@@ -71,10 +71,10 @@ Cmd_Show(ClientData clientData, Tcl_Inte
Tcl_Eval(interp, "info commands show* ");
int cmdinfo_size = sizeof(char) * (strlen(Tcl_GetStringResult(interp)) + 2);
- cmdinfo = (char *) malloc(cmdinfo_size);
+ cmdinfo = (char *)ats_malloc(cmdinfo_size);
ink_strncpy(cmdinfo, Tcl_GetStringResult(interp), cmdinfo_size);
int temp_size = sizeof(char) * (strlen(cmdinfo) + 20);
- temp = (char *) malloc(temp_size);
+ temp = (char *)ats_malloc(temp_size);
ink_strncpy(temp, "lsort \"", temp_size);
strncat(temp, cmdinfo, temp_size - strlen(temp) - 1);
strncat(temp, "\"", temp_size - strlen(temp) - 1);
Modified: trafficserver/traffic/trunk/proxy/CoreUtils.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/CoreUtils.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/CoreUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/CoreUtils.cc Wed Sep 7 18:43:15 2011
@@ -302,7 +302,7 @@ CoreUtils::read_from_core(intptr_t vaddr
else {
if (fseek(fp, offset2 + offset, SEEK_SET) != -1) {
char *frameoff;
- if ((frameoff = (char *) malloc(sizeof(char) * bytes))) {
+ if ((frameoff = (char *)ats_malloc(sizeof(char) * bytes))) {
if (fread(frameoff, bytes, 1, fp) == 1) {
memcpy(buf, frameoff, bytes);
/*for(int j =0; j < bytes; j++) {
@@ -350,7 +350,7 @@ CoreUtils::get_base_frame(intptr_t threa
if (fseek(fp, off + off2, SEEK_SET) != -1) {
char *frameoff;
- if ((frameoff = (char *) malloc(sizeof(char) * sizeof(rwindow)))) {
+ if ((frameoff = (char *)ats_malloc(sizeof(char) * sizeof(rwindow)))) {
if (fread(frameoff, sizeof(rwindow), 1, fp) == 1) {
// memcpy rwindow struct and print out
struct rwindow regs, *r;
@@ -394,7 +394,7 @@ CoreUtils::get_next_frame(core_stack_sta
// seek to the framep offset
if (fseek(fp, off + off2, SEEK_SET) != -1) {
char *frameoff;
- if ((frameoff = (char *) malloc(sizeof(char) * sizeof(rwindow)))) {
+ if ((frameoff = (char *)ats_malloc(sizeof(char) * sizeof(rwindow)))) {
if (fread(frameoff, sizeof(rwindow), 1, fp) == 1) {
// memcpy rwindow struct and print out
@@ -461,7 +461,7 @@ CoreUtils::get_base_frame(intptr_t frame
// seek to the framep offset
if (fseek(fp, off + off2, SEEK_SET) != -1) {
void **frameoff;
- if ((frameoff = (void **) malloc(sizeof(long)))) {
+ if ((frameoff = (void **)ats_malloc(sizeof(long)))) {
if (fread(frameoff, 4, 1, fp) == 1) {
coress->framep = (intptr_t) *frameoff;
if (fread(frameoff, 4, 1, fp) == 1) {
@@ -500,7 +500,7 @@ CoreUtils::get_next_frame(core_stack_sta
// seek to the framep offset
if (fseek(fp, off + off2, SEEK_SET) != -1) {
void **frameoff;
- if ((frameoff = (void **) malloc(sizeof(long)))) {
+ if ((frameoff = (void **)ats_malloc(sizeof(long)))) {
if (fread(frameoff, 4, 1, fp) == 1) {
coress->framep = (intptr_t) *frameoff;
if (*frameoff == NULL) {
@@ -626,7 +626,7 @@ CoreUtils::process_HttpSM(HttpSM * core_
// extracting the HttpSM from the core file
if (last_seen_http_sm != core_ptr) {
- HttpSM *http_sm = (HttpSM *) malloc(sizeof(HttpSM));
+ HttpSM *http_sm = (HttpSM *)ats_malloc(sizeof(HttpSM));
if (read_from_core((intptr_t) core_ptr, sizeof(HttpSM), (char *) http_sm)
< 0) {
// This is not 64-bit correct ... /leif
@@ -703,7 +703,7 @@ CoreUtils::load_http_hdr(HTTPHdr * core_
HTTPHdr *http_hdr = core_hdr;
HdrHeap *heap = (HdrHeap *) core_hdr->m_heap;
HdrHeap *heap_ptr = (HdrHeap *) http_hdr->m_heap;
- char *buf = (char *) malloc(sizeof(char) * sizeof(HdrHeap));
+ char *buf = (char *)ats_malloc(sizeof(char) * sizeof(HdrHeap));
intptr_t ptr_heaps = 0;
intptr_t ptr_heap_size = 0;
intptr_t ptr_xl_size = 2;
@@ -729,9 +729,9 @@ CoreUtils::load_http_hdr(HTTPHdr * core_
heap = heap->m_next;
} while (heap && ((intptr_t) heap != 0x1));
- swizzle_heap = (HdrHeap *) malloc(sizeof(HdrHeap));
+ swizzle_heap = (HdrHeap *)ats_malloc(sizeof(HdrHeap));
live_hdr->m_heap = swizzle_heap;
- ptr_data = (char *) malloc(sizeof(char) * ptr_heap_size);
+ ptr_data = (char *)ats_malloc(sizeof(char) * ptr_heap_size);
//heap = (HdrHeap*)http_hdr->m_heap;
// Build Hdr Heap Translation Table
@@ -798,7 +798,7 @@ CoreUtils::load_http_hdr(HTTPHdr * core_
if (heap->m_read_write_heap) {
HdrStrHeap *hdr = (HdrStrHeap *) heap->m_read_write_heap.m_ptr;
char *copy_start = ((char *) heap->m_read_write_heap.m_ptr) +
sizeof(HdrStrHeap);
- char *str_hdr = (char *) malloc(sizeof(char) * sizeof(HdrStrHeap));
+ char *str_hdr = (char *)ats_malloc(sizeof(char) * sizeof(HdrStrHeap));
if (read_from_core((intptr_t) hdr, sizeof(HdrStrHeap), str_hdr) == -1) {
printf("Cannot read from core\n");
_exit(0);
@@ -971,8 +971,7 @@ CoreUtils::read_heap_header(intptr_t vad
void
CoreUtils::process_EThread(EThread * eth_test)
{
-
- char *buf = (char *) malloc(sizeof(char) * sizeof(EThread));
+ char *buf = (char *)ats_malloc(sizeof(char) * sizeof(EThread));
if (read_from_core((intptr_t) eth_test, sizeof(EThread), buf) != -1) {
EThread *loaded_eth = (EThread *) buf;
@@ -1003,7 +1002,7 @@ print_netstate(NetState * n)
void
CoreUtils::process_NetVC(UnixNetVConnection * nvc_test)
{
- char *buf = (char *) malloc(sizeof(char) * sizeof(UnixNetVConnection));
+ char *buf = (char *)ats_malloc(sizeof(char) * sizeof(UnixNetVConnection));
if (read_from_core((intptr_t) nvc_test, sizeof(UnixNetVConnection), buf) !=
-1) {
UnixNetVConnection *loaded_nvc = (UnixNetVConnection *) buf;
@@ -1120,7 +1119,7 @@ process_core(char *fname)
printf("NOTE\n");
if (fseek(fp, phdr.p_offset, SEEK_SET) != -1) {
Elf32_Nhdr *nhdr, *thdr;
- if ((nhdr = (Elf32_Nhdr *) malloc(sizeof(Elf32_Nhdr) *
phdr.p_filesz))) {
+ if ((nhdr = (Elf32_Nhdr *)ats_malloc(sizeof(Elf32_Nhdr) *
phdr.p_filesz))) {
if (fread(nhdr, phdr.p_filesz, 1, fp) == 1) {
int size = phdr.p_filesz;
int sum = 0;
@@ -1275,7 +1274,7 @@ process_core(char *fname)
if (fseek(fp, phdr.p_offset, SEEK_SET) != -1) {
Elf32_Nhdr *nhdr, *thdr;
- if ((nhdr = (Elf32_Nhdr *) malloc(sizeof(Elf32_Nhdr) *
phdr.p_filesz))) {
+ if ((nhdr = (Elf32_Nhdr *)ats_malloc(sizeof(Elf32_Nhdr) *
phdr.p_filesz))) {
if (fread(nhdr, phdr.p_filesz, 1, fp) == 1) {
int size = phdr.p_filesz;
int sum = 0;
Modified: trafficserver/traffic/trunk/proxy/ParentSelection.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ParentSelection.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ParentSelection.cc (original)
+++ trafficserver/traffic/trunk/proxy/ParentSelection.cc Wed Sep 7 18:43:15
2011
@@ -1299,7 +1299,7 @@ br(HttpRequestData * h, const char *os_h
h->hdr = new HTTPHdr();
h->hdr->create(HTTP_TYPE_REQUEST);
- h->hostname_str = (char *) malloc(hostname_len);
+ h->hostname_str = (char *)ats_malloc(hostname_len);
ink_strncpy(h->hostname_str, os_hostname, hostname_len);
h->xact_start = time(NULL);
h->src_ip = 0;
Modified: trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc (original)
+++ trafficserver/traffic/trunk/proxy/StufferUdpReceiver.cc Wed Sep 7 18:43:15
2011
@@ -302,13 +302,7 @@ main(int argc, char *argv[])
stream_hash_table = new StreamHashTable(257);
- char *pkt_buf = (char *) malloc(UDP_BUF_SIZE);
-
- if (!pkt_buf) {
- perror("malloc()");
- return 0;
- }
-
+ char *pkt_buf = (char *)ats_malloc(UDP_BUF_SIZE);
int fd = socket(PF_INET, SOCK_DGRAM, 0);
struct sockaddr_in saddr;
Modified: trafficserver/traffic/trunk/proxy/hdrs/HdrToken.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/HdrToken.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/HdrToken.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/HdrToken.cc Wed Sep 7 18:43:15 2011
@@ -582,7 +582,7 @@ hdrtoken_init()
heap_size += packed_prefix_str_len;
}
- _hdrtoken_strs_heap_f = (const char *) malloc(heap_size);
+ _hdrtoken_strs_heap_f = (const char *)ats_malloc(heap_size);
_hdrtoken_strs_heap_l = _hdrtoken_strs_heap_f + heap_size - 1;
char *heap_ptr = (char *) _hdrtoken_strs_heap_f;
Modified: trafficserver/traffic/trunk/proxy/hdrs/HdrUtils.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/HdrUtils.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/HdrUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/HdrUtils.cc Wed Sep 7 18:43:15 2011
@@ -167,7 +167,7 @@ int main() {
const char* v = iter.get_first(tests[i], strlen(tests[i]), &len);
while (v) {
- char* str_v = (char*)malloc(len+1);
+ char* str_v = (char*)ats_malloc(len+1);
memcpy(str_v, v, len);
str_v[len] = '\0';
printf ("%s|", str_v);
Modified: trafficserver/traffic/trunk/proxy/hdrs/load_http_hdr.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/load_http_hdr.cc?rev=1166309&r1=1166308&r2=1166309&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/load_http_hdr.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/load_http_hdr.cc Wed Sep 7 18:43:15
2011
@@ -84,7 +84,7 @@ load_string(const char *s, int len, int
copy_from = "<BAD>";
len = strlen(copy_from);
}
- char *r = (char *) malloc(len + 1);
+ char *r = (char *)ats_malloc(len + 1);
memcpy(r, copy_from, len);
r[len] = '\0';
return r;
@@ -211,7 +211,7 @@ load_buffer(int fd, hdr_type h_type)
exit(1);
}
- char *file_buf = (char *) malloc(sizeof(char) * (s_info.st_size + 1));
+ char *file_buf = (char *)ats_malloc(sizeof(char) * (s_info.st_size + 1));
file_buf[s_info.st_size] = '\0';
@@ -258,7 +258,7 @@ load_buffer(int fd, hdr_type h_type)
hdr_size = (num_lines * 16);
heap_load_size = hdr_size;
- char *hdr_heap = (char *) malloc(hdr_size);
+ char *hdr_heap = (char *)ats_malloc(hdr_size);
int bytes_read = 0;
int cur_line = 0;
