examples/linux-fs-simple: use `trace` as trace directory, not `ctf`

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/examples/linux-fs-simple/.gitignore b/examples/linux-fs-simple/.gitignore
index be03c5b0e0d06624be988c0b1f60a5eac3f1df6f..7a0a9cb2fac0a9978baec41dc5ca3569d6badf4c 100644 (file)
--- a/examples/linux-fs-simple/.gitignore
+++ b/examples/linux-fs-simple/.gitignore
@@ -1,2 +1,2 @@
-ctf
+trace
 linux-fs-simple

diff --git a/examples/linux-fs-simple/Makefile b/examples/linux-fs-simple/Makefile
index 97d7eb7cd597fd133052be1a8053e0b53edd1e8f..d0cb1ccbe5464dadb322f5e3c32d292bcf07f122 100644 (file)
--- a/examples/linux-fs-simple/Makefile
+++ b/examples/linux-fs-simple/Makefile
@@ -27,6 +27,7 @@ MKDIR = mkdir
 PLATFORM_DIR = ../../platforms/linux-fs
 CFLAGS = -O2 -Wall -pedantic -I$(PLATFORM_DIR) -I.
 
+TRACE_DIR = trace
 TARGET = linux-fs-simple
 OBJS = $(TARGET).o barectf.o barectf-platform-linux-fs.o
 
@@ -34,14 +35,14 @@ OBJS = $(TARGET).o barectf.o barectf-platform-linux-fs.o
 
 all: $(TARGET)
 
-ctf:
-       $(MKDIR) ctf
+$(TRACE_DIR):
+       $(MKDIR) $(TRACE_DIR)
 
 $(TARGET): $(OBJS)
        $(CC) -o $@ $^
 
-ctf/metadata barectf-bitfield.h barectf.h barectf.c: config.yaml ctf
-       $(BARECTF) $< -m ctf
+$(TRACE_DIR)/metadata barectf-bitfield.h barectf.h barectf.c: config.yaml $(TRACE_DIR)
+       $(BARECTF) $< -m $(TRACE_DIR)
 
 barectf.o: barectf.c
        $(CC) $(CFLAGS) -ansi -c $<
@@ -53,5 +54,5 @@ $(TARGET).o: $(TARGET).c barectf.h barectf-bitfield.h
        $(CC) $(CFLAGS) -c $<
 
 clean:
-       $(RM) $(TARGET) $(OBJS) ctf
+       $(RM) $(TARGET) $(OBJS) $(TRACE_DIR)
        $(RM) barectf.h barectf-bitfield.h barectf.c

diff --git a/examples/linux-fs-simple/README.adoc b/examples/linux-fs-simple/README.adoc
index 32c95a04d3afb4e1878ce0b2f9353ee133834842..6df45442a73a0773eb6cd867423f758afc4939f5 100644 (file)
--- a/examples/linux-fs-simple/README.adoc
+++ b/examples/linux-fs-simple/README.adoc
@@ -6,7 +6,7 @@ Philippe Proulx
 :toc: left
 
 This simple example shows how to use the barectf
-link:../../../platforms/linux-fs[Linux FS platform].
+link:../../platforms/linux-fs[Linux FS platform].
 
 == Build
 
@@ -26,12 +26,12 @@ Run this example:
 $ ./linux-fs-simple
 ----
 
-The complete CTF trace is the `ctf` directory.
+The complete CTF trace is the `trace` directory.
 
 [NOTE]
 ====
 You can run the example with arguments; they will be recorded as string
-fields in the event records of the `ctf/stream` data stream.
+fields in the event records of the `trace/stream` data stream.
 
 For example:
 
@@ -46,5 +46,5 @@ Read the resulting trace with
 https://babeltrace.org/[Babeltrace{nbsp}2]:
 
 ----
-$ babeltrace2 ctf
+$ babeltrace2 trace
 ----

diff --git a/examples/linux-fs-simple/linux-fs-simple.c b/examples/linux-fs-simple/linux-fs-simple.c
index 01b737101a299b794a765df22b33e41396b90aed..e19d305d2741edd12d5ce7c747842f145b28208d 100644 (file)
--- a/examples/linux-fs-simple/linux-fs-simple.c
+++ b/examples/linux-fs-simple/linux-fs-simple.c
@@ -73,7 +73,7 @@ int main(const int argc, const char * const argv[])
        int exit_status = 0;
 
        /* Initialize platform */
-       platform_ctx = barectf_platform_linux_fs_init(512, "ctf", 1, 2, 7);
+       platform_ctx = barectf_platform_linux_fs_init(512, "trace", 1, 2, 7);
 
        if (!platform_ctx) {
                fprintf(stderr,