Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
200cc2c0
Commit
200cc2c0
authored
Jan 08, 2018
by
Xu Bo
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue271_hundreds_of_ues' into ues_test
parents
5a39c80c
4eacc0e1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
6 deletions
+16
-6
common/utils/hashtable/hashtable.c
common/utils/hashtable/hashtable.c
+2
-1
common/utils/itti/intertask_interface.c
common/utils/itti/intertask_interface.c
+1
-0
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/MAC/pre_processor.c
+13
-5
No files found.
common/utils/hashtable/hashtable.c
View file @
200cc2c0
...
...
@@ -95,7 +95,7 @@ hash_table_t *hashtable_create(const hash_size_t sizeP, hash_size_t (*hashfuncP)
* Cleanup
* The hashtable_destroy() walks through the linked lists for each possible hash value, and releases the elements. It also releases the nodes array and the hash_table_t.
*/
hashtable_rc_t
hashtable_destroy
(
hash_table_t
*
const
hashtblP
)
hashtable_rc_t
hashtable_destroy
(
hash_table_t
*
hashtblP
)
{
hash_size_t
n
;
hash_node_t
*
node
,
*
oldnode
;
...
...
@@ -117,6 +117,7 @@ hashtable_rc_t hashtable_destroy(hash_table_t * const hashtblP)
}
free
(
hashtblP
->
nodes
);
free
(
hashtblP
);
hashtblP
=
NULL
;
return
HASH_TABLE_OK
;
}
//-------------------------------------------------------------------------------------------------------------------------------
...
...
common/utils/itti/intertask_interface.c
View file @
200cc2c0
...
...
@@ -470,6 +470,7 @@ int itti_send_msg_to_task(task_id_t destination_task_id, instance_t instance, Me
itti_get_task_name
(
destination_task_id
));
int
result
=
itti_free
(
origin_task_id
,
message
);
AssertFatal
(
result
==
EXIT_SUCCESS
,
"Failed to free memory (%d)!
\n
"
,
result
);
return
0
;
#else
AssertFatal
(
0
,
"Error: lfds611_queue_enqueue returns 0, queue is full, exiting
\n
"
);
#endif
...
...
openair2/LAYER2/MAC/pre_processor.c
View file @
200cc2c0
...
...
@@ -637,6 +637,7 @@ void dlsch_scheduler_pre_ue_select(
default:
LOG_W
(
MAC
,
"Unsupported transmission mode %d
\n
"
,
get_tmode
(
module_idP
,
CC_id
,
UE_id
));
aggregation
=
2
;
break
;
}
format_flag
=
1
;
if
(
!
CCE_allocation_infeasible
(
module_idP
,
...
...
@@ -2364,11 +2365,14 @@ void ulsch_scheduler_pre_ue_select(
}
// UE round >0
for
(
UE_id
=
0
;
UE_id
<
NUMBER_OF_UE_MAX
;
UE_id
++
)
{
if
(
UE_list
->
active
[
UE_id
]
==
FALSE
)
continue
;
rnti
=
UE_RNTI
(
module_idP
,
UE_id
);
CC_id
=
UE_PCCID
(
module_idP
,
UE_id
);
if
(
rnti
==
NOT_A_RNTI
)
continue
;
CC_id
=
UE_PCCID
(
module_idP
,
UE_id
);
if
(
UE_list
->
UE_template
[
CC_id
][
UE_id
].
configured
==
FALSE
)
continue
;
...
...
@@ -2472,11 +2476,18 @@ void ulsch_scheduler_pre_ue_select(
}
for
(
UE_id
=
0
;
UE_id
<
NUMBER_OF_UE_MAX
;
UE_id
++
)
{
if
(
UE_list
->
active
[
UE_id
]
==
FALSE
)
continue
;
rnti
=
UE_RNTI
(
module_idP
,
UE_id
);
CC_id
=
UE_PCCID
(
module_idP
,
UE_id
);
if
(
rnti
==
NOT_A_RNTI
)
continue
;
CC_id
=
UE_PCCID
(
module_idP
,
UE_id
);
if
(
UE_id
>
last_ulsch_ue_id
[
CC_id
])
continue
;
if
(
UE_list
->
UE_template
[
CC_id
][
UE_id
].
configured
==
FALSE
)
continue
;
...
...
@@ -2495,9 +2506,6 @@ void ulsch_scheduler_pre_ue_select(
}
}
if
(
UE_id
>
last_ulsch_ue_id
[
CC_id
])
continue
;
for
(
i
=
0
;
i
<
ulsch_ue_select
[
CC_id
].
ue_num
;
i
++
){
if
(
ulsch_ue_select
[
CC_id
].
list
[
i
].
UE_id
==
UE_id
){
break
;
...
...
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