matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Mellanox] Fix the memory leak in mlnx-sfpd (#3128)

Browse Source 
* fix the memory leak in on_pmpe. objects created via sx_api having convention new_<type_name> should be release explicitly via delete_<type_name>.

* avoid duplicate code.
This commit is contained in:
Stephen Sun 2019-07-09 22:47:44 +08:00 committed by Ying Xie
parent c3932e501b
commit 0c77acf2ea
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
platform/mellanox/mlnx-sfpd/scripts/mlnx-sfpd
View File

@ -205,36 +205,40 @@ class MlnxSfpd:
pkt = new_uint8_t_arr(pkt_size) pkt = new_uint8_t_arr(pkt_size)
recv_info_p = new_sx_receive_info_t_p() recv_info_p = new_sx_receive_info_t_p()
pmpe_t = sx_event_pmpe_t() pmpe_t = sx_event_pmpe_t()
logical_port_list = new_sx_port_log_id_t_arr(4)
port_attributes_list = new_sx_port_attributes_t_arr(64) port_attributes_list = new_sx_port_attributes_t_arr(64)
port_cnt_p = new_uint32_t_p() port_cnt_p = new_uint32_t_p()
uint32_t_p_assign(port_cnt_p,64) uint32_t_p_assign(port_cnt_p,64)
label_port_list = [] label_port_list = []
status = True
module_state = 0 module_state = 0
rc = sx_lib_host_ifc_recv(fd_p, pkt, pkt_size_p, recv_info_p) rc = sx_lib_host_ifc_recv(fd_p, pkt, pkt_size_p, recv_info_p)
if rc != 0: if rc != 0:
log_error("sx_lib_host_ifc_recv exited with error, rc %d" % rc) log_error("sx_lib_host_ifc_recv exited with error, rc %d" % rc)
status = False status = False
return status, label_port_list, module_state else:
status = True
pmpe_t = recv_info_p.event_info.pmpe
port_list_size = pmpe_t.list_size
logical_port_list = pmpe_t.log_port_list
module_state = pmpe_t.module_state
pmpe_t = recv_info_p.event_info.pmpe for i in xrange(port_list_size):
port_list_size = pmpe_t.list_size logical_port = sx_port_log_id_t_arr_getitem(logical_port_list, i)
logical_port_list = pmpe_t.log_port_list rc = sx_api_port_device_get(self.handle, 1 , 0, port_attributes_list, port_cnt_p)
module_state = pmpe_t.module_state port_cnt = uint32_t_p_value(port_cnt_p)
for i in xrange(port_list_size): for i in xrange(port_cnt):
logical_port = sx_port_log_id_t_arr_getitem(logical_port_list, i) port_attributes = sx_port_attributes_t_arr_getitem(port_attributes_list,i)
rc = sx_api_port_device_get(self.handle, 1 , 0, port_attributes_list, port_cnt_p) if port_attributes.log_port == logical_port:
port_cnt = uint32_t_p_value(port_cnt_p) lable_port = port_attributes.port_mapping.module_port
break
label_port_list.append(lable_port)
for i in xrange(port_cnt): delete_uint32_t_p(pkt_size_p)
port_attributes = sx_port_attributes_t_arr_getitem(port_attributes_list,i) delete_uint8_t_arr(pkt)
if port_attributes.log_port == logical_port: delete_sx_receive_info_t_p(recv_info_p)
lable_port = port_attributes.port_mapping.module_port delete_sx_port_attributes_t_arr(port_attributes_list)
break delete_uint32_t_p(port_cnt_p)
label_port_list.append(lable_port)
return status, label_port_list, module_state, return status, label_port_list, module_state,