On 03/02/16 10:20, Christophe Milard wrote:
Hi Bill,
I am probably missing something obvious, but that Makefile does not exist for me... Does this require some previous patch that have made their way to the repo yet?

erachmi@erachmi-ericsson:~/linaro/ODP/odp$ git am ~/incoming/lng-odp_API-NEXT_PATCH_1-3_doc_images_add_gv_file_for_pktio_state_machine.mbox
Applying: doc: images: add gv file for pktio state machine
error: doc/images/Makefile.am: does not exist in index


no, rebase for first patch is needed.

Maxim.


On 28 February 2016 at 22:17, Bill Fischofer <[email protected] <mailto:[email protected]>> wrote:

    The PktIO FSM state diagram is built using GraphViz. Add the files and
    associated Makefile and .gitignore changes needed to support this new
    file.

    Signed-off-by: Bill Fischofer <[email protected]
    <mailto:[email protected]>>
    ---
     doc/images/.gitignore   |  1 +
     doc/images/Makefile.am  | 14 +++++++++++---
     doc/images/pktio_fsm.gv | 17 +++++++++++++++++
     3 files changed, 29 insertions(+), 3 deletions(-)
     create mode 100644 doc/images/pktio_fsm.gv

    diff --git a/doc/images/.gitignore b/doc/images/.gitignore
    index 1647e41..a19aa75 100644
    --- a/doc/images/.gitignore
    +++ b/doc/images/.gitignore
    @@ -1 +1,2 @@
     resource_management.svg
    +pktio_fsm.svg
    diff --git a/doc/images/Makefile.am b/doc/images/Makefile.am
    index 8fb8a99..ece9458 100644
    --- a/doc/images/Makefile.am
    +++ b/doc/images/Makefile.am
    @@ -1,16 +1,24 @@
     .msc.svg:
            mscgen -T svg -i $^ -o $@

    +.gv.svg:
    +       dot -Tsvg $^ -o $@
    +
     MSG_SRCS = resource_management.msc
     MSG_TARGETS = $(MSG_SRCS:msc=svg)

    -EXTRA_DIST = $(MSG_SRCS)
    +GV_SRCS = pktio_fsm.gv
    +GV_TARGETS = $(GV_SRCS:gv=svg)
    +
    +EXTRA_DIST = $(MSG_SRCS) $(GV_SRCS)
    +
    +TARGETS = $(GV_TARGETS)

     if HAVE_MSCGEN
    -TARGETS = $(MSG_TARGETS)
    +TARGETS += $(MSG_TARGETS)
     endif

     all-local: $(TARGETS)

     clean-local:
    -       rm -f $(MSG_TARGETS)
    +       rm -f $(MSG_TARGETS) $(GV_TARGETS)
    diff --git a/doc/images/pktio_fsm.gv b/doc/images/pktio_fsm.gv
    new file mode 100644
    index 0000000..09199c6
    --- /dev/null
    +++ b/doc/images/pktio_fsm.gv
    @@ -0,0 +1,17 @@
    +digraph pktio_state_machine {
    +       rankdir=LR;
    +       size="9,12";
    +       node [fontsize=28];
    +       edge [fontsize=28];
    +       node [shape=doublecircle]; Unallocated Ready;
    +       node [shape=circle];
    +       Unallocated -> Unconfigured [label="odp_pktio_open()"];
    +       Unconfigured -> Unallocated [label="odp_pktio_close()"];
    +       Unconfigured -> Configured [label="odp_pktin_queue_config()"];
    +       Unconfigured -> Configured
    [label="odp_pktout_queue_config()"];
    +       Configured -> Configured [label="odp_pktin_queue_config()"];
    +       Configured -> Configured [label="odp_pktout_queue_config()"];
    +       Configured -> Ready [label="odp_pktio_start()"];
    +       Ready -> Configured [label="odp_pktio_stop()"];
    +       Configured -> Unallocated [label="odp_pktio_close()"];
    +}
    \ No newline at end of file
    --
    2.5.0

    _______________________________________________
    lng-odp mailing list
    [email protected] <mailto:[email protected]>
    https://lists.linaro.org/mailman/listinfo/lng-odp




_______________________________________________
lng-odp mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/lng-odp

_______________________________________________
lng-odp mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/lng-odp

Reply via email to