maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for MAC UE_list->next[i] when next element does not exist, fix for OTGplot warning

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6818 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Navid Nikaein
2015-03-16 21:04:29 +00:00
parent 6fc46b66e5
commit eaa9d0fc81
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/eNB_scheduler.c
+2 -1
View File
@@ -110,8 +110,9 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
mbsfn_status[CC_id]=0; mbsfn_status[CC_id]=0;
} }
// refresh UE list based on UEs dropped by PHY in previous subframe // refresh UE list based on UEs dropped by PHY in previous subframe
for (i=UE_list->head;i>=0;i=UE_list->next[i]) { for (i=UE_list->head;i>=0;i=i=next_i) {
LOG_D(MAC,"UE %d: rnti %x (%p)\n",i,UE_RNTI(module_idP,i),mac_xface->get_eNB_UE_stats(module_idP,0,UE_RNTI(module_idP,i))); LOG_D(MAC,"UE %d: rnti %x (%p)\n",i,UE_RNTI(module_idP,i),mac_xface->get_eNB_UE_stats(module_idP,0,UE_RNTI(module_idP,i)));
next_i= UE_list->next[i];
if (mac_xface->get_eNB_UE_stats(module_idP,0,UE_RNTI(module_idP,i))==NULL) if (mac_xface->get_eNB_UE_stats(module_idP,0,UE_RNTI(module_idP,i))==NULL)
mac_remove_ue(module_idP,i,frameP); mac_remove_ue(module_idP,i,frameP);
} }
openair2/UTIL/OTG/OTGplot
+3 -3
View File
@@ -35,7 +35,7 @@ endwhile
labels=[labels; strcat("-@;",s,";") ]; # add the last string (Aggregate-Flow) labels=[labels; strcat("-@;",s,";") ]; # add the last string (Aggregate-Flow)
if nargin>1 if nargin>1
mask=intersection(str2num(arg_list{2}),1:size(labels,1)); mask=intersect(str2num(arg_list{2}),1:size(labels,1));
else else
mask=1:size(labels,1); mask=1:size(labels,1);
endif endif
@@ -48,8 +48,8 @@ endif
# read data # read data
data=fscanf(f,"%f",[size(labels,1)+1,Inf])'; data=fscanf(f,"%f",[size(labels,1)+1,Inf])';
temp=split(strrep(inputf,"\\","/"),"/"); temp=char(strsplit(strrep(inputf,"\\","/"),"/"));
outputf=split(deblank(temp(size(temp,1),:)),"."); outputf=char(strsplit(deblank(temp(size(temp,1),:)),"."));
ylbl=outputf(1,:); ylbl=outputf(1,:);
#ylbl(1,1)=toupper(ylbl(1,1)); #ylbl(1,1)=toupper(ylbl(1,1));