Changeset 988 for vendor/current/examples/perfcounter

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/examples/perfcounter

Files:

• Makefile (modified) (1 diff)
• perf_writer_disk.c (modified) (2 diffs)

vendor/current/examples/perfcounter/Makefile

@@ -27 +27 @@
         $(TDB_SRC_DIR)/common/io.o $(TDB_SRC_DIR)/common/lock.o \
         $(TDB_SRC_DIR)/common/open.o $(TDB_SRC_DIR)/common/transaction.o \
-        $(TDB_SRC_DIR)/common/traverse.o
+        $(TDB_SRC_DIR)/common/traverse.o $(TDB_SRC_DIR)/common/hash.o
 PERF_WRITER_OBJ = perf_writer.o perf_writer_mem.o perf_writer_util.o perf_writer_cpu.o perf_writer_process.o perf_writer_disk.o
 

vendor/current/examples/perfcounter/perf_writer_disk.c

@@ -133 +133 @@
         char buf[LARGE_BUF], *start;
         FILE *diskstats;
-        long reads, writes, discard;
+        unsigned long reads, writes, discard;
 
         diskstats = fopen("/proc/diskstats", "r");
@@ -148 +148 @@
                 start = strstr(buf, data->diskInfo.mdata[i].name);
                 start += strlen(data->diskInfo.mdata[i].name) + 1;
-                num = sscanf(start, "%u %u %u %u",
+                num = sscanf(start, "%lu %lu %lu %lu",
                              &reads,
-                             &discard, 
-                             &writes, 
+                             &discard,
+                             &writes,
                              &discard);
                 p->writesPerSec = writes;