* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * 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().
*/
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/ctf/types.h>
-#include <babeltrace/uuid.h>
+#include <babeltrace/compat/uuid.h>
#include <babeltrace/endian.h>
#define USEC_PER_SEC 1000000UL
ctf_align_pos(&dummy, sizeof(uint32_t) * CHAR_BIT);
ctf_move_pos(&dummy, sizeof(uint32_t) * CHAR_BIT);
assert(!ctf_pos_packet(&dummy));
-
+
ctf_align_pos(pos, sizeof(uint32_t) * CHAR_BIT);
*(uint32_t *) ctf_get_pos_addr(pos) = 0xC1FC1FC1;
ctf_move_pos(pos, sizeof(uint32_t) * CHAR_BIT);
ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
assert(!ctf_pos_packet(&dummy));
-
+
ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT);
*(uint64_t *) ctf_get_pos_addr(pos) = ~0ULL; /* Not known yet */
pos->content_size_loc = (uint64_t *) ctf_get_pos_addr(pos);
ctf_align_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
ctf_move_pos(&dummy, sizeof(uint64_t) * CHAR_BIT);
assert(!ctf_pos_packet(&dummy));
-
+
ctf_align_pos(pos, sizeof(uint64_t) * CHAR_BIT);
*(uint64_t *) ctf_get_pos_addr(pos) = pos->packet_size;
ctf_move_pos(pos, sizeof(uint64_t) * CHAR_BIT);
uint64_t *ts)
{
unsigned long sec, usec;
- int ret;
if (!s_timestamp)
return;
/* Only need to be executed on first pass (dummy) */
if (pos->dummy) {
+ int ret;
+
/* Extract time from input line */
ret = sscanf(line, "[%lu.%lu] ", &sec, &usec);
if (ret == 2) {
}
*tlen = len + line - *tline;
*ts = (uint64_t) sec * USEC_PER_SEC + (uint64_t) usec;
+ /*
+ * Default CTF clock has 1GHz frequency. Convert
+ * from usec to nsec.
+ */
+ *ts *= 1000;
}
}
/* timestamp */
uint64_t ts = 0;
printf_debug("read: %s\n", line);
-retry:
- 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)) {
- ctf_pos_pad_packet(pos);
- write_packet_header(pos, s_uuid);
- write_packet_context(pos);
- if (attempt++ == 1) {
- fprintf(stderr, "[Error] Line too large for packet size (%" PRIu64 "kB) (discarded)\n",
- pos->packet_size / CHAR_BIT / 1024);
- return;
+
+ for (;;) {
+ 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)) {
+ ctf_pos_pad_packet(pos);
+ write_packet_header(pos, s_uuid);
+ write_packet_context(pos);
+ if (attempt++ == 1) {
+ fprintf(stderr, "[Error] Line too large for packet size (%" PRIu64 "kB) (discarded)\n",
+ pos->packet_size / CHAR_BIT / 1024);
+ return;
+ }
+ continue;
+ } else {
+ break;
}
- goto retry;
}
write_event_header(pos, line, &tline, len, &tlen, &ts);
int ret;
memset(&pos, 0, sizeof(pos));
- ret = ctf_init_pos(&pos, output, O_RDWR);
+ ret = ctf_init_pos(&pos, NULL, output, O_RDWR);
if (ret) {
fprintf(stderr, "Error in ctf_init_pos\n");
return;
metadata_fd = openat(dir_fd, "metadata", O_RDWR|O_CREAT,
S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP);
- if (fd < 0) {
+ if (metadata_fd < 0) {
perror("openat");
goto error_closedatastream;
}