| Message ID | 1456694259-30225-1-git-send-email-bill.fischofer@linaro.org |
|---|---|
| State | New |
| Headers | show |
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 On 28 February 2016 at 22:17, Bill Fischofer <bill.fischofer@linaro.org> 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 <bill.fischofer@linaro.org> > --- > 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 > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp >
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 > <bill.fischofer@linaro.org <mailto:bill.fischofer@linaro.org>> 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 <bill.fischofer@linaro.org > <mailto:bill.fischofer@linaro.org>> > --- > 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 > lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> > https://lists.linaro.org/mailman/listinfo/lng-odp > > > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp
Sorry. confused. What do I do wrong? erachmi@erachmi-ericsson:~/linaro/ODP/odp$ git remote -v origin https://git.linaro.org/lng/odp.git (fetch) origin https://git.linaro.org/lng/odp.git (push) own ssh://git@git.linaro.org/people/christophe.milard/odp.git (fetch) own ssh://git@git.linaro.org/people/christophe.milard/odp.git (push) erachmi@erachmi-ericsson:~/linaro/ODP/odp$ git remote update origin Fetching origin erachmi@erachmi-ericsson:~/linaro/ODP/odp$ git co -B api-next origin/api-next Branch api-next set up to track remote branch api-next from origin. Reset branch 'api-next' Your branch is up-to-date with 'origin/api-next'. erachmi@erachmi-ericsson:~/linaro/ODP/odp$ git am ~/incoming/lng-odp_API-NEXT_PATCH_* Applying: doc: images: add gv file for pktio state machine error: doc/images/Makefile.am: does not exist in index Patch failed at 0001 doc: images: add gv file for pktio state machine The copy of the patch that failed is found in: /home/erachmi/linaro/ODP/odp/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". erachmi@erachmi-ericsson:~/linaro/ODP/odp$ On 2 March 2016 at 09:12, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > 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 <bill.fischofer@linaro.org >> <mailto:bill.fischofer@linaro.org>> 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 <bill.fischofer@linaro.org >> <mailto:bill.fischofer@linaro.org>> >> >> --- >> 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 >> lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> >> https://lists.linaro.org/mailman/listinfo/lng-odp >> >> >> >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org >> https://lists.linaro.org/mailman/listinfo/lng-odp >> > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp >
Looks like Mike's doc restructure patch merged ahead of this one so Part 1 needed more than just a rebase. v2 sent which should now apply and build. Thanks. On Wed, Mar 2, 2016 at 3:24 AM, Christophe Milard < christophe.milard@linaro.org> wrote: > Sorry. confused. What do I do wrong? > > erachmi@erachmi-ericsson:~/linaro/ODP/odp$ git remote -v > origin https://git.linaro.org/lng/odp.git (fetch) > origin https://git.linaro.org/lng/odp.git (push) > own ssh://git@git.linaro.org/people/christophe.milard/odp.git (fetch) > own ssh://git@git.linaro.org/people/christophe.milard/odp.git (push) > > erachmi@erachmi-ericsson:~/linaro/ODP/odp$ git remote update origin > Fetching origin > > erachmi@erachmi-ericsson:~/linaro/ODP/odp$ git co -B api-next > origin/api-next > Branch api-next set up to track remote branch api-next from origin. > Reset branch 'api-next' > Your branch is up-to-date with 'origin/api-next'. > > erachmi@erachmi-ericsson:~/linaro/ODP/odp$ git am > ~/incoming/lng-odp_API-NEXT_PATCH_* > Applying: doc: images: add gv file for pktio state machine > error: doc/images/Makefile.am: does not exist in index > Patch failed at 0001 doc: images: add gv file for pktio state machine > The copy of the patch that failed is found in: > /home/erachmi/linaro/ODP/odp/.git/rebase-apply/patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > erachmi@erachmi-ericsson:~/linaro/ODP/odp$ > > > On 2 March 2016 at 09:12, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > >> 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 <bill.fischofer@linaro.org >>> <mailto:bill.fischofer@linaro.org>> 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 <bill.fischofer@linaro.org >>> <mailto:bill.fischofer@linaro.org>> >>> >>> --- >>> 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 >>> lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> >>> https://lists.linaro.org/mailman/listinfo/lng-odp >>> >>> >>> >>> >>> _______________________________________________ >>> lng-odp mailing list >>> lng-odp@lists.linaro.org >>> https://lists.linaro.org/mailman/listinfo/lng-odp >>> >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org >> https://lists.linaro.org/mailman/listinfo/lng-odp >> > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp > >
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
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 <bill.fischofer@linaro.org> --- 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