Skip to content

Commit 970552f

Browse files
authored
Update to ns-3.38 and minor memory leak fixes (#101)
* lte-related changes * non lte-related changes * Update ns-3 to commit 9a2fd5d * Update to ns-3.38 RC 1 * Improve readability of UpdateUeSinrEstimate * Clear maps in the PHY classes object destructors * Add author, changes and rel notes MD files * Update to ns-3.38 * Add required internet-apps to enabled modules in the CI * Reset PHY ptrs only when the simulation actually ends * enforce new clang-format based code style * add missing includes in lte test files * add missing includes in lte/model
1 parent a402f10 commit 970552f

File tree

3,191 files changed

+738926
-634334
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,191 files changed

+738926
-634334
lines changed

.clang-format

Lines changed: 26 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,29 @@
11
---
22
Language: Cpp
3-
AccessModifierOffset: -2
4-
AlignAfterOpenBracket: Align
5-
AlignConsecutiveAssignments: false
6-
AlignConsecutiveDeclarations: false
7-
AlignEscapedNewlinesLeft: true
8-
AlignOperands: true
9-
AlignTrailingComments: false
10-
AllowAllParametersOfDeclarationOnNextLine: true
11-
AllowShortBlocksOnASingleLine: false
12-
AllowShortCaseLabelsOnASingleLine: false
13-
AllowShortFunctionsOnASingleLine: None
14-
AllowShortIfStatementsOnASingleLine: false
15-
AllowShortLoopsOnASingleLine: false
16-
AlwaysBreakAfterReturnType: AllDefinitions
17-
AlwaysBreakTemplateDeclarations: true
18-
BinPackArguments: true
19-
BinPackParameters: true
20-
BreakBeforeBinaryOperators: None
21-
BreakBeforeBraces: Custom
22-
BraceWrapping:
23-
AfterClass: true
24-
AfterControlStatement: true
25-
AfterFunction: true
26-
AfterNamespace: false
27-
AfterStruct: true
28-
IndentBraces: true
29-
BeforeElse: true
30-
BreakBeforeTernaryOperators: true
31-
BreakConstructorInitializersBeforeComma: false
3+
BasedOnStyle: Microsoft
4+
5+
AllowAllArgumentsOnNextLine: false
6+
AllowAllParametersOfDeclarationOnNextLine: false
7+
AlwaysBreakAfterReturnType: TopLevelDefinitions
8+
AlwaysBreakTemplateDeclarations: Yes
9+
BinPackArguments: false
10+
BinPackParameters: false
3211
ColumnLimit: 100
33-
ConstructorInitializerAllOnOneLineOrOnePerLine: true
34-
Cpp11BracedListStyle: true
35-
DerivePointerAlignment: false
36-
IndentCaseLabels: false
37-
IndentWidth: 2
38-
NamespaceIndentation: None
39-
PointerAlignment: Right
40-
ReflowComments: false
41-
SortIncludes: false
42-
SpaceAfterCStyleCast: true
43-
SpaceAfterTemplateKeyword: true
44-
SpaceBeforeAssignmentOperators: true
45-
SpaceBeforeParens: Always
46-
SpaceInEmptyParentheses: false
47-
SpacesInAngles: false
48-
SpacesInCStyleCastParentheses: false
49-
SpacesInParentheses: false
50-
SpacesInSquareBrackets: false
51-
Standard: 'Cpp11'
52-
UseTab: Never
53-
...
12+
DeriveLineEnding: false
13+
IncludeBlocks: Regroup
14+
IncludeCategories:
15+
- Regex: '^(<|")ns3/'
16+
Priority: 2
17+
SortPriority: 0
18+
- Regex: "^<"
19+
Priority: 3
20+
SortPriority: 0
21+
- Regex: ".*"
22+
Priority: 1
23+
SortPriority: 0
24+
KeepEmptyLinesAtTheStartOfBlocks: false
25+
PackConstructorInitializers: Never
26+
PointerAlignment: Left
27+
QualifierAlignment: Left
28+
SeparateDefinitionBlocks: Always
29+
Standard: "c++17"

.clang-tidy

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
Checks: >
2+
-*,
3+
bugprone-argument-comment,
4+
bugprone-bool-pointer-implicit-conversion,
5+
bugprone-inaccurate-erase,
6+
bugprone-move-forwarding-reference,
7+
bugprone-redundant-branch-condition,
8+
bugprone-string-constructor,
9+
bugprone-string-integer-assignment,
10+
bugprone-suspicious-memset-usage,
11+
bugprone-suspicious-semicolon,
12+
bugprone-suspicious-string-compare,
13+
bugprone-terminating-continue,
14+
bugprone-too-small-loop-variable,
15+
bugprone-virtual-near-miss,
16+
misc-redundant-expression,
17+
misc-static-assert,
18+
modernize-make-shared,
19+
modernize-make-unique,
20+
modernize-redundant-void-arg,
21+
modernize-use-emplace,
22+
modernize-use-equals-delete,
23+
modernize-use-nullptr,
24+
modernize-use-override,
25+
performance-faster-string-find,
26+
performance-for-range-copy,
27+
performance-implicit-conversion-in-loop,
28+
performance-inefficient-algorithm,
29+
performance-inefficient-vector-operation,
30+
performance-trivially-destructible,
31+
readability-braces-around-statements,
32+
readability-container-size-empty,
33+
readability-duplicate-include,
34+
readability-isolate-declaration,
35+
readability-make-member-function-const,
36+
readability-misleading-indentation,
37+
readability-misplaced-array-index,
38+
readability-redundant-control-flow,
39+
readability-redundant-function-ptr-dereference,
40+
readability-redundant-smartptr-get,
41+
readability-redundant-string-cstr,
42+
readability-simplify-subscript-expr,
43+
readability-static-accessed-through-instance,
44+
readability-static-definition-in-anonymous-namespace,
45+
readability-string-compare,
46+
readability-uppercase-literal-suffix,
47+
48+
FormatStyle: "file"
49+
HeaderFilterRegex: ".*(ns|NS).*/(contrib|examples|src|scratch|utils)/*/.*h"
50+
UseColor: true

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424

2525
# Enable only the mmwave module to speedup the test
2626
- name: build and run the tests
27-
run: ./ns3 configure --enable-examples --enable-tests --enable-modules=mmwave && ./ns3 build && ./test.py
27+
run: ./ns3 configure --enable-examples --enable-tests --enable-modules=mmwave,internet-apps && ./ns3 build && ./test.py

.vscode/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
*
2+
!.gitignore
3+
4+
!launch.json
5+
!tasks.json

.vscode/launch.json

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "(gdb) Launch from scratch",
9+
"type": "cppdbg",
10+
"request": "launch",
11+
"program": "${workspaceFolder}/build/${relativeFileDirname}/ns3-dev-${fileBasenameNoExtension}-${input:buildType}",
12+
"args": [],
13+
"stopAtEntry": false,
14+
"cwd": "${workspaceFolder}",
15+
"preLaunchTask": "Build",
16+
"environment": [
17+
{
18+
"name": "LD_LIBRARY_PATH",
19+
"value": "${workspaceFolder}/build/lib/"
20+
}
21+
],
22+
"externalConsole": false,
23+
"MIMode": "gdb",
24+
"setupCommands": [
25+
{
26+
"description": "Enable pretty-printing for gdb",
27+
"text": "-enable-pretty-printing",
28+
"ignoreFailures": true
29+
}
30+
]
31+
},
32+
{
33+
"name": "(lldb) Launch from scratch",
34+
"type": "cppdbg",
35+
"request": "launch",
36+
"program": "${workspaceFolder}/build/${relativeFileDirname}/ns3-dev-${fileBasenameNoExtension}-${input:buildType}",
37+
"args": [],
38+
"stopAtEntry": false,
39+
"cwd": "${workspaceFolder}",
40+
"preLaunchTask": "Build",
41+
"environment": [
42+
{
43+
"name": "LD_LIBRARY_PATH",
44+
"value": "${workspaceFolder}/build/lib/"
45+
}
46+
],
47+
"externalConsole": false,
48+
"MIMode": "lldb"
49+
},
50+
{
51+
"name": "(gdb) Launch testrunner",
52+
"type": "cppdbg",
53+
"request": "launch",
54+
"program": "${workspaceFolder}/build/utils/ns3-dev-test-runner-${input:buildType}",
55+
"args": [
56+
"--suite=${selectedText}"
57+
],
58+
"stopAtEntry": false,
59+
"cwd": "${workspaceFolder}",
60+
"preLaunchTask": "Build",
61+
"environment": [
62+
{
63+
"name": "LD_LIBRARY_PATH",
64+
"value": "${workspaceFolder}/build/lib/"
65+
}
66+
],
67+
"externalConsole": false,
68+
"MIMode": "gdb",
69+
"setupCommands": [
70+
{
71+
"description": "Enable pretty-printing for gdb",
72+
"text": "-enable-pretty-printing",
73+
"ignoreFailures": true
74+
}
75+
]
76+
},
77+
{
78+
"name": "(lldb) Launch testrunner",
79+
"type": "cppdbg",
80+
"request": "launch",
81+
"program": "${workspaceFolder}/build/utils/ns3-dev-test-runner-${input:buildType}",
82+
"args": [
83+
"--suite=${selectedText}"
84+
],
85+
"stopAtEntry": false,
86+
"cwd": "${workspaceFolder}",
87+
"preLaunchTask": "Build",
88+
"environment": [
89+
{
90+
"name": "LD_LIBRARY_PATH",
91+
"value": "${workspaceFolder}/build/lib/"
92+
}
93+
],
94+
"externalConsole": false,
95+
"MIMode": "lldb"
96+
}
97+
],
98+
"inputs": [
99+
{
100+
"type": "pickString",
101+
"id": "buildType",
102+
"description": "What is the build option?",
103+
"options": [
104+
"debug",
105+
"default",
106+
"optimized",
107+
"release",
108+
"minsizerel"
109+
],
110+
"default": "default"
111+
}
112+
]
113+
}

