Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lizhongxiao
OpenXG-RAN
Commits
7886ec11
Commit
7886ec11
authored
Jan 17, 2024
by
mir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TASK_MANAGER_SIM flag removed
parent
69d378da
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
14 deletions
+2
-14
common/utils/thread_pool/task_manager.h
common/utils/thread_pool/task_manager.h
+0
-1
openair1/SIMULATION/NR_PHY/dlschsim.c
openair1/SIMULATION/NR_PHY/dlschsim.c
+2
-7
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+0
-2
openair1/SIMULATION/NR_PHY/ulsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
+0
-4
No files found.
common/utils/thread_pool/task_manager.h
View file @
7886ec11
#ifndef TASK_MANAGER_WORKING_STEALING_H
#ifndef TASK_MANAGER_WORKING_STEALING_H
#define TASK_MANAGER_WORKING_STEALING_H
#define TASK_MANAGER_WORKING_STEALING_H
#define TASK_MANAGER_SIM
#define TASK_MANAGER_LTE
#define TASK_MANAGER_LTE
#include "task.h"
#include "task.h"
...
...
openair1/SIMULATION/NR_PHY/dlschsim.c
View file @
7886ec11
...
@@ -374,14 +374,11 @@ int main(int argc, char **argv)
...
@@ -374,14 +374,11 @@ int main(int argc, char **argv)
RC
.
gNB
=
(
PHY_VARS_gNB
**
)
malloc
(
sizeof
(
PHY_VARS_gNB
*
));
RC
.
gNB
=
(
PHY_VARS_gNB
**
)
malloc
(
sizeof
(
PHY_VARS_gNB
*
));
RC
.
gNB
[
0
]
=
calloc
(
1
,
sizeof
(
PHY_VARS_gNB
));
RC
.
gNB
[
0
]
=
calloc
(
1
,
sizeof
(
PHY_VARS_gNB
));
gNB
=
RC
.
gNB
[
0
];
gNB
=
RC
.
gNB
[
0
];
#ifdef TASK_MANAGER_SIM
int
const
num_threads
=
parse_num_threads
(
gNBthreads
);
int
const
num_threads
=
parse_num_threads
(
gNBthreads
);
init_task_manager
(
&
gNB
->
man
,
num_threads
);
init_task_manager
(
&
gNB
->
man
,
num_threads
);
init_task_manager
(
&
nrUE_params
.
man
,
max
(
dlsch_threads
,
1
));
init_task_manager
(
&
nrUE_params
.
man
,
max
(
dlsch_threads
,
1
));
#endif
//initNamedTpool(gNBthreads, &gNB->threadPool, true, "gNB-tpool");
//initFloatingCoresTpool(dlsch_threads, &nrUE_params.Tpool, false, "UE-tpool");
//gNB_config = &gNB->gNB_config;
frame_parms
=
&
gNB
->
frame_parms
;
//to be initialized I suppose (maybe not necessary for PBCH)
frame_parms
=
&
gNB
->
frame_parms
;
//to be initialized I suppose (maybe not necessary for PBCH)
frame_parms
->
nb_antennas_tx
=
n_tx
;
frame_parms
->
nb_antennas_tx
=
n_tx
;
frame_parms
->
nb_antennas_rx
=
n_rx
;
frame_parms
->
nb_antennas_rx
=
n_rx
;
...
@@ -651,11 +648,9 @@ int main(int argc, char **argv)
...
@@ -651,11 +648,9 @@ int main(int argc, char **argv)
free
(
gNB
->
gNB_config
.
tdd_table
.
max_tdd_periodicity_list
[
i
].
max_num_of_symbol_per_slot_list
);
free
(
gNB
->
gNB_config
.
tdd_table
.
max_tdd_periodicity_list
[
i
].
max_num_of_symbol_per_slot_list
);
free
(
gNB
->
gNB_config
.
tdd_table
.
max_tdd_periodicity_list
);
free
(
gNB
->
gNB_config
.
tdd_table
.
max_tdd_periodicity_list
);
#ifdef TASK_MANAGER_SIM
void
(
*
clean
)(
task_t
*
)
=
NULL
;
void
(
*
clean
)(
task_t
*
)
=
NULL
;
free_task_manager
(
&
gNB
->
man
,
clean
);
free_task_manager
(
&
gNB
->
man
,
clean
);
free_task_manager
(
&
nrUE_params
.
man
,
clean
);
free_task_manager
(
&
nrUE_params
.
man
,
clean
);
#endif
phy_free_nr_gNB
(
gNB
);
phy_free_nr_gNB
(
gNB
);
free
(
RC
.
gNB
[
0
]);
free
(
RC
.
gNB
[
0
]);
...
...
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
7886ec11
...
@@ -1295,11 +1295,9 @@ int main(int argc, char **argv)
...
@@ -1295,11 +1295,9 @@ int main(int argc, char **argv)
free
(
r_im
[
i
]);
free
(
r_im
[
i
]);
}
}
#ifdef TASK_MANAGER_SIM
void
(
*
clean
)(
task_t
*
)
=
NULL
;
void
(
*
clean
)(
task_t
*
)
=
NULL
;
free_task_manager
(
&
nrUE_params
.
man
,
clean
);
free_task_manager
(
&
nrUE_params
.
man
,
clean
);
free_task_manager
(
&
gNB
->
man
,
clean
);
free_task_manager
(
&
gNB
->
man
,
clean
);
#endif
free
(
s_re
);
free
(
s_re
);
free
(
s_im
);
free
(
s_im
);
...
...
openair1/SIMULATION/NR_PHY/ulsim.c
View file @
7886ec11
...
@@ -554,11 +554,7 @@ int main(int argc, char *argv[])
...
@@ -554,11 +554,7 @@ int main(int argc, char *argv[])
gNB
->
ofdm_offset_divisor
=
UINT_MAX
;
gNB
->
ofdm_offset_divisor
=
UINT_MAX
;
gNB
->
num_pusch_symbols_per_thread
=
1
;
gNB
->
num_pusch_symbols_per_thread
=
1
;
#ifdef TASK_MANAGER_SIM
init_task_manager
(
&
gNB
->
man
,
max
(
threadCnt
,
1
));
init_task_manager
(
&
gNB
->
man
,
max
(
threadCnt
,
1
));
#else
initFloatingCoresTpool
(
threadCnt
,
&
gNB
->
threadPool
,
false
,
"gNB-tpool"
);
#endif
initNotifiedFIFO
(
&
gNB
->
respDecode
);
initNotifiedFIFO
(
&
gNB
->
respDecode
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment