* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
- *
- * Depends on glibc 2.10 for getline().
*/
-#define _GNU_SOURCE
-#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/mman.h>
-#include <dirent.h>
+#include <babeltrace/compat/dirent.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <errno.h>
#include <string.h>
#include <inttypes.h>
+#include <glib.h>
+#include <glib/gstdio.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/ctf/types.h>
#include <babeltrace/compat/uuid.h>
#include <babeltrace/compat/utc.h>
+#include <babeltrace/compat/stdio.h>
#include <babeltrace/endian.h>
#define NSEC_PER_USEC 1000UL
ret = sscanf(VERSION, "%u.%u", &major, &minor);
if (ret != 2)
fprintf(stderr, "[warning] Incorrect babeltrace version format\n.");
- babeltrace_uuid_unparse(s_uuid, uuid_str);
+ bt_uuid_unparse(s_uuid, uuid_str);
fprintf(fp, metadata_fmt,
major,
minor,
/* magic */
ctf_dummy_pos(pos, &dummy);
- ctf_align_pos(&dummy, sizeof(uint32_t) * CHAR_BIT);
- ctf_move_pos(&dummy, sizeof(uint32_t) * CHAR_BIT);
+ if (!ctf_align_pos(&dummy, sizeof(uint32_t) * CHAR_BIT))
+ goto error;
+ if (!ctf_move_pos(&dummy, sizeof(uint32_t) * CHAR_BIT))
+ goto error;
assert(!ctf_pos_packet(&dummy));
- ctf_align_pos(pos, sizeof(uint32_t) * CHAR_BIT);
+ if (!ctf_align_pos(pos, sizeof(uint32_t) * CHAR_BIT))
+ goto error;
*(uint32_t *) ctf_get_pos_addr(pos) = 0xC1FC1FC1;
- ctf_move_pos(pos, sizeof(uint32_t) * CHAR_BIT);
+ if (!ctf_move_pos(pos, sizeof(uint32_t) * CHAR_BIT))
+ goto error;
/* uuid */
ctf_dummy_pos(pos, &dummy);
- ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT);
- ctf_move_pos(&dummy, 16 * CHAR_BIT);
+ if (!ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT))
+ goto error;
+ if (!ctf_move_pos(&dummy, 16 * CHAR_BIT))
+ goto error;
assert(!ctf_pos_packet(&dummy));
- ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT);
+ if (!ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT))
+ goto error;
memcpy(ctf_get_pos_addr(pos), uuid, BABELTRACE_UUID_LEN);
- ctf_move_pos(pos, BABELTRACE_UUID_LEN * CHAR_BIT);
+ if (!ctf_move_pos(pos, BABELTRACE_UUID_LEN * CHAR_BIT))
+ goto error;
+ return;
+
+error:
+ fprintf(stderr, "[error] Out of packet bounds when writing packet header\n");
+ abort();
}
static
/* content_size */
ctf_dummy_pos(pos, &dummy);
- ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
- ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
+ if (!ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT))
+ goto error;
+ if (!ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT))
+ goto error;
assert(!ctf_pos_packet(&dummy));
- ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+ if (!ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT))
+ goto error;
*(uint64_t *) ctf_get_pos_addr(pos) = ~0ULL; /* Not known yet */
pos->content_size_loc = (uint64_t *) ctf_get_pos_addr(pos);
- ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+ if (!ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT))
+ goto error;
/* packet_size */
ctf_dummy_pos(pos, &dummy);
- ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
- ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
+ if (!ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT))
+ goto error;
+ if (!ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT))
+ goto error;
assert(!ctf_pos_packet(&dummy));
- ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+ if (!ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT))
+ goto error;
*(uint64_t *) ctf_get_pos_addr(pos) = pos->packet_size;
- ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+ if (!ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT))
+ goto error;
+ return;
+
+error:
+ fprintf(stderr, "[error] Out of packet bounds when writing packet context\n");
+ abort();
}
static
ti.tm_min = min;
ti.tm_sec = sec;
- ep_sec = babeltrace_timegm(&ti);
+ ep_sec = bt_timegm(&ti);
if (ep_sec != (time_t) -1) {
*ts = (uint64_t) ep_sec * NSEC_PER_SEC
+ (uint64_t) msec * NSEC_PER_MSEC;
}
}
/* timestamp */
- ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+ if (!ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT))
+ goto error;
if (!pos->dummy)
*(uint64_t *) ctf_get_pos_addr(pos) = *ts;
- ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT);
+ if (!ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT))
+ goto error;
+ return;
+
+error:
+ fprintf(stderr, "[error] Out of packet bounds when writing event header\n");
+ abort();
}
static
printf_debug("read: %s\n", line);
for (;;) {
+ int packet_filled = 0;
+
ctf_dummy_pos(pos, &dummy);
write_event_header(&dummy, line, &tline, len, &tlen, &ts);
- ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT);
- ctf_move_pos(&dummy, tlen * CHAR_BIT);
- if (ctf_pos_packet(&dummy)) {
+ if (!ctf_align_pos(&dummy, sizeof(uint8_t) * CHAR_BIT))
+ packet_filled = 1;
+ if (!ctf_move_pos(&dummy, tlen * CHAR_BIT))
+ packet_filled = 1;
+ if (packet_filled || ctf_pos_packet(&dummy)) {
ctf_pos_pad_packet(pos);
write_packet_header(pos, s_uuid);
write_packet_context(pos);
}
write_event_header(pos, line, &tline, len, &tlen, &ts);
- ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT);
+ if (!ctf_align_pos(pos, sizeof(uint8_t) * CHAR_BIT))
+ goto error;
memcpy(ctf_get_pos_addr(pos), tline, tlen);
- ctf_move_pos(pos, tlen * CHAR_BIT);
+ if (!ctf_move_pos(pos, tlen * CHAR_BIT))
+ goto error;
+ return;
+
+error:
+ fprintf(stderr, "[error] Out of packet bounds when writing event payload\n");
+ abort();
}
static
struct ctf_stream_pos pos;
ssize_t len;
char *line = NULL, *nl;
- size_t linesize;
+ size_t linesize = 0;
int ret;
memset(&pos, 0, sizeof(pos));
fprintf(stderr, "Error in ctf_init_pos\n");
return;
}
+ ctf_packet_seek(&pos.parent, 0, SEEK_CUR);
write_packet_header(&pos, s_uuid);
write_packet_context(&pos);
for (;;) {
- len = getline(&line, &linesize, input);
+ len = bt_getline(&line, &linesize, input);
if (len < 0)
break;
nl = strrchr(line, '\n');
exit(EXIT_SUCCESS);
}
- ret = mkdir(s_outputname, S_IRWXU|S_IRWXG);
+ ret = g_mkdir(s_outputname, S_IRWXU|S_IRWXG);
if (ret) {
- perror("mkdir");
+ perror("g_mkdir");
goto error;
}
perror("opendir");
goto error_rmdir;
}
- dir_fd = dirfd(dir);
+ dir_fd = bt_dirfd(dir);
if (dir_fd < 0) {
perror("dirfd");
goto error_closedir;
goto error_closemetadatafd;
}
- babeltrace_uuid_generate(s_uuid);
+ bt_uuid_generate(s_uuid);
print_metadata(metadata_fp);
trace_text(stdin, fd);