Skip to content

TS-5061 TS use ats_malloc instead of malloc in log module #1229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zwoop merged 2 commits into from
Dec 4, 2016
Merged

TS-5061 TS use ats_malloc instead of malloc in log module #1229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86eef60
Update LogFile.cc
scw00 Nov 21, 2016
229cea0
TS-5061 TS use ats_malloc instead of malloc in log module
scw00 Nov 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions mgmt/ProcessManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ startProcessManager(void *arg)
return ret;
} /* End startProcessManager */

ProcessManager::ProcessManager(bool rlm) : BaseManager(), require_lm(rlm), local_manager_sockfd(0), cbtable(NULL), max_msgs_in_a_row(1)
ProcessManager::ProcessManager(bool rlm)
: BaseManager(), require_lm(rlm), local_manager_sockfd(0), cbtable(NULL), max_msgs_in_a_row(1)
{
mgmt_signal_queue = create_queue();

Expand All @@ -84,7 +85,7 @@ ProcessManager::reconfigure()
{
bool found;
max_msgs_in_a_row = MAX_MSGS_IN_A_ROW;
timeout = REC_readInteger("proxy.config.process_manager.timeout", &found);
timeout = REC_readInteger("proxy.config.process_manager.timeout", &found);
ink_assert(found);

return;
Expand Down
4 changes: 2 additions & 2 deletions proxy/logging/LogFile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,9 +452,9 @@ LogFile::write_ascii_logbuffer3(LogBufferHeader *buffer_header, const char *alt_
fmt_buf_bytes = 0;

if (m_file_format == LOG_FILE_PIPE) {
ascii_buffer = (char *)malloc(m_max_line_size);
ascii_buffer = (char *)ats_malloc(m_max_line_size);
} else {
ascii_buffer = (char *)malloc(m_ascii_buffer_size);
ascii_buffer = (char *)ats_malloc(m_ascii_buffer_size);
}

// fill the buffer with as many records as possible
Expand Down