Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleaned up Mbed LWIP configurations #11586

Merged
merged 2 commits into from Oct 21, 2019

Conversation

@AnttiKauppila
Copy link
Contributor

AnttiKauppila commented Sep 27, 2019

Description

Cleaned up LWIP configuration mechanism. Moved default settings into mbed_lib.json and updated "help" sections accordingly. This is not a breaking change, if some developers have overridden those values earlier, this change has no effect for them.
Also as mbed_retarget.h defines errno values, there were warnings about duplicates because LWIP defined those as well by default. This has also been fixed in this PR.

Pull request type

[ ] Fix
[X] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

@VeijoPesonen @kjbracey-arm @ARMmbed/mbed-os-ipcore

Release Notes

LWIP configuration mechanism has been updated to make it easier to control default values directly from mbed_lib.json. This is not a breaking change and existing applications should still work unmodified with this change.

@ciarmcom ciarmcom requested review from kjbracey-arm, VeijoPesonen and ARMmbed/mbed-os-maintainers Sep 27, 2019
@ciarmcom

This comment has been minimized.

Copy link
Member

ciarmcom commented Sep 27, 2019

@@ -71,7 +71,9 @@
#define PPP_DNS 1

// Used as maximum size for output buffer, to restrict the memory manager get_pool_alloc_unit()
#ifndef PBUF_POOL_BUFSIZE
#define PBUF_POOL_BUFSIZE 536 + 40

This comment has been minimized.

Copy link
@VeijoPesonen

VeijoPesonen Sep 30, 2019

Contributor

536+40 for IPv6 and 536+20 for IPv4?

Copy link
Contributor

VeijoPesonen left a comment

The only comment I wrote was not about these changes, only something I happened to spot during the review.

Looks good to me.

Copy link
Member

0xc0170 left a comment

Otherwise looks good.

I might add more details to the commit msg about the clean up. Reading the code, you fix the config to provide default values instead of null.

@@ -44,6 +44,7 @@ extern "C" {
#endif

#ifdef LWIP_PROVIDE_ERRNO
#if LWIP_PROVIDE_ERRNO == 1

This comment has been minimized.

Copy link
@0xc0170

0xc0170 Oct 1, 2019

Member

line 46 and 47 are very similar, shouldn't ifdef be removed?

This comment has been minimized.

Copy link
@AnttiKauppila

AnttiKauppila Oct 4, 2019

Author Contributor

Did not want to change LwIP header logic here (other than remove duplicates)

@AnttiKauppila

This comment has been minimized.

Copy link
Contributor Author

AnttiKauppila commented Oct 4, 2019

@adbridge Why 6.0? Why not 5.14.x for example?

@adbridge

This comment has been minimized.

Copy link
Contributor

adbridge commented Oct 4, 2019

@AnttiKauppila ahhh it's because Martin had previously marked this as needing to go to a feature branch. If there is no api change then we could conceivably take this to a patch ?

@adbridge

This comment has been minimized.

Copy link
Contributor

adbridge commented Oct 10, 2019

CI started

@mbed-ci

This comment has been minimized.

Copy link

mbed-ci commented Oct 10, 2019

Test run: FAILED

Summary: 3 of 4 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_build-GCC_ARM
  • jenkins-ci/mbed-os-ci_build-IAR
  • jenkins-ci/mbed-os-ci_build-ARM
@adbridge

This comment has been minimized.

Copy link
Contributor

adbridge commented Oct 11, 2019

Looks like a possible CI error, restarting

@mbed-ci

This comment has been minimized.

Copy link

mbed-ci commented Oct 11, 2019

Test run: FAILED

Summary: 3 of 4 test jobs failed
Build number : 2
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_build-ARM
  • jenkins-ci/mbed-os-ci_build-IAR
  • jenkins-ci/mbed-os-ci_build-GCC_ARM
@adbridge

This comment has been minimized.

Copy link
Contributor

adbridge commented Oct 11, 2019

@AnttiKauppila on further analysis this looks like a genuine failure, please investigate

@adbridge

This comment has been minimized.

Copy link
Contributor

adbridge commented Oct 11, 2019

[Warning] maclib_task.c@82,17: implicit declaration of function 'rda_mail_put' is invalid in C99 [-Wimplicit-function-declaration]
[Warning] maclib_task.c@161,27: implicit declaration of function 'rda_mail_create' is invalid in C99 [-Wimplicit-function-declaration]
[Warning] maclib_task.c@172,29: implicit declaration of function 'rda_mail_get' is invalid in C99 [-Wimplicit-function-declaration]
[Warning] maclib_task.c@201,21: implicit declaration of function 'rda_mail_put' is invalid in C99 [-Wimplicit-function-declaration]
[Error] maclib_task.c@221,29: expected ';' after expression

@0xc0170

This comment has been minimized.

Copy link
Member

0xc0170 commented Oct 18, 2019

Travis restarted, CI restarted as well

@0xc0170 0xc0170 added needs: CI and removed needs: work labels Oct 18, 2019
@mbed-ci

This comment has been minimized.

Copy link

mbed-ci commented Oct 18, 2019

Test run: SUCCESS

Summary: 11 of 11 test jobs passed
Build number : 3
Build artifacts

Copy link
Member

0xc0170 left a comment

I would like to see better commit msg than "Cleaned up Mbed LWIP configurations" for clean up like that in future.

As this was set as "Refactor" - thus I initially set it to the feature release.

@0xc0170 0xc0170 added ready for merge and removed needs: CI labels Oct 21, 2019
@0xc0170 0xc0170 merged commit f6c28e5 into ARMmbed:master Oct 21, 2019
25 checks passed
25 checks passed
continuous-integration/jenkins/pr-head This commit looks good
Details
jenkins-ci/build-ARM Success
Details
jenkins-ci/build-GCC_ARM Success
Details
jenkins-ci/build-IAR Success
Details
jenkins-ci/cloud-client-test Success
Details
jenkins-ci/dynamic-memory-usage RTOS ROM(+0 bytes) RAM(+0 bytes)
Details
jenkins-ci/exporter Success
Details
jenkins-ci/greentea-test Success
Details
jenkins-ci/mbed2-build-ARM Success
Details
jenkins-ci/mbed2-build-GCC_ARM Success
Details
jenkins-ci/mbed2-build-IAR Success
Details
jenkins-ci/unittests Success
Details
travis-ci/astyle Success!
Details
travis-ci/docs Success!
Details
travis-ci/doxy-spellcheck Success!
Details
travis-ci/events Success! Runtime is 8642 cycles.
Details
travis-ci/gitattributestest Success!
Details
travis-ci/include_check Success!
Details
travis-ci/licence_check Success!
Details
travis-ci/littlefs Success! Code size is 8464B.
Details
travis-ci/psa-autogen Success!
Details
travis-ci/tools-py2.7 Success!
Details
travis-ci/tools-py3.5 Success!
Details
travis-ci/tools-py3.6 Success!
Details
travis-ci/tools-py3.7 Success!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.