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
canghaiwuhen
OpenXG-RAN
Commits
da40f4e1
Commit
da40f4e1
authored
Oct 04, 2019
by
Haruki NAOI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: get_free_mem_block uses heap memory (not mem_block).
parent
b832a227
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+1
-1
common/utils/ocp_itti/intertask_interface.cpp
common/utils/ocp_itti/intertask_interface.cpp
+2
-1
openair2/UTIL/MEM/mem_block.c
openair2/UTIL/MEM/mem_block.c
+1
-1
No files found.
cmake_targets/CMakeLists.txt
View file @
da40f4e1
...
...
@@ -988,7 +988,7 @@ set(UTIL_SRC
${
OPENAIR_DIR
}
/common/utils/LOG/log.c
# ${OPENAIR2_DIR}/UTIL/LOG/vcd_signal_dumper.c
${
OPENAIR2_DIR
}
/UTIL/MATH/oml.c
#
${OPENAIR2_DIR}/UTIL/MEM/mem_block.c
${
OPENAIR2_DIR
}
/UTIL/MEM/mem_block.c
# ${OPENAIR2_DIR}/UTIL/OCG/OCG.c
# ${OPENAIR2_DIR}/UTIL/OCG/OCG_create_dir.c
# ${OPENAIR2_DIR}/UTIL/OCG/OCG_detect_file.c
...
...
common/utils/ocp_itti/intertask_interface.cpp
View file @
da40f4e1
...
...
@@ -35,6 +35,7 @@ int timer_expired(int fd);
task_list_t
tasks
[
TASK_MAX
];
extern
"C"
{
#if 0
void *pool_buffer_init (void) {
return 0;
}
...
...
@@ -63,7 +64,7 @@ extern "C" {
ptr->size=sizeP;
return ptr;
}
#endif
void
*
itti_malloc
(
task_id_t
origin_task_id
,
task_id_t
destination_task_id
,
ssize_t
size
)
{
void
*
ptr
=
NULL
;
AssertFatal
((
ptr
=
malloc
(
size
))
!=
NULL
,
"Memory allocation of %zu bytes failed (%d -> %d)!
\n
"
,
...
...
openair2/UTIL/MEM/mem_block.c
View file @
da40f4e1
...
...
@@ -68,8 +68,8 @@ pool_buffer_init (void)
//-----------------------------------------------------------------------------
uint32_t
index
,
mb_index
,
pool_index
;
mem_pool
*
memory
=
(
mem_pool
*
)
&
mem_block_var
;
memBlockVar
=
malloc
(
sizeof
(
mem_pool
));
mem_pool
*
memory
=
(
mem_pool
*
)
&
mem_block_var
;
int
pool_sizes
[
14
]
=
{
MEM_MNGT_MB0_NB_BLOCKS
,
MEM_MNGT_MB1_NB_BLOCKS
,
MEM_MNGT_MB2_NB_BLOCKS
,
MEM_MNGT_MB3_NB_BLOCKS
,
MEM_MNGT_MB4_NB_BLOCKS
,
MEM_MNGT_MB5_NB_BLOCKS
,
...
...
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