Update Xray for PNaCl

native_client_sdk/src/libraries/xray/report.c

 /* Copyright (c) 2013 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 /* XRay -- a simple profiler for Native Client */
 
 #include <alloca.h>
 #include <errno.h>
@@ skipping 57 matching lines @@
       float percent = 100.0f * (float)ticks / total;
       if (percent >= percent_cutoff && ticks >= ticks_cutoff) {
         struct XRaySymbol* symbol;
         symbol = XRaySymbolTableLookup(symbols, addr);
         symbol_name = XRaySymbolGetName(symbol);
         if (0 != annotation_index) {
           XRayTraceCopyToString(capture, annotation_index, annotation);
         } else {
           strcpy(annotation, "");
         }
-        fprintf(f, "0x%08X   %10ld     %5.1f     %s%s %s\n",
+        fprintf(f, "0x%08X   %10lld     %5.1f     %s%s %s\n",
                 (unsigned int)addr, (int64_t)ticks, percent,
                 &space[256 - depth], symbol_name, annotation);
       }
     }
     index = XRayTraceNextEntry(capture, index);
   }
   fflush(f);
 }
 
 
@@ skipping 19 matching lines @@
       "Frame#      Total Ticks      Capture size    Annotations   Label\n");
   fprintf(f,
       "--------------------------------------------------------------------\n");
   while (frame != head) {
     int64_t total_ticks = XRayFrameGetTotalTicks(capture, frame);
     int capture_size = XRayFrameGetTraceCount(capture, frame);
     int annotation_count = XRayFrameGetAnnotationCount(capture, frame);
     bool valid = XRayFrameIsValid(capture, frame);
     char label[XRAY_MAX_LABEL];
     XRayFrameMakeLabel(capture, counter, label);
-    fprintf(f, "   %3d %s     %10ld        %10d     %10d   %s\n",
+    fprintf(f, "   %3d %s     %10lld        %10d     %10d   %s\n",
       counter,
       valid ? " " : "*",
       (int64_t)total_ticks,
       capture_size,
       annotation_count,
       label);
     totals[counter].index = counter;
     totals[counter].frame = frame;
     totals[counter].ticks = total_ticks;
     total_capture += capture_size;
@@ skipping 15 matching lines @@
   fprintf(f,
       "--------------------------------------------------------------------\n");
   for (i = 0; i < counter; ++i) {
     int index = totals[i].index;
     int frame = totals[i].frame;
     int64_t total_ticks = XRayFrameGetTotalTicks(capture, frame);
     int capture_size = XRayFrameGetTraceCount(capture, frame);
     int annotation_count = XRayFrameGetAnnotationCount(capture, frame);
     char label[XRAY_MAX_LABEL];
     XRayFrameMakeLabel(capture, index, label);
-    fprintf(f, "   %3d       %10ld        %10d     %10d   %s\n",
+    fprintf(f, "   %3d       %10lld        %10d     %10d   %s\n",
         index,
         (int64_t)total_ticks,
         capture_size,
         annotation_count,
         label);
   }
   fflush(f);
 }
 
 
@@ skipping 17 matching lines @@
     frame = XRayFrameGetNext(capture, frame);
   }
   fprintf(f,
       "====================================================================\n");
 #if defined(XRAY_OUTPUT_HASH_COLLISIONS)
   XRayHashTableHisto(capture, f);
 #endif
   fflush(f);
 }
 
-
 /* Write a profile report to text file. */
 void XRaySaveReport(struct XRayTraceCapture* capture,
                     const char* filename,
                     float percent_cutoff,
                     int ticks_cutoff) {
   FILE* f;
   f = fopen(filename, "wt");
   if (NULL != f) {
     XRayReport(capture, f, percent_cutoff, ticks_cutoff);
     fclose(f);
   }
 }
 
 #endif  // XRAY

[nfullagar1, 2013/07/17 00:53:19]

/* XRAY */

[grosse, 2013/07/17 19:37:56]

Done.