/* To traverse a tree recursively */
#include <fcntl.h>
-#include <fts.h>
/* For the use of realpath*/
#include <limits.h>
#include <stdlib.h>
/* For strcpy*/
#include <string.h>
-
+#include <errno.h>
+#include <dirent.h>
/* A trace is a sequence of events gathered in the same tracing session. The
events may be stored in several tracefiles in the same directory.
A trace set is defined when several traces are to be analyzed together,
int lttv_traceset_add_path(LttvTraceset *ts, char *trace_path)
{
- FTS *tree;
- FTSENT *node;
- char * const paths[2] = { trace_path, NULL };
int ret = -1;
-
+ DIR *curdir = NULL;
gboolean metaFileFound = FALSE;
-
- tree = fts_open(paths, FTS_NOCHDIR | FTS_LOGICAL, 0);
- if (tree == NULL) {
- g_warning("Cannot traverse \"%s\" for reading.\n",
- trace_path);
+
+ /* Open top level directory */
+ curdir = opendir(trace_path);
+ if (curdir == NULL) {
+ g_warning("Cannot open directory %s (%s)", trace_path, strerror(errno));
return ret;
}
- int dirfd, metafd;
- while ((node = fts_read(tree))) {
-
- if (!(node->fts_info & FTS_D))
- continue;
-
- dirfd = open(node->fts_accpath, 0);
- if (dirfd < 0) {
- g_warning("Unable to open trace "
- "directory file descriptor : %s.", node->fts_accpath);
- ret = dirfd;
+ // Check if a metadata file exists in the current directory
+ int metafd = openat(dirfd(curdir), "metadata", O_RDONLY);
+ if (metafd < 0) {
+
+ } else {
+ ret = close(metafd);
+ if (ret < 0) {
+ g_warning("Unable to close metadata "
+ "file descriptor : %s.", trace_path);
goto error;
}
+
+ ret = lttv_traceset_create_trace(ts, trace_path);
+ if (ret < 0) {
+ g_warning("Opening trace \"%s\" "
+ "for reading.", trace_path);
+ goto error;
+ }
+ metaFileFound = TRUE;
+ }
- // Check if a metadata file exists in the current directory
- metafd = openat(dirfd, "metadata", O_RDONLY);
- if (metafd < 0) {
- ret = close(dirfd);
- if (ret < 0) {
- g_warning("Unable to open metadata "
- "file descriptor : %s.", node->fts_accpath);
- goto error;
- }
- } else {
- ret = close(metafd);
- if (ret < 0) {
- g_warning("Unable to close metadata "
- "file descriptor : %s.", node->fts_accpath);
- goto error;
- }
- ret = close(dirfd);
- if (ret < 0) {
- g_warning("Unable to close trace "
- "directory file descriptor : %s.", node->fts_accpath);
- goto error;
- }
-
- ret = lttv_traceset_create_trace(ts, node->fts_accpath);
- if (ret < 0) {
- g_warning("Opening trace \"%s\" from %s "
- "for reading.", node->fts_accpath, trace_path);
- goto error;
+ struct dirent curentry;
+ struct dirent *resultentry;
+ while ((ret = readdir_r(curdir, &curentry, &resultentry)) == 0) {
+ if (resultentry == NULL) {
+ /* No more entry*/
+ break;
+ }
+ if (curentry.d_name[0] != '.') {
+ if (curentry.d_type == DT_DIR) {
+
+ char curpath[PATH_MAX];
+ snprintf(curpath, PATH_MAX, "%s/%s", trace_path, curentry.d_name);
+ ret = lttv_traceset_add_path(ts, curpath);
+ if (ret >= 0) {
+ metaFileFound = TRUE;
+ }
}
- metaFileFound = TRUE;
}
}
+ if (ret != 0) {
+ g_warning("Invalid readdir");
+ }
+
error:
- ret = fts_close(tree);
- if (ret < 0) {
- g_warning("Unable to close tree "
- "file descriptor : %s.", trace_path);
- }
if(metaFileFound)
return ret;
else
return -1;
}
-
unsigned lttv_traceset_number(LttvTraceset *s)
{
return s->traces->len;
if (timestamp == -1ULL) {
return 0;
}
- const struct definition *scope = bt_ctf_get_top_level_scope(ctf_event, BT_STREAM_PACKET_CONTEXT);
+ const struct bt_definition *scope = bt_ctf_get_top_level_scope(ctf_event, BT_STREAM_PACKET_CONTEXT);
if (bt_ctf_field_get_error()) {
return 0;
}
last_position.bt_pos = &pos;
last_position.timestamp = G_MAXUINT64;
last_position.cpu_id = INT_MAX;
-#ifdef BABEL_HAS_SEEK_LAST
+
/* Assign iterator to the last event of the traces */
last_position.bt_pos->type = BT_SEEK_LAST;
last_position.iter = ts->iter;
-#endif
+
return lttv_traceset_position_get_timestamp(&last_position);
}
ltt_time_zero) == 0 && ts->traces->len > 0){
ts->time_span.start_time = ltt_time_from_uint64(
lttv_traceset_get_timestamp_first_event(ts));
-#ifdef BABEL_HAS_SEEK_LAST
ts->time_span.end_time = ltt_time_from_uint64(
- lttv_traceset_get_timestamp_end(ts));
-#else
- ts->time_span.end_time = lttv_traceset_get_time_span(ts).end_time;
-#endif
+ lttv_traceset_get_timestamp_last_event(ts));
}
return ts->time_span;
}
lttv_traceset_seek_to_position(&previous_pos);
/*We must desallocate because the function bt_iter_get_pos() does a g_new */
bt_iter_free_pos(previous_pos.bt_pos);
+ if (pos->timestamp == G_MAXUINT64) {
+ return 0;
+ }
return 1;
}
}
-
+/* 0 if equals, other is different */
int lttv_traceset_position_compare(const LttvTracesetPosition *pos1, const LttvTracesetPosition *pos2)
{
#warning " TODO :Rename for lttv_traceset_position_equals && Must return COMPARAISON OF THE 2 POSITION && verify if it is the best way to compare position"
if(pos1 == NULL || pos2 == NULL){
return -1;
}
-
- guint64 timeStampPos1,timeStampPos2;
- guint cpuId1, cpuId2;
-
- timeStampPos1 = lttv_traceset_position_get_timestamp(pos1);
- timeStampPos2 = lttv_traceset_position_get_timestamp(pos2);
-
-
- cpuId1 = lttv_traceset_position_get_cpuid(pos1);
- cpuId2 = lttv_traceset_position_get_cpuid(pos2);
-
- if(timeStampPos1 == timeStampPos2 && cpuId1 == cpuId2){
- return 0;
+
+ int res = -1;
+#ifdef HAVE_BT_ITER_EQUALS_POS
+ if(pos1->timestamp == G_MAXUINT64 || pos2->timestamp == G_MAXUINT64) {
+ res = bt_iter_equals_pos(pos1->bt_pos, pos2->bt_pos);
}
- else{
- return 1;
+#endif
+ if (res < 0) {
+
+ guint64 timeStampPos1,timeStampPos2;
+ guint cpuId1, cpuId2;
+
+ timeStampPos1 = lttv_traceset_position_get_timestamp(pos1);
+ timeStampPos2 = lttv_traceset_position_get_timestamp(pos2);
+
+ if (timeStampPos1 == timeStampPos2) {
+
+ cpuId1 = lttv_traceset_position_get_cpuid(pos1);
+ cpuId2 = lttv_traceset_position_get_cpuid(pos2);
+
+ if(cpuId1 == cpuId2){
+ return 0;
+ }
+ }
+ return 1;
+ } else {
+
+ return !res;
}
}
projects / lttv.git / blobdiff