.vscode/tasks.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"label": "Build",
8+
"type": "shell",
9+
"command": "./ns3",
10+
"group": {
11+
"kind": "build",
12+
"isDefault": true
13+
}
14+
},
15+
{
16+
"label": "Run tests",
17+
"type": "shell",
18+
"command": "./test.py",
19+
"group": {
20+
"kind": "test",
21+
"isDefault": true
22+
}
23+
}
24+
]
25+
}

AUTHORS

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,11 @@ Ankit Deepak (adadeepak8@gmail.com)
6868
Christophe Delahaye (christophe.delahaye@orange.com)
6969
Sébastien Deronne (sebastien.deronne@gmail.com)
7070
Ameya Deshpande (ameyanrd@outlook.com)
71+
Zhiheng Dong (dzh2077@gmail.com)
7172
Christoph Döpmann (doepmanc@informatik.hu-berlin.de)
7273
Jordan Dorham (dorham1@llnl.gov)
7374
Craig Dowell (craigdo@ee.washington.edu)
75+
Matteo Drago (matteo.drago1994@gmail.com)
7476
Gilaras Drakeson (gilaras@gmail.com)
7577
Jared Dulmage (jared.dulmage@wpli.net)
7678
Mathias Ettinger (mettinger@toulouse.viveris.com)
@@ -109,6 +111,7 @@ Frank Helbert (frank@ime.usp.br)
109111
Tom Henderson (tomhend@u.washington.edu)
110112
Christopher Hepner (hepner@hs-ulm.de)
111113
Budiarto Herman (budiarto.herman@magister.fi)
114+
Heun (git-gmb.hpmta@simplelogin.com)
112115
Tom Hewer (tomhewer@mac.com)
113116
Kristian A. Hiorth (kristahi@ifi.uio.no)
114117
Hrishikesh Hiraskar (hrishihirakar@gmail.com)
@@ -137,6 +140,7 @@ Ouassim Karrakchou (okarr102@uottawa.ca)
137140
Tanmay Kathpalia (tanmay.kathpalia@landisgyr.com)
138141
Konstantinos Katsaros (dinos.katsaros@gmail.com)
139142
Bhaskar Kataria (www.bhaskar.com7@gmail.com)
143+
Nils Kattenbeck (nils.kattenbeck@rwth-aachen.de)
140144
Morteza Kheirkhah (m.kheirkhah@sussex.ac.uk)
141145
Jörg Christian Kirchhof (christian.kirchhof@rwth-aachen.de)
142146
Ohad Klausner
@@ -187,6 +191,7 @@ Faker Moatamri (faker.moatamri@inria.fr)
187191
Edvin Močibob (edvin.mocibob@gmail.com)
188192
Amir Modarresi (amodarresi@ittc.ku.edu)
189193
Akash Mondal (a98mondal@gmail.com)
194+
Lars Moons (lars.moons@student.uantwerpen.be)
190195
Mike Moreton (mjvm_ns@hotmail.com)
191196
Michele Muccio (michelemuccio@virgilio.it)
192197
Esteban Municio (esteban.municio@urjc.es)
@@ -205,15 +210,16 @@ Michael Nowatkowski (nowatkom@gmail.com)
205210
Anh Nguyen (annguyen@ittc.ku.edu)
206211
Duy Nguyen (duy@soe.ucsc.edu)
207212
Alfonso Oliveira (af.oliveira.16@gmail.com)
213+
Wouter Overmeire (lodagro@gmail.com)
208214
Luis Pacheco (luisbelem@gmail.com)
215+
Matteo Pagin (mattpagg@gmail.com)
209216
Jendaipou Palmei (jendaipoupalmei@gmail.com)
210-
Lluís Parcerisa (parcerisa@gmail.com)
211217
Parth Pandya (parthpandyappp@gmail.com)
218+
Lluís Parcerisa (parcerisa@gmail.com)
212219
Mingyu Park (darkpmg@naver.com)
213-
Jendaipou Palmei (jendaipoupalmei@gmail.com)
214-
Parth Pandya (parthpandyappp@gmail.com)
215220
Harsh Patel (thadodaharsh10@gmail.com)
216221
Natale Patriciello (natale.patriciello@gmail.com)
222+
Pavinberg (pavin0702@gmail.com)
217223
Tommaso Pecorella (tommaso.pecorella@unifi.it)
218224
Guangyu Pei (guangyu.pei@boeing.com)
219225
Josh Pelkey (jpelkey@gatech.edu)
@@ -290,9 +296,11 @@ Rohit P. Tahiliani (tahiliar@tcd.ie)
290296
Dave Taht (dave.taht@bufferbloat.net)
291297
Marcos Talau (talau@users.sourceforge.net)
292298
Adrian S. W. Tam (adrian.sw.tam@gmail.com)
299+
Bill Tao (toyjet8@gmail.com)
293300
Cristiano Tapparello (cristiano.tapparello@rochester.edu)
294301
Hajime Tazaki (tazaki@sfc.wide.ad.jp)
295302
Wilson Thong (wilsonwk@ee.cityu.edu.hk)
303+
Lars Toenning (dev@ltoenning.de)
296304
Omer Topal (omer.topal@airties.com)
297305
Mauro Tortonesi (mauro.tortonesi@unife.it)
298306
Quincy Tse (quincy.tse@gmail.com)

0 commit comments

Comments
 (0)