Refactoring \nanostack --> moving it inside \connectivity. #13363

ashok-rao · 2020-07-28T13:46:31Z

Summary of changes

Mbed OS will soon be changing directory structure to the below:

connectivity
├── netsocket
├── lwipstack
├── nanostack
│   ├── mbed_lib.json // nanostack-interface's mbed_lib.json
│   ├── include
│   │   └── nanostack // headers from features/netsocket/nanostack-interface
│   ├── source        // sources from features/netsocket/nanostack-interface
│   ├── coap-service  // used by Thread only - deprecate?
│   ├── mbed-mesh-api
│   ├── nanostack-hal-mbed-cmsis-rtos // HAL porting layer for Nanostack on mbed with CMSIS-RTOS
│   ├── sal-stack-nanostack
│   └── sal-stack-nanostack-eventloop
├── cellular                // previously in features/cellular/framework/
├── ...

This PR is a part of a wider \connectivity refactoring and implements the above new directory structure for \nanostack.

Impact of changes

-None-

Migration actions required

-None-

Documentation

-None-

Pull request type

[x] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

[] No Tests required for this change (E.g docs only update)
[x] Covered by existing mbed-os tests (Greentea or Unittest)
[x] Tests / results supplied as part of this PR

Build successes:

K64F::GCC_ARM::MBED-BUILD
K64F::GCC_ARM::MBED-OS-TESTS-NETWORK-INTERFACE
K64F::GCC_ARM::MBED-OS-TESTS-NETWORK-L3IP

Build skips:

K64F::GCC_ARM::MBED-OS-TESTS-NETWORK-EMAC
K64F::GCC_ARM::MBED-OS-TESTS-NETWORK-MULTIHOMING
K64F::GCC_ARM::MBED-OS-TESTS-NETWORK-WIFI

Reviewers

@LDong-Arm @evedon @gpsimenos

ashok-rao · 2020-07-28T13:49:20Z

For some reason git didn't track these 4 files and shows them as deleted rather than renamed. Any thoughts why? And are these files necessary to be present? @LDong-Arm .. any thoughts?

        deleted:    features/nanostack/sal-stack-nanostack-eventloop/.cproject
        deleted:    features/nanostack/sal-stack-nanostack-eventloop/.project
        deleted:    features/nanostack/sal-stack-nanostack-eventloop/.settings/org.eclipse.cdt.codan.core.prefs
        deleted:    features/nanostack/sal-stack-nanostack-eventloop/.settings/org.eclipse.cdt.core.prefs

mergify · 2020-07-28T14:31:05Z

This PR cannot be merged due to conflicts. Please rebase to resolve them.

ciarmcom · 2020-07-28T15:00:36Z

@ashok-rao, thank you for your changes.
@evedon @gpsimenos @LDong-Arm @ARMmbed/mbed-os-maintainers please review.

LDong-Arm · 2020-07-28T15:01:11Z

For some reason git didn't track these 4 files and shows them as deleted rather than renamed. Any thoughts why? And are these files necessary to be present? @LDong-Arm .. any thoughts?
        deleted:    features/nanostack/sal-stack-nanostack-eventloop/.cproject
        deleted:    features/nanostack/sal-stack-nanostack-eventloop/.project
        deleted:    features/nanostack/sal-stack-nanostack-eventloop/.settings/org.eclipse.cdt.codan.core.prefs
        deleted:    features/nanostack/sal-stack-nanostack-eventloop/.settings/org.eclipse.cdt.core.prefs

Discussed offline:
Those are IDE files that shouldn't have been there in the first place.
git didn't track them because when you do mbed import, Mbed CLI adds patterns for IDE files to .git/info/exclude which is a local/non-committable equivalent to .gitignore.

ashok-rao · 2020-07-28T15:07:27Z

astyle failed again for the below. This file has not been touched as part of this PR. Only moved to the new location. Why astyle fails now?

--- a/connectivity/nanostack/sal-stack-nanostack-eventloop/source/event.c
+++ b/connectivity/nanostack/sal-stack-nanostack-eventloop/source/event.c
@@ -197,7 +197,7 @@ void event_core_free_push(arm_event_storage_t *free)
             timer_sys_event_free(free);
             break;
         case ARM_LIB_EVENT_USER:
-            // No need set state to UNQUEUED - we forget about it.
+        // No need set state to UNQUEUED - we forget about it.
         default:
             break;
     }

