diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-01 13:23:50 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-01 13:23:50 -0700 |
| commit | 534874b1a9befd935fcf0eec3a7648308be9464f (patch) | |
| tree | c1ab29db829ef203ebde8c1feb25ce132d45e7cb /src/core/profiling/basic_timers.c | |
| parent | d6c16558b40b723d61039c2bfbf491f90adf3ecb (diff) | |
| parent | 71c77bebea85457c94d2411cb6c71e6da498c3db (diff) | |
Merge branch 'one-read' of github.com:ctiller/grpc into one-read
Conflicts:
src/core/iomgr/tcp_posix.c
src/core/profiling/basic_timers.c
Diffstat (limited to 'src/core/profiling/basic_timers.c')
| -rw-r--r-- | src/core/profiling/basic_timers.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/core/profiling/basic_timers.c b/src/core/profiling/basic_timers.c index b36f4d3902..d89bba7b87 100644 --- a/src/core/profiling/basic_timers.c +++ b/src/core/profiling/basic_timers.c @@ -89,13 +89,8 @@ static void log_report_locked(grpc_timers_log* log) { grpc_timer_entry* entry = &(log->log[i]); fprintf(fp, "GRPC_LAT_PROF "); grpc_precise_clock_print(&entry->tm, fp); -<<<<<<< HEAD:src/core/profiling/timers.c - fprintf(fp, " %p %s %p %s %d\n", (void*)(gpr_intptr)entry->thd, entry->tag, entry->id, entry->file, - entry->line); -======= fprintf(fp, " %p %d %p %s %d\n", (void*)(gpr_intptr)entry->thd, entry->tag, entry->id, entry->file, entry->line); ->>>>>>> 5ae895a5d06fad59a89ce6e8923b1145dea663bd:src/core/profiling/basic_timers.c } /* Now clear out the log */ |