Skip to content

TS-4568: Milestones where changed from seconds to milliseconds #725

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
bryancall merged 1 commit into from
Jun 21, 2016
Merged

TS-4568: Milestones where changed from seconds to milliseconds #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions proxy/Milestones.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class TransactionMilestones
* Takes two milestones and returns the difference.
* @param start The start time
* @param end The end time
* @return A double that is the time in seconds
* @return The difference time in milliseconds
*/
int64_t
difference_msec(TSMilestonesType ms_start, TSMilestonesType ms_end) const
Expand All @@ -55,10 +55,16 @@ class TransactionMilestones
return ink_hrtime_to_msec(milestones[ms_end] - milestones[ms_start]);
}

/**
* Takes two milestones and returns the difference.
* @param start The start time
* @param end The end time
* @return A double that is the difference time in seconds
*/
double
difference(TSMilestonesType ms_start, TSMilestonesType ms_end) const
difference_sec(TSMilestonesType ms_start, TSMilestonesType ms_end) const
{
return (double)difference_msec(ms_start, ms_end);
return (double)difference_msec(ms_start, ms_end) / 1000.0;
}

ink_hrtime
Expand Down
30 changes: 15 additions & 15 deletions proxy/http/HttpSM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6949,21 +6949,21 @@ HttpSM::update_stats()
"plugin_total: %.3f",
sm_id, client_ip, t_state.client_info.src_addr.host_order_port(), url_string, status, unique_id_string, redirection_tries,
client_response_body_bytes, fd, t_state.client_info.state, t_state.server_info.state,
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_UA_BEGIN),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_UA_FIRST_READ),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_UA_READ_HEADER_DONE),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_READ_BEGIN),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_READ_END),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_DNS_LOOKUP_BEGIN),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_DNS_LOOKUP_END),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_CONNECT),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_FIRST_READ),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_READ_HEADER_DONE),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_CLOSE),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_UA_CLOSE),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_SM_FINISH),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_PLUGIN_ACTIVE),
milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_PLUGIN_TOTAL));
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_UA_BEGIN),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_UA_FIRST_READ),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_UA_READ_HEADER_DONE),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_READ_BEGIN),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_READ_END),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_DNS_LOOKUP_BEGIN),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_DNS_LOOKUP_END),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_CONNECT),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_FIRST_READ),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_READ_HEADER_DONE),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_CLOSE),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_UA_CLOSE),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_SM_FINISH),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_PLUGIN_ACTIVE),
milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_PLUGIN_TOTAL));
}
}

Expand Down