projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove stale local .c struct declarations (unused)
[babeltrace.git]
/
converter
/
babeltrace-log.c
diff --git
a/converter/babeltrace-log.c
b/converter/babeltrace-log.c
index 6a5b1cee5b324e65a20525e3fcb2904b54f5bf7e..9ca2b479f398f62dfa42d64e33e011eb556bcf97 100644
(file)
--- a/
converter/babeltrace-log.c
+++ b/
converter/babeltrace-log.c
@@
-3,7
+3,9
@@
*
* BabelTrace - Convert Text Log to CTF
*
*
* BabelTrace - Convert Text Log to CTF
*
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@
-18,6
+20,7
@@
* Depends on glibc 2.10 for getline().
*/
* Depends on glibc 2.10 for getline().
*/
+#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@
-32,7
+35,7
@@
#include <string.h>
#include <endian.h>
#include <string.h>
#include <endian.h>
-#include <babeltrace/babeltrace.h>
+#include <babeltrace/babeltrace
-internal
.h>
#include <babeltrace/ctf/types.h>
#define USEC_PER_SEC 1000000UL
#include <babeltrace/ctf/types.h>
#define USEC_PER_SEC 1000000UL
@@
-50,6
+53,7
@@
static uuid_t s_uuid;
/* Metadata format string */
static const char metadata_fmt[] =
/* Metadata format string */
static const char metadata_fmt[] =
+"/* CTF 1.8 */\n"
"typealias integer { size = 8; align = 8; signed = false; } := uint8_t;\n"
"typealias integer { size = 32; align = 32; signed = false; } := uint32_t;\n"
"\n"
"typealias integer { size = 8; align = 8; signed = false; } := uint8_t;\n"
"typealias integer { size = 32; align = 32; signed = false; } := uint32_t;\n"
"\n"
@@
-87,11
+91,16
@@
static
void print_metadata(FILE *fp)
{
char uuid_str[UUID_STR_LEN];
void print_metadata(FILE *fp)
{
char uuid_str[UUID_STR_LEN];
+ unsigned int major = 0, minor = 0;
+ int ret;
+ ret = sscanf(VERSION, "%u.%u", &major, &minor);
+ if (ret != 2)
+ fprintf(stderr, "[warning] Incorrect babeltrace version format\n.");
uuid_unparse(s_uuid, uuid_str);
fprintf(fp, metadata_fmt,
uuid_unparse(s_uuid, uuid_str);
fprintf(fp, metadata_fmt,
-
BABELTRACE_VERSION_MAJOR
,
-
BABELTRACE_VERSION_MINOR
,
+
major
,
+
minor
,
uuid_str,
BYTE_ORDER == LITTLE_ENDIAN ? "le" : "be",
s_timestamp ? metadata_stream_event_header_timestamp : "");
uuid_str,
BYTE_ORDER == LITTLE_ENDIAN ? "le" : "be",
s_timestamp ? metadata_stream_event_header_timestamp : "");
@@
-243,9
+252,7
@@
void trace_text(FILE *input, int output)
static
void usage(FILE *fp)
{
static
void usage(FILE *fp)
{
- fprintf(fp, "BabelTrace Log Converter %u.%u\n",
- BABELTRACE_VERSION_MAJOR,
- BABELTRACE_VERSION_MINOR);
+ fprintf(fp, "BabelTrace Log Converter %s\n", VERSION);
fprintf(fp, "\n");
fprintf(fp, "Convert for a text log (read from standard input) to CTF.\n");
fprintf(fp, "\n");
fprintf(fp, "\n");
fprintf(fp, "Convert for a text log (read from standard input) to CTF.\n");
fprintf(fp, "\n");
This page took
0.024301 seconds
and
4
git commands to generate.