LDong-Arm · 2020-07-28T15:18:05Z

astyle failed again for the below. This file has not been touched as part of this PR. Only moved to the new location. Why astyle fails now?

Moved is considered changed too. I believe we should add the path to sal-stack-nanostack-eventloop to .astyleignore because it's imported from https://github.com/ARMmbed/sal-stack-nanostack-eventloop and thus not part of the Mbed OS project. It was probably missing before.

evedon · 2020-07-28T15:25:47Z

Some scripts have lost execution permission.

0xc0170 · 2020-07-28T15:34:11Z

Some scripts have lost execution permission.

What is being used to move the files, out of curiosity, that permissions are being changed?

.astyleignore

LDong-Arm · 2020-07-28T15:39:01Z

Some scripts have lost execution permission.

What is being used to move the files, out of curiosity, that permissions are being changed?

Very same question from me - it has happened a lot in directory restructure PRs. It'd be good to identify the root cause.
@ashok-rao and @rajkan01 use Windows machines and have both encountered this issue - maybe permissions get changed when moving files on Windows?

ashok-rao · 2020-07-28T15:39:26Z

Some scripts have lost execution permission.

Hmm. Strange. I haven't changed any permissions.

Some scripts have lost execution permission.

What is being used to move the files, out of curiosity, that permissions are being changed?

@0xc0170 : I'm moving them on a Windows machine from terminal. Is that what you were asking?

ashok-rao · 2020-07-29T09:02:14Z

Travis failed with this below. The MeshInterface.h is moved to \connectivity\netsocket\include\netsocket as part of PR #13335 Question: Does this mean nanostack-libservice will need to be built again or make the change in mbed-os\connectivity\nanostack\ according to @rajkan01's PR above?

[Fatal Error] MeshInterfaceNanostack.h@21,27: MeshInterface.h: No such file or directory
[ERROR] In file included from ./connectivity/nanostack/mbed-mesh-api/source/CallbackHandler.cpp:17:0:
./connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h:21:27: fatal error: MeshInterface.h: No such file or directory

LDong-Arm · 2020-07-29T09:11:01Z

@ashok-rao To fix the Travis failure you need to rename features/nanostack -> connectivity/nanostack in .travis.yml.

mergify · 2020-07-29T11:44:59Z

This PR cannot be merged due to conflicts. Please rebase to resolve them.

gpsimenos

LGTM

Pull request has been modified.

LDong-Arm

LGTM

ashok-rao · 2020-08-06T08:58:01Z

@adbridge .. ready for CI, Thanks!

adbridge · 2020-08-06T09:09:59Z

CI started

mbed-ci · 2020-08-06T09:56:48Z

Jenkins CI Test : ❌ FAILED

Build Number: 2 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs	Status
jenkins-ci/mbed-os-ci_unittests	✔️
jenkins-ci/mbed-os-ci_build-GCC_ARM	❌
jenkins-ci/mbed-os-ci_build-ARM	❌

adbridge · 2020-08-06T10:43:24Z

@ashok-rao these errors look related:

#### STDOUT ####
Building project mbed-os-example-blinky-baremetal (K66F, ARMC6)
Scan: mbed-os-example-blinky-baremetal
Compile [  0.6%]: Nanostack.cpp
[Fatal Error] Nanostack.h@21,10: 'OnboardNetworkStack.h' file not found
[ERROR] In file included from ./mbed-os/connectivity/nanostack/source/Nanostack.cpp:20:
./mbed-os/connectivity/nanostack/include/nanostack-interface/Nanostack.h:21:10: fatal error: 'OnboardNetworkStack.h' file not found
#include "OnboardNetworkStack.h"
         ^~~~~~~~~~~~~~~~~~~~~~~

LDong-Arm · 2020-08-06T10:52:19Z

