Message ID | 1399521696-2265-1-git-send-email-vincent.hsu@linaro.org |
---|---|
State | Accepted |
Headers | show |
applied!. Thanks, Maxim. On 05/08/2014 08:01 AM, Vincent Hsu wrote: > Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org> > --- > libpcap/patches/0003-ODP-API-Updates.patch | 38 ++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 libpcap/patches/0003-ODP-API-Updates.patch > > diff --git a/libpcap/patches/0003-ODP-API-Updates.patch b/libpcap/patches/0003-ODP-API-Updates.patch > new file mode 100644 > index 0000000..d53cae2 > --- /dev/null > +++ b/libpcap/patches/0003-ODP-API-Updates.patch > @@ -0,0 +1,38 @@ > +From 984497e40e16a4b1594db0d5a64b338012a981de Mon Sep 17 00:00:00 2001 > +From: Vincent Hsu <vincent.hsu@linaro.org> > +Date: Thu, 8 May 2014 11:32:03 +0800 > +Subject: [PATCH] ODP API Updates > + > +1. odp_schedule(NULL) -> odp_schedule(NULL, ODP_SCHED_WAIT); > +2. ODP_SCHED_SYNC_NONE -> ODP_SCHED_SYNC_ATOMIC > + > +Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org> > +--- > + pcap-linux.c | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/pcap-linux.c b/pcap-linux.c > +index 4372be6..feebd20 100644 > +--- a/pcap-linux.c > ++++ b/pcap-linux.c > +@@ -6207,7 +6207,7 @@ pcap_odp_init(pcap_t *handle) > + * resource > + */ > + qparam.sched.prio = ODP_SCHED_PRIO_DEFAULT; > +- qparam.sched.sync = ODP_SCHED_SYNC_NONE; > ++ qparam.sched.sync = ODP_SCHED_SYNC_ATOMIC; > + qparam.sched.group = ODP_SCHED_GROUP_DEFAULT; > + snprintf(inq_name, sizeof(inq_name), "%i-pktio_inq_def", > + (int)handle->pktio); > +@@ -6364,7 +6364,7 @@ pcap_read_odp(pcap_t *handle, int max_packets, pcap_handler callback, > + > + for (n = 1; (n <= max_packets) || (max_packets < 0); n++) { > + /* Use schedule to get buf from any input queue */ > +- buf = odp_schedule(NULL); > ++ buf = odp_schedule(NULL, ODP_SCHED_WAIT); > + /* fill out pcap_header */ > + gettimeofday(&ts, NULL); > + pcap_header.ts = ts; > +-- > +1.8.5 > +
Much better for me locally, but there is still an issue on the build server https://ci.linaro.org/jenkins/view/lng-ci/job/odp-apps-check/8/CROSS_COMPILE=armle,label=build/console On 8 May 2014 06:13, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > applied!. > > Thanks, > Maxim. > > On 05/08/2014 08:01 AM, Vincent Hsu wrote: > >> Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org> >> --- >> libpcap/patches/0003-ODP-API-Updates.patch | 38 >> ++++++++++++++++++++++++++++++ >> 1 file changed, 38 insertions(+) >> create mode 100644 libpcap/patches/0003-ODP-API-Updates.patch >> >> diff --git a/libpcap/patches/0003-ODP-API-Updates.patch >> b/libpcap/patches/0003-ODP-API-Updates.patch >> new file mode 100644 >> index 0000000..d53cae2 >> --- /dev/null >> +++ b/libpcap/patches/0003-ODP-API-Updates.patch >> @@ -0,0 +1,38 @@ >> +From 984497e40e16a4b1594db0d5a64b338012a981de Mon Sep 17 00:00:00 2001 >> +From: Vincent Hsu <vincent.hsu@linaro.org> >> +Date: Thu, 8 May 2014 11:32:03 +0800 >> +Subject: [PATCH] ODP API Updates >> + >> +1. odp_schedule(NULL) -> odp_schedule(NULL, ODP_SCHED_WAIT); >> +2. ODP_SCHED_SYNC_NONE -> ODP_SCHED_SYNC_ATOMIC >> + >> +Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org> >> +--- >> + pcap-linux.c | 4 ++-- >> + 1 file changed, 2 insertions(+), 2 deletions(-) >> + >> +diff --git a/pcap-linux.c b/pcap-linux.c >> +index 4372be6..feebd20 100644 >> +--- a/pcap-linux.c >> ++++ b/pcap-linux.c >> +@@ -6207,7 +6207,7 @@ pcap_odp_init(pcap_t *handle) >> + * resource >> + */ >> + qparam.sched.prio = ODP_SCHED_PRIO_DEFAULT; >> +- qparam.sched.sync = ODP_SCHED_SYNC_NONE; >> ++ qparam.sched.sync = ODP_SCHED_SYNC_ATOMIC; >> + qparam.sched.group = ODP_SCHED_GROUP_DEFAULT; >> + snprintf(inq_name, sizeof(inq_name), "%i-pktio_inq_def", >> + (int)handle->pktio); >> +@@ -6364,7 +6364,7 @@ pcap_read_odp(pcap_t *handle, int max_packets, >> pcap_handler callback, >> + >> + for (n = 1; (n <= max_packets) || (max_packets < 0); n++) { >> + /* Use schedule to get buf from any input queue */ >> +- buf = odp_schedule(NULL); >> ++ buf = odp_schedule(NULL, ODP_SCHED_WAIT); >> + /* fill out pcap_header */ >> + gettimeofday(&ts, NULL); >> + pcap_header.ts = ts; >> +-- >> +1.8.5 >> + >> > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp >
On 05/08/2014 08:18 PM, Mike Holmes wrote: > Much better for me locally, but there is still an issue on the build > server > https://ci.linaro.org/jenkins/view/lng-ci/job/odp-apps-check/8/CROSS_COMPILE=armle,label=build/console > is it possible to ssh to this server to see the logs? I don't have an other idea to figure out this build problem. Thanks, Maxim. > > On 8 May 2014 06:13, Maxim Uvarov <maxim.uvarov@linaro.org > <mailto:maxim.uvarov@linaro.org>> wrote: > > applied!. > > Thanks, > Maxim. > > On 05/08/2014 08:01 AM, Vincent Hsu wrote: > > Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>> > --- > libpcap/patches/0003-ODP-API-Updates.patch | 38 > ++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 libpcap/patches/0003-ODP-API-Updates.patch > > diff --git a/libpcap/patches/0003-ODP-API-Updates.patch > b/libpcap/patches/0003-ODP-API-Updates.patch > new file mode 100644 > index 0000000..d53cae2 > --- /dev/null > +++ b/libpcap/patches/0003-ODP-API-Updates.patch > @@ -0,0 +1,38 @@ > +From 984497e40e16a4b1594db0d5a64b338012a981de Mon Sep 17 > 00:00:00 2001 > +From: Vincent Hsu <vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>> > +Date: Thu, 8 May 2014 11:32:03 +0800 > +Subject: [PATCH] ODP API Updates > + > +1. odp_schedule(NULL) -> odp_schedule(NULL, ODP_SCHED_WAIT); > +2. ODP_SCHED_SYNC_NONE -> ODP_SCHED_SYNC_ATOMIC > + > +Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>> > +--- > + pcap-linux.c | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/pcap-linux.c b/pcap-linux.c > +index 4372be6..feebd20 100644 > +--- a/pcap-linux.c > ++++ b/pcap-linux.c > +@@ -6207,7 +6207,7 @@ pcap_odp_init(pcap_t *handle) > + * resource > + */ > + qparam.sched.prio = ODP_SCHED_PRIO_DEFAULT; > +- qparam.sched.sync = ODP_SCHED_SYNC_NONE; > ++ qparam.sched.sync = ODP_SCHED_SYNC_ATOMIC; > + qparam.sched.group = ODP_SCHED_GROUP_DEFAULT; > + snprintf(inq_name, sizeof(inq_name), "%i-pktio_inq_def", > + (int)handle->pktio); > +@@ -6364,7 +6364,7 @@ pcap_read_odp(pcap_t *handle, int > max_packets, pcap_handler callback, > + > + for (n = 1; (n <= max_packets) || (max_packets < 0); > n++) { > + /* Use schedule to get buf from any input queue */ > +- buf = odp_schedule(NULL); > ++ buf = odp_schedule(NULL, ODP_SCHED_WAIT); > + /* fill out pcap_header */ > + gettimeofday(&ts, NULL); > + pcap_header.ts = ts; > +-- > +1.8.5 > + > > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> > http://lists.linaro.org/mailman/listinfo/lng-odp > > > > > -- > *Mike Holmes* > Linaro Technical Manager / Lead > LNG - ODP
The link was to the console of the build, what else were you hoping to find ? I can work with you to edit the build script to add verbosity then we can re run in Jenkins. If there is something else Fathi can probably help, he did add flex for us which fixed the initial problem I saw, after adding flex he replied " I've added bison/flex but it still fails. I'll suggest to do local builds in a clean chroot, install build dependencies until the full list is sorted out. " On 8 May 2014 15:35, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > On 05/08/2014 08:18 PM, Mike Holmes wrote: > >> Much better for me locally, but there is still an issue on the build >> server https://ci.linaro.org/jenkins/view/lng-ci/job/odp-apps- >> check/8/CROSS_COMPILE=armle,label=build/console >> >> is it possible to ssh to this server to see the logs? I don't have an > other idea to figure out this build problem. > > Thanks, > Maxim. > > >> On 8 May 2014 06:13, Maxim Uvarov <maxim.uvarov@linaro.org <mailto: >> maxim.uvarov@linaro.org>> wrote: >> >> applied!. >> >> Thanks, >> Maxim. >> >> On 05/08/2014 08:01 AM, Vincent Hsu wrote: >> >> Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org >> <mailto:vincent.hsu@linaro.org>> >> >> --- >> libpcap/patches/0003-ODP-API-Updates.patch | 38 >> ++++++++++++++++++++++++++++++ >> 1 file changed, 38 insertions(+) >> create mode 100644 libpcap/patches/0003-ODP-API-Updates.patch >> >> diff --git a/libpcap/patches/0003-ODP-API-Updates.patch >> b/libpcap/patches/0003-ODP-API-Updates.patch >> new file mode 100644 >> index 0000000..d53cae2 >> --- /dev/null >> +++ b/libpcap/patches/0003-ODP-API-Updates.patch >> @@ -0,0 +1,38 @@ >> +From 984497e40e16a4b1594db0d5a64b338012a981de Mon Sep 17 >> 00:00:00 2001 >> +From: Vincent Hsu <vincent.hsu@linaro.org >> <mailto:vincent.hsu@linaro.org>> >> >> +Date: Thu, 8 May 2014 11:32:03 +0800 >> +Subject: [PATCH] ODP API Updates >> + >> +1. odp_schedule(NULL) -> odp_schedule(NULL, ODP_SCHED_WAIT); >> +2. ODP_SCHED_SYNC_NONE -> ODP_SCHED_SYNC_ATOMIC >> + >> +Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org >> <mailto:vincent.hsu@linaro.org>> >> >> +--- >> + pcap-linux.c | 4 ++-- >> + 1 file changed, 2 insertions(+), 2 deletions(-) >> + >> +diff --git a/pcap-linux.c b/pcap-linux.c >> +index 4372be6..feebd20 100644 >> +--- a/pcap-linux.c >> ++++ b/pcap-linux.c >> +@@ -6207,7 +6207,7 @@ pcap_odp_init(pcap_t *handle) >> + * resource >> + */ >> + qparam.sched.prio = ODP_SCHED_PRIO_DEFAULT; >> +- qparam.sched.sync = ODP_SCHED_SYNC_NONE; >> ++ qparam.sched.sync = ODP_SCHED_SYNC_ATOMIC; >> + qparam.sched.group = ODP_SCHED_GROUP_DEFAULT; >> + snprintf(inq_name, sizeof(inq_name), "%i-pktio_inq_def", >> + (int)handle->pktio); >> +@@ -6364,7 +6364,7 @@ pcap_read_odp(pcap_t *handle, int >> max_packets, pcap_handler callback, >> + >> + for (n = 1; (n <= max_packets) || (max_packets < 0); >> n++) { >> + /* Use schedule to get buf from any input queue */ >> +- buf = odp_schedule(NULL); >> ++ buf = odp_schedule(NULL, ODP_SCHED_WAIT); >> + /* fill out pcap_header */ >> + gettimeofday(&ts, NULL); >> + pcap_header.ts = ts; >> +-- >> +1.8.5 >> + >> >> >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> >> http://lists.linaro.org/mailman/listinfo/lng-odp >> >> >> >> >> -- >> *Mike Holmes* >> >> Linaro Technical Manager / Lead >> LNG - ODP >> > >
It would be helpful to get the config.log in tcpdump folder. On Fri, May 9, 2014 at 4:09 AM, Mike Holmes <mike.holmes@linaro.org> wrote: > The link was to the console of the build, what else were you hoping to > find ? > I can work with you to edit the build script to add verbosity then we can > re run in Jenkins. > > If there is something else Fathi can probably help, he did add flex for us > which fixed the initial problem I saw, after adding flex he replied > > " > I've added bison/flex but it still fails. I'll suggest to do local > builds in a clean chroot, install build dependencies until the full > list is sorted out. > " > > > > > On 8 May 2014 15:35, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > >> On 05/08/2014 08:18 PM, Mike Holmes wrote: >> >>> Much better for me locally, but there is still an issue on the build >>> server https://ci.linaro.org/jenkins/view/lng-ci/job/odp-apps- >>> check/8/CROSS_COMPILE=armle,label=build/console >>> >>> is it possible to ssh to this server to see the logs? I don't have an >> other idea to figure out this build problem. >> >> Thanks, >> Maxim. >> >> >>> On 8 May 2014 06:13, Maxim Uvarov <maxim.uvarov@linaro.org <mailto: >>> maxim.uvarov@linaro.org>> wrote: >>> >>> applied!. >>> >>> Thanks, >>> Maxim. >>> >>> On 05/08/2014 08:01 AM, Vincent Hsu wrote: >>> >>> Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org >>> <mailto:vincent.hsu@linaro.org>> >>> >>> --- >>> libpcap/patches/0003-ODP-API-Updates.patch | 38 >>> ++++++++++++++++++++++++++++++ >>> 1 file changed, 38 insertions(+) >>> create mode 100644 libpcap/patches/0003-ODP-API-Updates.patch >>> >>> diff --git a/libpcap/patches/0003-ODP-API-Updates.patch >>> b/libpcap/patches/0003-ODP-API-Updates.patch >>> new file mode 100644 >>> index 0000000..d53cae2 >>> --- /dev/null >>> +++ b/libpcap/patches/0003-ODP-API-Updates.patch >>> @@ -0,0 +1,38 @@ >>> +From 984497e40e16a4b1594db0d5a64b338012a981de Mon Sep 17 >>> 00:00:00 2001 >>> +From: Vincent Hsu <vincent.hsu@linaro.org >>> <mailto:vincent.hsu@linaro.org>> >>> >>> +Date: Thu, 8 May 2014 11:32:03 +0800 >>> +Subject: [PATCH] ODP API Updates >>> + >>> +1. odp_schedule(NULL) -> odp_schedule(NULL, ODP_SCHED_WAIT); >>> +2. ODP_SCHED_SYNC_NONE -> ODP_SCHED_SYNC_ATOMIC >>> + >>> +Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org >>> <mailto:vincent.hsu@linaro.org>> >>> >>> +--- >>> + pcap-linux.c | 4 ++-- >>> + 1 file changed, 2 insertions(+), 2 deletions(-) >>> + >>> +diff --git a/pcap-linux.c b/pcap-linux.c >>> +index 4372be6..feebd20 100644 >>> +--- a/pcap-linux.c >>> ++++ b/pcap-linux.c >>> +@@ -6207,7 +6207,7 @@ pcap_odp_init(pcap_t *handle) >>> + * resource >>> + */ >>> + qparam.sched.prio = ODP_SCHED_PRIO_DEFAULT; >>> +- qparam.sched.sync = ODP_SCHED_SYNC_NONE; >>> ++ qparam.sched.sync = ODP_SCHED_SYNC_ATOMIC; >>> + qparam.sched.group = ODP_SCHED_GROUP_DEFAULT; >>> + snprintf(inq_name, sizeof(inq_name), "%i-pktio_inq_def", >>> + (int)handle->pktio); >>> +@@ -6364,7 +6364,7 @@ pcap_read_odp(pcap_t *handle, int >>> max_packets, pcap_handler callback, >>> + >>> + for (n = 1; (n <= max_packets) || (max_packets < 0); >>> n++) { >>> + /* Use schedule to get buf from any input queue >>> */ >>> +- buf = odp_schedule(NULL); >>> ++ buf = odp_schedule(NULL, ODP_SCHED_WAIT); >>> + /* fill out pcap_header */ >>> + gettimeofday(&ts, NULL); >>> + pcap_header.ts = ts; >>> +-- >>> +1.8.5 >>> + >>> >>> >>> >>> _______________________________________________ >>> lng-odp mailing list >>> lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> >>> http://lists.linaro.org/mailman/listinfo/lng-odp >>> >>> >>> >>> >>> -- >>> *Mike Holmes* >>> >>> Linaro Technical Manager / Lead >>> LNG - ODP >>> >> >> > > > -- > *Mike Holmes* > Linaro Technical Manager / Lead > LNG - ODP > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp > >
Here are some things that may help 1. This is a cross compile not a local build - might be the difference ? 2. Here is the compele workspace of the run https://ci.linaro.org/jenkins /view/lng-ci/job/odp-apps-check/ws/ 3. I have added you as a maintainer of the ci project so you can play with it. On 8 May 2014 22:52, Vincent Hsu <vincent.hsu@linaro.org> wrote: > It would be helpful to get the config.log in tcpdump folder. > > > On Fri, May 9, 2014 at 4:09 AM, Mike Holmes <mike.holmes@linaro.org>wrote: > >> The link was to the console of the build, what else were you hoping to >> find ? >> I can work with you to edit the build script to add verbosity then we can >> re run in Jenkins. >> >> If there is something else Fathi can probably help, he did add flex for >> us which fixed the initial problem I saw, after adding flex he replied >> >> " >> I've added bison/flex but it still fails. I'll suggest to do local >> builds in a clean chroot, install build dependencies until the full >> list is sorted out. >> " >> >> >> >> >> On 8 May 2014 15:35, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: >> >>> On 05/08/2014 08:18 PM, Mike Holmes wrote: >>> >>>> Much better for me locally, but there is still an issue on the build >>>> server https://ci.linaro.org/jenkins/view/lng-ci/job/odp-apps- >>>> check/8/CROSS_COMPILE=armle,label=build/console >>>> >>>> is it possible to ssh to this server to see the logs? I don't have an >>> other idea to figure out this build problem. >>> >>> Thanks, >>> Maxim. >>> >>> >>>> On 8 May 2014 06:13, Maxim Uvarov <maxim.uvarov@linaro.org <mailto: >>>> maxim.uvarov@linaro.org>> wrote: >>>> >>>> applied!. >>>> >>>> Thanks, >>>> Maxim. >>>> >>>> On 05/08/2014 08:01 AM, Vincent Hsu wrote: >>>> >>>> Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org >>>> <mailto:vincent.hsu@linaro.org>> >>>> >>>> --- >>>> libpcap/patches/0003-ODP-API-Updates.patch | 38 >>>> ++++++++++++++++++++++++++++++ >>>> 1 file changed, 38 insertions(+) >>>> create mode 100644 libpcap/patches/0003-ODP-API-Updates.patch >>>> >>>> diff --git a/libpcap/patches/0003-ODP-API-Updates.patch >>>> b/libpcap/patches/0003-ODP-API-Updates.patch >>>> new file mode 100644 >>>> index 0000000..d53cae2 >>>> --- /dev/null >>>> +++ b/libpcap/patches/0003-ODP-API-Updates.patch >>>> @@ -0,0 +1,38 @@ >>>> +From 984497e40e16a4b1594db0d5a64b338012a981de Mon Sep 17 >>>> 00:00:00 2001 >>>> +From: Vincent Hsu <vincent.hsu@linaro.org >>>> <mailto:vincent.hsu@linaro.org>> >>>> >>>> +Date: Thu, 8 May 2014 11:32:03 +0800 >>>> +Subject: [PATCH] ODP API Updates >>>> + >>>> +1. odp_schedule(NULL) -> odp_schedule(NULL, ODP_SCHED_WAIT); >>>> +2. ODP_SCHED_SYNC_NONE -> ODP_SCHED_SYNC_ATOMIC >>>> + >>>> +Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org >>>> <mailto:vincent.hsu@linaro.org>> >>>> >>>> +--- >>>> + pcap-linux.c | 4 ++-- >>>> + 1 file changed, 2 insertions(+), 2 deletions(-) >>>> + >>>> +diff --git a/pcap-linux.c b/pcap-linux.c >>>> +index 4372be6..feebd20 100644 >>>> +--- a/pcap-linux.c >>>> ++++ b/pcap-linux.c >>>> +@@ -6207,7 +6207,7 @@ pcap_odp_init(pcap_t *handle) >>>> + * resource >>>> + */ >>>> + qparam.sched.prio = ODP_SCHED_PRIO_DEFAULT; >>>> +- qparam.sched.sync = ODP_SCHED_SYNC_NONE; >>>> ++ qparam.sched.sync = ODP_SCHED_SYNC_ATOMIC; >>>> + qparam.sched.group = ODP_SCHED_GROUP_DEFAULT; >>>> + snprintf(inq_name, sizeof(inq_name), "%i-pktio_inq_def", >>>> + (int)handle->pktio); >>>> +@@ -6364,7 +6364,7 @@ pcap_read_odp(pcap_t *handle, int >>>> max_packets, pcap_handler callback, >>>> + >>>> + for (n = 1; (n <= max_packets) || (max_packets < 0); >>>> n++) { >>>> + /* Use schedule to get buf from any input queue >>>> */ >>>> +- buf = odp_schedule(NULL); >>>> ++ buf = odp_schedule(NULL, ODP_SCHED_WAIT); >>>> + /* fill out pcap_header */ >>>> + gettimeofday(&ts, NULL); >>>> + pcap_header.ts = ts; >>>> +-- >>>> +1.8.5 >>>> + >>>> >>>> >>>> >>>> _______________________________________________ >>>> lng-odp mailing list >>>> lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> >>>> http://lists.linaro.org/mailman/listinfo/lng-odp >>>> >>>> >>>> >>>> >>>> -- >>>> *Mike Holmes* >>>> >>>> Linaro Technical Manager / Lead >>>> LNG - ODP >>>> >>> >>> >> >> >> -- >> *Mike Holmes* >> Linaro Technical Manager / Lead >> LNG - ODP >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org >> http://lists.linaro.org/mailman/listinfo/lng-odp >> >> > > > -- > Regards, > Vincent Hsu >
On 05/09/2014 05:01 PM, Mike Holmes wrote: > Here are some things that may help > > 1. This is a cross compile not a local build - might be the difference ? > 2. Here is the compele workspace of the run > https://ci.linaro.org/jenkins/view/lng-ci/job/odp-apps-check/ws/ > 3. I have added you as a maintainer of the ci project so you can play > with it. > mm... ok. I never tried libpcap with cross compile. That might be a reason. Maxim. > > On 8 May 2014 22:52, Vincent Hsu <vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>> wrote: > > It would be helpful to get the config.log in tcpdump folder. > > > On Fri, May 9, 2014 at 4:09 AM, Mike Holmes > <mike.holmes@linaro.org <mailto:mike.holmes@linaro.org>> wrote: > > The link was to the console of the build, what else were you > hoping to find ? > I can work with you to edit the build script to add verbosity > then we can re run in Jenkins. > > If there is something else Fathi can probably help, he did add > flex for us which fixed the initial problem I saw, after > adding flex he replied > > " > I've added bison/flex but it still fails. I'll suggest to do local > builds in a clean chroot, install build dependencies until the > full > list is sorted out. > " > > > > > On 8 May 2014 15:35, Maxim Uvarov <maxim.uvarov@linaro.org > <mailto:maxim.uvarov@linaro.org>> wrote: > > On 05/08/2014 08:18 PM, Mike Holmes wrote: > > Much better for me locally, but there is still an > issue on the build server > https://ci.linaro.org/jenkins/view/lng-ci/job/odp-apps-check/8/CROSS_COMPILE=armle,label=build/console > > is it possible to ssh to this server to see the logs? I > don't have an other idea to figure out this build problem. > > Thanks, > Maxim. > > > On 8 May 2014 06:13, Maxim Uvarov > <maxim.uvarov@linaro.org > <mailto:maxim.uvarov@linaro.org> > <mailto:maxim.uvarov@linaro.org > <mailto:maxim.uvarov@linaro.org>>> wrote: > > applied!. > > Thanks, > Maxim. > > On 05/08/2014 08:01 AM, Vincent Hsu wrote: > > Signed-off-by: Vincent Hsu > <vincent.hsu@linaro.org <mailto:vincent.hsu@linaro.org> > <mailto:vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>>> > > --- > libpcap/patches/0003-ODP-API-Updates.patch | 38 > ++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 > libpcap/patches/0003-ODP-API-Updates.patch > > diff --git > a/libpcap/patches/0003-ODP-API-Updates.patch > b/libpcap/patches/0003-ODP-API-Updates.patch > new file mode 100644 > index 0000000..d53cae2 > --- /dev/null > +++ b/libpcap/patches/0003-ODP-API-Updates.patch > @@ -0,0 +1,38 @@ > +From 984497e40e16a4b1594db0d5a64b338012a981de > Mon Sep 17 > 00:00:00 2001 > +From: Vincent Hsu <vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org> > <mailto:vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>>> > > +Date: Thu, 8 May 2014 11:32:03 +0800 > +Subject: [PATCH] ODP API Updates > + > +1. odp_schedule(NULL) -> odp_schedule(NULL, > ODP_SCHED_WAIT); > +2. ODP_SCHED_SYNC_NONE -> ODP_SCHED_SYNC_ATOMIC > + > +Signed-off-by: Vincent Hsu > <vincent.hsu@linaro.org <mailto:vincent.hsu@linaro.org> > <mailto:vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>>> > > +--- > + pcap-linux.c | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/pcap-linux.c b/pcap-linux.c > +index 4372be6..feebd20 100644 > +--- a/pcap-linux.c > ++++ b/pcap-linux.c > +@@ -6207,7 +6207,7 @@ pcap_odp_init(pcap_t > *handle) > + * resource > + */ > + qparam.sched.prio = > ODP_SCHED_PRIO_DEFAULT; > +- qparam.sched.sync = ODP_SCHED_SYNC_NONE; > ++ qparam.sched.sync = > ODP_SCHED_SYNC_ATOMIC; > + qparam.sched.group = > ODP_SCHED_GROUP_DEFAULT; > + snprintf(inq_name, sizeof(inq_name), > "%i-pktio_inq_def", > + (int)handle->pktio); > +@@ -6364,7 +6364,7 @@ pcap_read_odp(pcap_t > *handle, int > max_packets, pcap_handler callback, > + > + for (n = 1; (n <= max_packets) || > (max_packets < 0); > n++) { > + /* Use schedule to get buf > from any input queue */ > +- buf = odp_schedule(NULL); > ++ buf = odp_schedule(NULL, > ODP_SCHED_WAIT); > + /* fill out pcap_header */ > + gettimeofday(&ts, NULL); > + pcap_header.ts = ts; > +-- > +1.8.5 > + > > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > <mailto:lng-odp@lists.linaro.org> > <mailto:lng-odp@lists.linaro.org > <mailto:lng-odp@lists.linaro.org>> > http://lists.linaro.org/mailman/listinfo/lng-odp > > > > > -- > *Mike Holmes* > > Linaro Technical Manager / Lead > LNG - ODP > > > > > > -- > *Mike Holmes* > Linaro Technical Manager / Lead > LNG - ODP > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> > http://lists.linaro.org/mailman/listinfo/lng-odp > > > > > -- > Regards, > Vincent Hsu > > > > > -- > *Mike Holmes* > Linaro Technical Manager / Lead > LNG - ODP
On 05/09/2014 05:01 PM, Mike Holmes wrote: > Here are some things that may help > > 1. This is a cross compile not a local build - might be the difference ? > 2. Here is the compele workspace of the run > https://ci.linaro.org/jenkins/view/lng-ci/job/odp-apps-check/ws/ > 3. I have added you as a maintainer of the ci project so you can play > with it. > > how does this cross compile work? *18:38:20* Building remotely onx86_64-07 <https://ci.linaro.org/jenkins/computer/x86_64-07> in workspace /home/buildslave/workspace/odp-apps-check/CROSS_COMPILE/armbe/label/build *18:38:28* checking build system type... x86_64-unknown-linux-gnu *18:38:28* checking host system type... x86_64-unknown-linux-gnu *18:38:28* checking target system type... x86_64-unknown-linux-gnu *18:38:28* checking for gcc... gcc Looks like it has to be arm compiler and all vars for cross compilation should be set. Thanks, Maxim. > On 8 May 2014 22:52, Vincent Hsu <vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>> wrote: > > It would be helpful to get the config.log in tcpdump folder. > > > On Fri, May 9, 2014 at 4:09 AM, Mike Holmes > <mike.holmes@linaro.org <mailto:mike.holmes@linaro.org>> wrote: > > The link was to the console of the build, what else were you > hoping to find ? > I can work with you to edit the build script to add verbosity > then we can re run in Jenkins. > > If there is something else Fathi can probably help, he did add > flex for us which fixed the initial problem I saw, after > adding flex he replied > > " > I've added bison/flex but it still fails. I'll suggest to do local > builds in a clean chroot, install build dependencies until the > full > list is sorted out. > " > > > > > On 8 May 2014 15:35, Maxim Uvarov <maxim.uvarov@linaro.org > <mailto:maxim.uvarov@linaro.org>> wrote: > > On 05/08/2014 08:18 PM, Mike Holmes wrote: > > Much better for me locally, but there is still an > issue on the build server > https://ci.linaro.org/jenkins/view/lng-ci/job/odp-apps-check/8/CROSS_COMPILE=armle,label=build/console > > is it possible to ssh to this server to see the logs? I > don't have an other idea to figure out this build problem. > > Thanks, > Maxim. > > > On 8 May 2014 06:13, Maxim Uvarov > <maxim.uvarov@linaro.org > <mailto:maxim.uvarov@linaro.org> > <mailto:maxim.uvarov@linaro.org > <mailto:maxim.uvarov@linaro.org>>> wrote: > > applied!. > > Thanks, > Maxim. > > On 05/08/2014 08:01 AM, Vincent Hsu wrote: > > Signed-off-by: Vincent Hsu > <vincent.hsu@linaro.org <mailto:vincent.hsu@linaro.org> > <mailto:vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>>> > > --- > libpcap/patches/0003-ODP-API-Updates.patch | 38 > ++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 > libpcap/patches/0003-ODP-API-Updates.patch > > diff --git > a/libpcap/patches/0003-ODP-API-Updates.patch > b/libpcap/patches/0003-ODP-API-Updates.patch > new file mode 100644 > index 0000000..d53cae2 > --- /dev/null > +++ b/libpcap/patches/0003-ODP-API-Updates.patch > @@ -0,0 +1,38 @@ > +From 984497e40e16a4b1594db0d5a64b338012a981de > Mon Sep 17 > 00:00:00 2001 > +From: Vincent Hsu <vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org> > <mailto:vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>>> > > +Date: Thu, 8 May 2014 11:32:03 +0800 > +Subject: [PATCH] ODP API Updates > + > +1. odp_schedule(NULL) -> odp_schedule(NULL, > ODP_SCHED_WAIT); > +2. ODP_SCHED_SYNC_NONE -> ODP_SCHED_SYNC_ATOMIC > + > +Signed-off-by: Vincent Hsu > <vincent.hsu@linaro.org <mailto:vincent.hsu@linaro.org> > <mailto:vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>>> > > +--- > + pcap-linux.c | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/pcap-linux.c b/pcap-linux.c > +index 4372be6..feebd20 100644 > +--- a/pcap-linux.c > ++++ b/pcap-linux.c > +@@ -6207,7 +6207,7 @@ pcap_odp_init(pcap_t > *handle) > + * resource > + */ > + qparam.sched.prio = > ODP_SCHED_PRIO_DEFAULT; > +- qparam.sched.sync = ODP_SCHED_SYNC_NONE; > ++ qparam.sched.sync = > ODP_SCHED_SYNC_ATOMIC; > + qparam.sched.group = > ODP_SCHED_GROUP_DEFAULT; > + snprintf(inq_name, sizeof(inq_name), > "%i-pktio_inq_def", > + (int)handle->pktio); > +@@ -6364,7 +6364,7 @@ pcap_read_odp(pcap_t > *handle, int > max_packets, pcap_handler callback, > + > + for (n = 1; (n <= max_packets) || > (max_packets < 0); > n++) { > + /* Use schedule to get buf > from any input queue */ > +- buf = odp_schedule(NULL); > ++ buf = odp_schedule(NULL, > ODP_SCHED_WAIT); > + /* fill out pcap_header */ > + gettimeofday(&ts, NULL); > + pcap_header.ts = ts; > +-- > +1.8.5 > + > > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > <mailto:lng-odp@lists.linaro.org> > <mailto:lng-odp@lists.linaro.org > <mailto:lng-odp@lists.linaro.org>> > http://lists.linaro.org/mailman/listinfo/lng-odp > > > > > -- > *Mike Holmes* > > Linaro Technical Manager / Lead > LNG - ODP > > > > > > -- > *Mike Holmes* > Linaro Technical Manager / Lead > LNG - ODP > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> > http://lists.linaro.org/mailman/listinfo/lng-odp > > > > > -- > Regards, > Vincent Hsu > > > > > -- > *Mike Holmes* > Linaro Technical Manager / Lead > LNG - ODP
native build works fine: https://validation.linaro.org/scheduler/job/126076/log_file I think that cross compilation is more complicated and needed to set up number of dependencies in cross environment. Suggestion is drop wireshark build from cross compilation and file card for that. Or file card for all cross platform because it will require some time to debug and set up environment. Thanks, Maxim. On 05/09/2014 05:01 PM, Mike Holmes wrote: > Here are some things that may help > > 1. This is a cross compile not a local build - might be the difference ? > 2. Here is the compele workspace of the run > https://ci.linaro.org/jenkins/view/lng-ci/job/odp-apps-check/ws/ > 3. I have added you as a maintainer of the ci project so you can play > with it. > > > On 8 May 2014 22:52, Vincent Hsu <vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>> wrote: > > It would be helpful to get the config.log in tcpdump folder. > > > On Fri, May 9, 2014 at 4:09 AM, Mike Holmes > <mike.holmes@linaro.org <mailto:mike.holmes@linaro.org>> wrote: > > The link was to the console of the build, what else were you > hoping to find ? > I can work with you to edit the build script to add verbosity > then we can re run in Jenkins. > > If there is something else Fathi can probably help, he did add > flex for us which fixed the initial problem I saw, after > adding flex he replied > > " > I've added bison/flex but it still fails. I'll suggest to do local > builds in a clean chroot, install build dependencies until the > full > list is sorted out. > " > > > > > On 8 May 2014 15:35, Maxim Uvarov <maxim.uvarov@linaro.org > <mailto:maxim.uvarov@linaro.org>> wrote: > > On 05/08/2014 08:18 PM, Mike Holmes wrote: > > Much better for me locally, but there is still an > issue on the build server > https://ci.linaro.org/jenkins/view/lng-ci/job/odp-apps-check/8/CROSS_COMPILE=armle,label=build/console > > is it possible to ssh to this server to see the logs? I > don't have an other idea to figure out this build problem. > > Thanks, > Maxim. > > > On 8 May 2014 06:13, Maxim Uvarov > <maxim.uvarov@linaro.org > <mailto:maxim.uvarov@linaro.org> > <mailto:maxim.uvarov@linaro.org > <mailto:maxim.uvarov@linaro.org>>> wrote: > > applied!. > > Thanks, > Maxim. > > On 05/08/2014 08:01 AM, Vincent Hsu wrote: > > Signed-off-by: Vincent Hsu > <vincent.hsu@linaro.org <mailto:vincent.hsu@linaro.org> > <mailto:vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>>> > > --- > libpcap/patches/0003-ODP-API-Updates.patch | 38 > ++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 > libpcap/patches/0003-ODP-API-Updates.patch > > diff --git > a/libpcap/patches/0003-ODP-API-Updates.patch > b/libpcap/patches/0003-ODP-API-Updates.patch > new file mode 100644 > index 0000000..d53cae2 > --- /dev/null > +++ b/libpcap/patches/0003-ODP-API-Updates.patch > @@ -0,0 +1,38 @@ > +From 984497e40e16a4b1594db0d5a64b338012a981de > Mon Sep 17 > 00:00:00 2001 > +From: Vincent Hsu <vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org> > <mailto:vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>>> > > +Date: Thu, 8 May 2014 11:32:03 +0800 > +Subject: [PATCH] ODP API Updates > + > +1. odp_schedule(NULL) -> odp_schedule(NULL, > ODP_SCHED_WAIT); > +2. ODP_SCHED_SYNC_NONE -> ODP_SCHED_SYNC_ATOMIC > + > +Signed-off-by: Vincent Hsu > <vincent.hsu@linaro.org <mailto:vincent.hsu@linaro.org> > <mailto:vincent.hsu@linaro.org > <mailto:vincent.hsu@linaro.org>>> > > +--- > + pcap-linux.c | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/pcap-linux.c b/pcap-linux.c > +index 4372be6..feebd20 100644 > +--- a/pcap-linux.c > ++++ b/pcap-linux.c > +@@ -6207,7 +6207,7 @@ pcap_odp_init(pcap_t > *handle) > + * resource > + */ > + qparam.sched.prio = > ODP_SCHED_PRIO_DEFAULT; > +- qparam.sched.sync = ODP_SCHED_SYNC_NONE; > ++ qparam.sched.sync = > ODP_SCHED_SYNC_ATOMIC; > + qparam.sched.group = > ODP_SCHED_GROUP_DEFAULT; > + snprintf(inq_name, sizeof(inq_name), > "%i-pktio_inq_def", > + (int)handle->pktio); > +@@ -6364,7 +6364,7 @@ pcap_read_odp(pcap_t > *handle, int > max_packets, pcap_handler callback, > + > + for (n = 1; (n <= max_packets) || > (max_packets < 0); > n++) { > + /* Use schedule to get buf > from any input queue */ > +- buf = odp_schedule(NULL); > ++ buf = odp_schedule(NULL, > ODP_SCHED_WAIT); > + /* fill out pcap_header */ > + gettimeofday(&ts, NULL); > + pcap_header.ts = ts; > +-- > +1.8.5 > + > > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > <mailto:lng-odp@lists.linaro.org> > <mailto:lng-odp@lists.linaro.org > <mailto:lng-odp@lists.linaro.org>> > http://lists.linaro.org/mailman/listinfo/lng-odp > > > > > -- > *Mike Holmes* > > Linaro Technical Manager / Lead > LNG - ODP > > > > > > -- > *Mike Holmes* > Linaro Technical Manager / Lead > LNG - ODP > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> > http://lists.linaro.org/mailman/listinfo/lng-odp > > > > > -- > Regards, > Vincent Hsu > > > > > -- > *Mike Holmes* > Linaro Technical Manager / Lead > LNG - ODP
Yes, if this is going to be a bigger problem we should make a bug for it and work on is in the background. Can we drop wireshark as a default target, leaving tcpdump in place ? we really want to be running this in LAVA to know it remains current to the extent that we can. This touches on an issue that may recur though, we target the OE filesystem and we cross compile everything for it, so our other apps and demos may have the same issue moving forward. On 12 May 2014 08:52, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > native build works fine: > https://validation.linaro.org/scheduler/job/126076/log_file > > I think that cross compilation is more complicated and needed to set up > number of dependencies in cross environment. > > Suggestion is drop wireshark build from cross compilation and file card > for that. Or file card for all cross platform because it will require some > time > to debug and set up environment. > > Thanks, > Maxim. > > > On 05/09/2014 05:01 PM, Mike Holmes wrote: > >> Here are some things that may help >> >> 1. This is a cross compile not a local build - might be the difference ? >> 2. Here is the compele workspace of the run >> https://ci.linaro.org/jenkins/view/lng-ci/job/odp-apps-check/ws/ >> 3. I have added you as a maintainer of the ci project so you can play >> with it. >> >> >> On 8 May 2014 22:52, Vincent Hsu <vincent.hsu@linaro.org <mailto: >> vincent.hsu@linaro.org>> wrote: >> >> It would be helpful to get the config.log in tcpdump folder. >> >> >> On Fri, May 9, 2014 at 4:09 AM, Mike Holmes >> <mike.holmes@linaro.org <mailto:mike.holmes@linaro.org>> wrote: >> >> The link was to the console of the build, what else were you >> hoping to find ? >> I can work with you to edit the build script to add verbosity >> then we can re run in Jenkins. >> >> If there is something else Fathi can probably help, he did add >> flex for us which fixed the initial problem I saw, after >> adding flex he replied >> >> " >> I've added bison/flex but it still fails. I'll suggest to do local >> builds in a clean chroot, install build dependencies until the >> full >> list is sorted out. >> " >> >> >> >> >> On 8 May 2014 15:35, Maxim Uvarov <maxim.uvarov@linaro.org >> <mailto:maxim.uvarov@linaro.org>> wrote: >> >> On 05/08/2014 08:18 PM, Mike Holmes wrote: >> >> Much better for me locally, but there is still an >> issue on the build server >> https://ci.linaro.org/jenkins/view/lng-ci/job/odp-apps- >> check/8/CROSS_COMPILE=armle,label=build/console >> >> is it possible to ssh to this server to see the logs? I >> don't have an other idea to figure out this build problem. >> >> Thanks, >> Maxim. >> >> >> On 8 May 2014 06:13, Maxim Uvarov >> <maxim.uvarov@linaro.org >> <mailto:maxim.uvarov@linaro.org> >> <mailto:maxim.uvarov@linaro.org >> >> <mailto:maxim.uvarov@linaro.org>>> wrote: >> >> applied!. >> >> Thanks, >> Maxim. >> >> On 05/08/2014 08:01 AM, Vincent Hsu wrote: >> >> Signed-off-by: Vincent Hsu >> <vincent.hsu@linaro.org <mailto:vincent.hsu@linaro.org> >> <mailto:vincent.hsu@linaro.org >> >> <mailto:vincent.hsu@linaro.org>>> >> >> --- >> libpcap/patches/0003-ODP-API-Updates.patch | 38 >> ++++++++++++++++++++++++++++++ >> 1 file changed, 38 insertions(+) >> create mode 100644 >> libpcap/patches/0003-ODP-API-Updates.patch >> >> diff --git >> a/libpcap/patches/0003-ODP-API-Updates.patch >> b/libpcap/patches/0003-ODP-API-Updates.patch >> new file mode 100644 >> index 0000000..d53cae2 >> --- /dev/null >> +++ b/libpcap/patches/0003-ODP-API-Updates.patch >> @@ -0,0 +1,38 @@ >> +From 984497e40e16a4b1594db0d5a64b338012a981de >> Mon Sep 17 >> 00:00:00 2001 >> +From: Vincent Hsu <vincent.hsu@linaro.org >> <mailto:vincent.hsu@linaro.org> >> <mailto:vincent.hsu@linaro.org >> >> <mailto:vincent.hsu@linaro.org>>> >> >> +Date: Thu, 8 May 2014 11:32:03 +0800 >> +Subject: [PATCH] ODP API Updates >> + >> +1. odp_schedule(NULL) -> odp_schedule(NULL, >> ODP_SCHED_WAIT); >> +2. ODP_SCHED_SYNC_NONE -> ODP_SCHED_SYNC_ATOMIC >> + >> +Signed-off-by: Vincent Hsu >> <vincent.hsu@linaro.org <mailto:vincent.hsu@linaro.org> >> <mailto:vincent.hsu@linaro.org >> >> <mailto:vincent.hsu@linaro.org>>> >> >> +--- >> + pcap-linux.c | 4 ++-- >> + 1 file changed, 2 insertions(+), 2 deletions(-) >> + >> +diff --git a/pcap-linux.c b/pcap-linux.c >> +index 4372be6..feebd20 100644 >> +--- a/pcap-linux.c >> ++++ b/pcap-linux.c >> +@@ -6207,7 +6207,7 @@ pcap_odp_init(pcap_t >> *handle) >> + * resource >> + */ >> + qparam.sched.prio = >> ODP_SCHED_PRIO_DEFAULT; >> +- qparam.sched.sync = ODP_SCHED_SYNC_NONE; >> ++ qparam.sched.sync = >> ODP_SCHED_SYNC_ATOMIC; >> + qparam.sched.group = >> ODP_SCHED_GROUP_DEFAULT; >> + snprintf(inq_name, sizeof(inq_name), >> "%i-pktio_inq_def", >> + (int)handle->pktio); >> +@@ -6364,7 +6364,7 @@ pcap_read_odp(pcap_t >> *handle, int >> max_packets, pcap_handler callback, >> + >> + for (n = 1; (n <= max_packets) || >> (max_packets < 0); >> n++) { >> + /* Use schedule to get buf >> from any input queue */ >> +- buf = odp_schedule(NULL); >> ++ buf = odp_schedule(NULL, >> ODP_SCHED_WAIT); >> + /* fill out pcap_header */ >> + gettimeofday(&ts, NULL); >> + pcap_header.ts = ts; >> +-- >> +1.8.5 >> + >> >> >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org >> <mailto:lng-odp@lists.linaro.org> >> <mailto:lng-odp@lists.linaro.org >> >> <mailto:lng-odp@lists.linaro.org>> >> http://lists.linaro.org/mailman/listinfo/lng-odp >> >> >> >> >> -- *Mike Holmes* >> >> Linaro Technical Manager / Lead >> LNG - ODP >> >> >> >> >> >> -- *Mike Holmes* >> Linaro Technical Manager / Lead >> LNG - ODP >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> >> http://lists.linaro.org/mailman/listinfo/lng-odp >> >> >> >> >> -- Regards, >> Vincent Hsu >> >> >> >> >> >> -- >> *Mike Holmes* >> Linaro Technical Manager / Lead >> LNG - ODP >> > >
diff --git a/libpcap/patches/0003-ODP-API-Updates.patch b/libpcap/patches/0003-ODP-API-Updates.patch new file mode 100644 index 0000000..d53cae2 --- /dev/null +++ b/libpcap/patches/0003-ODP-API-Updates.patch @@ -0,0 +1,38 @@ +From 984497e40e16a4b1594db0d5a64b338012a981de Mon Sep 17 00:00:00 2001 +From: Vincent Hsu <vincent.hsu@linaro.org> +Date: Thu, 8 May 2014 11:32:03 +0800 +Subject: [PATCH] ODP API Updates + +1. odp_schedule(NULL) -> odp_schedule(NULL, ODP_SCHED_WAIT); +2. ODP_SCHED_SYNC_NONE -> ODP_SCHED_SYNC_ATOMIC + +Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org> +--- + pcap-linux.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pcap-linux.c b/pcap-linux.c +index 4372be6..feebd20 100644 +--- a/pcap-linux.c ++++ b/pcap-linux.c +@@ -6207,7 +6207,7 @@ pcap_odp_init(pcap_t *handle) + * resource + */ + qparam.sched.prio = ODP_SCHED_PRIO_DEFAULT; +- qparam.sched.sync = ODP_SCHED_SYNC_NONE; ++ qparam.sched.sync = ODP_SCHED_SYNC_ATOMIC; + qparam.sched.group = ODP_SCHED_GROUP_DEFAULT; + snprintf(inq_name, sizeof(inq_name), "%i-pktio_inq_def", + (int)handle->pktio); +@@ -6364,7 +6364,7 @@ pcap_read_odp(pcap_t *handle, int max_packets, pcap_handler callback, + + for (n = 1; (n <= max_packets) || (max_packets < 0); n++) { + /* Use schedule to get buf from any input queue */ +- buf = odp_schedule(NULL); ++ buf = odp_schedule(NULL, ODP_SCHED_WAIT); + /* fill out pcap_header */ + gettimeofday(&ts, NULL); + pcap_header.ts = ts; +-- +1.8.5 +
Signed-off-by: Vincent Hsu <vincent.hsu@linaro.org> --- libpcap/patches/0003-ODP-API-Updates.patch | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 libpcap/patches/0003-ODP-API-Updates.patch