LCPQ/qp2
9
1
Fork 0
mirror of https://github.com/QuantumPackage/qp2.git synced 2024-06-01 18:25:17 +02:00
Code Releases Activity

Fix segfaults in zmq

Browse Source
This commit is contained in:
Anthony Scemama 2021-02-17 23:38:21 +01:00
parent 7560e2762d
commit 2e463d634e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/zmq/utils.irp.f
View File

@ -681,7 +681,7 @@ integer function disconnect_from_taskserver(zmq_to_qp_run_socket, worker_id)
integer(ZMQ_PTR), intent(in) :: zmq_to_qp_run_socket
integer, intent(in) :: worker_id
integer, external :: disconnect_from_taskserver_state
disconnect_from_taskserver = disconnect_from_taskserver_state(zmq_to_qp_run_socket, worker_id, zmq_state(1:128))
disconnect_from_taskserver = disconnect_from_taskserver_state(zmq_to_qp_run_socket, worker_id, zmq_state)
end
integer function disconnect_from_taskserver_state(zmq_to_qp_run_socket, worker_id, state)
@ -692,10 +692,11 @@ integer function disconnect_from_taskserver_state(zmq_to_qp_run_socket, worker_i
END_DOC
integer(ZMQ_PTR), intent(in) :: zmq_to_qp_run_socket
integer, intent(in) :: worker_id
character*(128), intent(in) :: state
integer :: rc, sze
character*(512) :: message, reply
character*(128) :: state
character*(128) :: state_tmp
disconnect_from_taskserver_state = 0
@ -712,8 +713,8 @@ integer function disconnect_from_taskserver_state(zmq_to_qp_run_socket, worker_i
rc = f77_zmq_recv(zmq_to_qp_run_socket, message, 510, 0)
message = trim(message(1:rc))
read(message,*, end=10, err=10) reply, state
if ((trim(reply) == 'disconnect_reply').and.(trim(state) == trim(zmq_state))) then
read(message,*, end=10, err=10) reply, state_tmp
if ((trim(reply) == 'disconnect_reply').and.(trim(state_tmp) == trim(state))) then
return
endif
if (trim(message) == 'error Wrong state') then
@ -905,17 +906,17 @@ integer function get_task_from_taskserver(zmq_to_qp_run_socket,worker_id,task_id
return
endif
message = repeat(' ',512)
message = repeat(' ',1024)
rc = f77_zmq_recv(zmq_to_qp_run_socket, message, 1024, 0)
rc = min(1024,rc)
read(message(1:rc),*, end=10, err=10) reply
if (trim(reply) == 'get_task_reply') then
read(message(1:rc),*, end=10, err=10) reply, task_id
rc = 15
do while (message(rc:rc) == ' ')
do while (rc < 1024 .and. message(rc:rc) == ' ')
rc += 1
enddo
do while (message(rc:rc) /= ' ')
do while (rc < 1024 .and. message(rc:rc) /= ' ')
rc += 1
enddo
rc += 1