@ashok-rao The error is because you moved Nanostack.cpp from features/nanostack/nanostack-interface (which has an mbed_lib.json) into connectivity/nanostack/source (which doesn't have an mbed_lib.json). This sort of things have cause problems many times during the restructuring work.

To fix it, just move connectivity/nanostack/include/nanostack-interface/mbed_lib.json to connectivity/nanostack/mbed_lib.json

adbridge · 2020-08-06T15:56:07Z

CI restarted

mbed-ci · 2020-08-06T17:21:15Z

Jenkins CI Test : ✔️ SUCCESS

Build Number: 3 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs	Status
jenkins-ci/mbed-os-ci_unittests	✔️
jenkins-ci/mbed-os-ci_build-ARM	✔️
jenkins-ci/mbed-os-ci_build-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_dynamic-memory-usage	✔️
jenkins-ci/mbed-os-ci_cloud-client-pytest	✔️
jenkins-ci/mbed-os-ci_wisun-mesh-test	✔️
jenkins-ci/mbed-os-ci_greentea-test	✔️

mergify bot added the needs: work label Jul 28, 2020

ashok-rao force-pushed the nanostack-refactor branch 2 times, most recently from 8f7c80d to 270e2c2 Compare July 28, 2020 14:45

ciarmcom added the release-type: patch Indentifies a PR as containing just a patch label Jul 28, 2020

ciarmcom requested review from evedon, gpsimenos, LDong-Arm and a team July 28, 2020 15:00

ciarmcom added the needs: review label Jul 28, 2020

mergify bot removed the needs: review label Jul 28, 2020

ashok-rao force-pushed the nanostack-refactor branch from 270e2c2 to 84782a9 Compare July 28, 2020 15:24

LDong-Arm reviewed Jul 28, 2020

View reviewed changes

.astyleignore Outdated Show resolved Hide resolved

ashok-rao force-pushed the nanostack-refactor branch 4 times, most recently from 0d5e604 to 42953c3 Compare July 31, 2020 16:12

gpsimenos approved these changes Aug 3, 2020

View reviewed changes

Ashok Rao added 3 commits August 5, 2020 16:55

Changing .asytleignore paths

514255f

Fixing Travis failure

a36718d

Incorporating review comments

ce3d999

ashok-rao force-pushed the nanostack-refactor branch from 42953c3 to ce3d999 Compare August 5, 2020 15:59

Fixing UNITTESTS

8d7c755

LDong-Arm approved these changes Aug 5, 2020

View reviewed changes

adbridge added needs: CI and removed needs: work labels Aug 6, 2020

mergify bot added needs: work and removed needs: CI labels Aug 6, 2020

Moving mbed_lib.json outside sources

724624a

adbridge added needs: CI and removed needs: work labels Aug 6, 2020

adbridge approved these changes Aug 7, 2020

View reviewed changes

adbridge merged commit f7e60be into ARMmbed:master Aug 7, 2020

mergify bot added ready for merge and removed needs: CI ready for merge labels Aug 7, 2020

mbedmain added release-version: 6.2.1 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Aug 16, 2020

Refactoring \nanostack --> moving it inside \connectivity. #13363

Refactoring \nanostack --> moving it inside \connectivity. #13363

Uh oh!

Conversation

ashok-rao commented Jul 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of changes

Impact of changes

Migration actions required

Documentation

Pull request type

Test results

Reviewers

Uh oh!

ashok-rao commented Jul 28, 2020

Uh oh!

mergify bot commented Jul 28, 2020

Uh oh!

ciarmcom commented Jul 28, 2020

Uh oh!

LDong-Arm commented Jul 28, 2020

Uh oh!

ashok-rao commented Jul 28, 2020

Uh oh!

LDong-Arm commented Jul 28, 2020

Uh oh!

evedon commented Jul 28, 2020

Uh oh!

0xc0170 commented Jul 28, 2020

Uh oh!

Uh oh!

LDong-Arm commented Jul 28, 2020

Uh oh!

ashok-rao commented Jul 28, 2020

Uh oh!

ashok-rao commented Jul 29, 2020

Uh oh!

LDong-Arm commented Jul 29, 2020

Uh oh!

mergify bot commented Jul 29, 2020

Uh oh!

gpsimenos left a comment

Choose a reason for hiding this comment

Uh oh!

LDong-Arm left a comment

Choose a reason for hiding this comment

Uh oh!

ashok-rao commented Aug 6, 2020

Uh oh!

adbridge commented Aug 6, 2020

Uh oh!

mbed-ci commented Aug 6, 2020

Jenkins CI Test : ❌ FAILED

Build Number: 2 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

Uh oh!

adbridge commented Aug 6, 2020

Uh oh!

LDong-Arm commented Aug 6, 2020

Uh oh!

adbridge commented Aug 6, 2020

Uh oh!

mbed-ci commented Aug 6, 2020

Jenkins CI Test : ✔️ SUCCESS

Build Number: 3 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

Uh oh!

Uh oh!

ashok-rao commented Jul 28, 2020 •

edited

Loading