diff options
| author | trz <trz> | 2005-10-19 14:32:25 +0000 |
|---|---|---|
| committer | trz <trz> | 2005-10-19 14:32:25 +0000 |
| commit | 707cb4bfb6e6e918dba16021ca0ae29671660d68 (patch) | |
| tree | 1318d16434563d7fe0b490a4530cc3c26da4bd8c /runtime/stpd | |
| parent | 0e1e055939eb528f1d2ec28b47faf6dd12ede0fa (diff) | |
| download | systemtap-steved-707cb4bfb6e6e918dba16021ca0ae29671660d68.tar.gz systemtap-steved-707cb4bfb6e6e918dba16021ca0ae29671660d68.tar.xz systemtap-steved-707cb4bfb6e6e918dba16021ca0ae29671660d68.zip | |
switch to binary TIMESTAMP
Diffstat (limited to 'runtime/stpd')
| -rw-r--r-- | runtime/stpd/ChangeLog | 6 | ||||
| -rw-r--r-- | runtime/stpd/librelay.c | 8 | ||||
| -rw-r--r-- | runtime/stpd/stp_dump.c | 4 | ||||
| -rw-r--r-- | runtime/stpd/stp_merge.c | 6 |
4 files changed, 15 insertions, 9 deletions
diff --git a/runtime/stpd/ChangeLog b/runtime/stpd/ChangeLog index aceee584..01a8ef18 100644 --- a/runtime/stpd/ChangeLog +++ b/runtime/stpd/ChangeLog @@ -1,3 +1,9 @@ +2005-10-19 Tom Zanussi <zanussi@us.ibm.com> + + * librelay.c (merge_output): Switch to binary TIMESTAMP. + * stp_dump.c (main): Switch to binary TIMESTAMP. + * stp_merge.c (main): Switch to binary TIMESTAMP. + 2005-10-14 Tom Zanussi <zanussi@us.ibm.com> PR 1476 diff --git a/runtime/stpd/librelay.c b/runtime/stpd/librelay.c index b884e91d..b173b5d5 100644 --- a/runtime/stpd/librelay.c +++ b/runtime/stpd/librelay.c @@ -506,8 +506,8 @@ int init_stp(const char *relay_filebase, int print_summary) } -/* length of timestamp in output field 0 - TODO: make binary, variable */ -#define TIMESTAMP_SIZE 11 +/* length of timestamp in output field 0 */ +#define TIMESTAMP_SIZE (sizeof(int)) /** * merge_output - merge per-cpu output @@ -530,7 +530,7 @@ static int merge_output(void) return -1; } if (fread (buf, TIMESTAMP_SIZE, 1, fp[i])) - num[i] = strtoul (buf, NULL, 10); + num[i] = *((int *)buf); else num[i] = 0; } @@ -567,7 +567,7 @@ static int merge_output(void) } if (fread (buf, TIMESTAMP_SIZE, 1, fp[j])) - num[j] = strtoul (buf, NULL, 10); + num[j] = *((int *)buf); else num[j] = 0; } while (min); diff --git a/runtime/stpd/stp_dump.c b/runtime/stpd/stp_dump.c index 287d915c..5923a2e1 100644 --- a/runtime/stpd/stp_dump.c +++ b/runtime/stpd/stp_dump.c @@ -31,7 +31,7 @@ static void usage (char *prog) exit(1); } -#define TIMESTAMP_SIZE 11 +#define TIMESTAMP_SIZE (sizeof(int)) int main (int argc, char *argv[]) { @@ -53,7 +53,7 @@ int main (int argc, char *argv[]) int numbytes = 0; if (fread (buf, TIMESTAMP_SIZE, 1, fp)) - seq = strtoul (buf, NULL, 10); + seq = *((int *)buf); else break; diff --git a/runtime/stpd/stp_merge.c b/runtime/stpd/stp_merge.c index ecd9b64a..14cb785b 100644 --- a/runtime/stpd/stp_merge.c +++ b/runtime/stpd/stp_merge.c @@ -31,7 +31,7 @@ static void usage (char *prog) exit(1); } -#define TIMESTAMP_SIZE 11 +#define TIMESTAMP_SIZE (sizeof(int)) #define NR_CPUS 256 int main (int argc, char *argv[]) @@ -64,7 +64,7 @@ int main (int argc, char *argv[]) return -1; } if (fread (buf, TIMESTAMP_SIZE, 1, fp[i])) - num[i] = strtoul (buf, NULL, 10); + num[i] = *((int *)buf); else num[i] = 0; i++; @@ -106,7 +106,7 @@ int main (int argc, char *argv[]) } if (fread (buf, TIMESTAMP_SIZE, 1, fp[j])) - num[j] = strtoul (buf, NULL, 10); + num[j] = *((int *)buf); else num[j] = 0; } while (min); |