Use arch page size instead of hard coded 4096

Archs may use different page sizes. We must use the target arch page
size for this instead of just hard coding 4096. This must also be saved
in the data file so that it can be read by the host data.

Also fixed the bigendian routine on the recording side.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>

3 files changed, 43 insertions, 32 deletions

diff --git a/parse-events.h b/parse-events.h
index 9ba633f..c11139d 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -1,12 +1,10 @@
 #ifndef _PARSE_EVENTS_H
 #define _PARSE_EVENTS_H
 
-#ifndef PAGE_SIZE
-#define PAGE_SIZE               4096ULL
-#endif
+extern unsigned int page_size;
 
 #ifndef PAGE_MASK
-#define PAGE_MASK (PAGE_SIZE - 1)
+#define PAGE_MASK (page_size - 1)
 #endif
 
 enum {
@@ -171,6 +169,8 @@ void print_event(int cpu, void *data, int size, unsigned long long nsecs);
 extern int file_bigendian;
 extern int host_bigendian;
 
+int bigendian(void);
+
 static inline unsigned short __data2host2(unsigned short data)
 {
         unsigned short swap;
diff --git a/trace-cmd.c b/trace-cmd.c
index 72f070b..12581bc 100644
--- a/trace-cmd.c
+++ b/trace-cmd.c
@@ -49,6 +49,8 @@
 #define ITER_CTRL       "trace_options"
 #define MAX_LATENCY     "tracing_max_latency"
 
+unsigned int page_size;
+
 static const char *output_file = "trace.dat";
 static int output_fd;
 
@@ -513,7 +515,7 @@ static int create_recorder(int cpu)
         int brass[2];
         int pid;
         int ret;
-        char buf[PAGE_SIZE];
+        char buf[page_size];
 
         pid = fork();
         if (pid < 0)
@@ -547,13 +549,13 @@ static int create_recorder(int cpu)
                 die("can not create pipe");
 
         do {
-                ret = splice(in_fd, NULL, brass[1], NULL, PAGE_SIZE, 1 /* SPLICE_F_MOVE */);
+                ret = splice(in_fd, NULL, brass[1], NULL, page_size, 1 /* SPLICE_F_MOVE */);
                 if (ret < 0) {
                         perror("in");
                         printf("errno=%d\n", errno);
                         die("splice in");
                 }
-                ret = splice(brass[0], NULL, out_fd, NULL, PAGE_SIZE, 3 /* and NON_BLOCK */);
+                ret = splice(brass[0], NULL, out_fd, NULL, page_size, 3 /* and NON_BLOCK */);
                 if (ret < 0 && errno != EAGAIN) {
                         perror("in");
                         printf("errno=%d\n", errno);
@@ -563,7 +565,7 @@ static int create_recorder(int cpu)
 
         /* splice only reads full pages */
         do {
-                ret = read(in_fd, buf, PAGE_SIZE);
+                ret = read(in_fd, buf, page_size);
                 if (ret > 0)
                         write(out_fd, buf, ret);
         } while (ret > 0);
@@ -601,13 +603,13 @@ static ssize_t write_or_die(const void *buf, size_t len)
         return ret;
 }
 
-static int bigendian(void)
+int bigendian(void)
 {
         unsigned char str[] = { 0x1, 0x2, 0x3, 0x4 };
         unsigned int *ptr;
 
         ptr = (unsigned int *)str;
-        return *ptr == 0x1234;
+        return *ptr == 0x01020304;
 }
 
 static unsigned long long copy_file_fd(int fd)
@@ -864,6 +866,7 @@ static void read_tracing_data(void)
 
         write_or_die(VERSION, strlen(VERSION) + 1);
 
+        /* save endian */
         if (bigendian())
                 buf[0] = 1;
         else
@@ -871,9 +874,14 @@ static void read_tracing_data(void)
 
         write_or_die(buf, 1);
 
+        /* save size of long */
         buf[0] = sizeof(long);
         write_or_die(buf, 1);
 
+        /* save page_size */
+        page_size = getpagesize();
+        write_or_die(&page_size, 4);
+
         read_header_files();
         read_ftrace_files();
         read_event_files();
@@ -947,7 +955,7 @@ static void read_thread_data(void)
 
         /* hold any extra data for data */
         offset += cpu_count * (16);
-        offset = (offset + (PAGE_SIZE - 1)) & ~(PAGE_MASK);
+        offset = (offset + (page_size - 1)) & ~(PAGE_MASK);
 
         for (i = 0; i < cpu_count; i++) {
                 file = malloc_or_die(strlen(output_file) + 20);
@@ -959,7 +967,7 @@ static void read_thread_data(void)
                 offsets[i] = offset;
                 sizes[i] = st.st_size;
                 offset += st.st_size;
-                offset = (offset + (PAGE_SIZE - 1)) & ~(PAGE_MASK);
+                offset = (offset + (page_size - 1)) & ~(PAGE_MASK);
 
                 write_or_die(&offsets[i], 8);
                 write_or_die(&sizes[i], 8);
diff --git a/trace-read.c b/trace-read.c
index ffb1374..91054b8 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -48,15 +48,6 @@ static int long_size;
 
 static int filter_cpu = -1;
 
-static int bigendian(void)
-{
-        unsigned char str[] = { 0x1, 0x2, 0x3, 0x4 };
-        unsigned int *ptr;
-
-        ptr = (unsigned int *)str;
-        return *ptr == 0x01020304;
-}
-
 static int read_or_die(void *data, int size)
 {
         int r;
@@ -257,7 +248,7 @@ static void init_read(int cpu)
         off64_t ret;
         off64_t save_seek;
 
-        cpu_data[cpu].page = malloc_or_die(PAGE_SIZE);
+        cpu_data[cpu].page = malloc_or_die(page_size);
 
         /* other parts of the code may expect the pointer to not move */
         save_seek = lseek64(input_fd, 0, SEEK_CUR);
@@ -265,7 +256,7 @@ static void init_read(int cpu)
         ret = lseek64(input_fd, (off64_t)cpu_data[cpu].offset, SEEK_SET);
         if (ret < 0)
                 die("failed to lseek");
-        ret = read(input_fd, cpu_data[cpu].page, PAGE_SIZE);
+        ret = read(input_fd, cpu_data[cpu].page, page_size);
         if (ret < 0)
                 die("failed to read page");
 
@@ -285,7 +276,7 @@ static void init_cpu(int cpu)
                 return;
         }
 
-        cpu_data[cpu].page = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_PRIVATE,
+        cpu_data[cpu].page = mmap(NULL, page_size, PROT_READ, MAP_PRIVATE,
                                   input_fd, cpu_data[cpu].offset);
         if (cpu_data[cpu].page == MAP_FAILED) {
                 /* fall back to just reading pages */
@@ -298,8 +289,8 @@ static void init_cpu(int cpu)
 
 static void update_cpu_data_index(int cpu)
 {
-        cpu_data[cpu].offset += PAGE_SIZE;
-        cpu_data[cpu].size -= PAGE_SIZE;
+        cpu_data[cpu].offset += page_size;
+        cpu_data[cpu].size -= page_size;
         cpu_data[cpu].index = 0;
 }
 
@@ -312,7 +303,7 @@ static void get_next_page(int cpu)
                 return;
 
         if (read_page) {
-                if (cpu_data[cpu].size <= PAGE_SIZE) {
+                if (cpu_data[cpu].size <= page_size) {
                         free(cpu_data[cpu].page);
                         cpu_data[cpu].page = NULL;
                         return;
@@ -326,7 +317,7 @@ static void get_next_page(int cpu)
                 ret = lseek64(input_fd, cpu_data[cpu].offset, SEEK_SET);
                 if (ret < 0)
                         die("failed to lseek");
-                ret = read(input_fd, cpu_data[cpu].page, PAGE_SIZE);
+                ret = read(input_fd, cpu_data[cpu].page, page_size);
                 if (ret < 0)
                         die("failed to read page");
 
@@ -336,15 +327,15 @@ static void get_next_page(int cpu)
                 return;
         }
 
-        munmap(cpu_data[cpu].page, PAGE_SIZE);
+        munmap(cpu_data[cpu].page, page_size);
         cpu_data[cpu].page = NULL;
 
-        if (cpu_data[cpu].size <= PAGE_SIZE)
+        if (cpu_data[cpu].size <= page_size)
                 return;
 
         update_cpu_data_index(cpu);
         
-        cpu_data[cpu].page = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_PRIVATE,
+        cpu_data[cpu].page = mmap(NULL, page_size, PROT_READ, MAP_PRIVATE,
                                   input_fd, cpu_data[cpu].offset);
         if (cpu_data[cpu].page == MAP_FAILED)
                 die("failed to mmap cpu %d at offset 0x%llx",
@@ -571,6 +562,7 @@ void trace_report (int argc, char **argv)
         char *version;
         int show_funcs = 0;
         int show_endian = 0;
+        int show_page_size = 0;
         int c;
 
         if (argc < 2)
@@ -587,7 +579,7 @@ void trace_report (int argc, char **argv)
                         {NULL, 0, NULL, 0}
                 };
 
-                c = getopt_long (argc-1, argv+1, "+hi:fe",
+                c = getopt_long (argc-1, argv+1, "+hi:fep",
                         long_options, &option_index);
                 if (c == -1)
                         break;
@@ -604,6 +596,9 @@ void trace_report (int argc, char **argv)
                 case 'e':
                         show_endian = 1;
                         break;
+                case 'p':
+                        show_page_size = 1;
+                        break;
                 case 0:
                         switch(option_index) {
                         case 0:
@@ -641,6 +636,14 @@ void trace_report (int argc, char **argv)
         read_or_die(buf, 1);
         long_size = buf[0];
 
+        page_size = read4();
+        if (show_page_size) {
+                printf("file page size is %d, and host page size is %d\n",
+                       page_size,
+                       getpagesize());
+                return;
+        }
+
         if (show_endian) {
                 printf("file is %s endian and host is %s endian\n",
                        file_bigendian ? "big" : "little",