Changeset 43

Timestamp:

10/30/09 18:11:29 (15 years ago)

Author:

ymipsl

Message:

Correction de bug lorsque le serveur accumule trop de requÚtes et ne passe pas en mode bloquant.
YM

Location:

XMLIO_SERVER/trunk/src/IOSERVER

Files:

• mod_mpi_buffer_client.f90 (modified) (6 diffs)
• mod_mpi_buffer_server.f90 (modified) (1 diff)

XMLIO_SERVER/trunk/src/IOSERVER/mod_mpi_buffer_client.f90

@@ -22 +22 @@
   LOGICAL,SAVE :: is_last_request
 
-  INTEGER      :: mpi_buffer_size
+  INTEGER,SAVE      :: mpi_buffer_size
+  INTEGER,SAVE      :: aggregated_request
 
 CONTAINS
@@ -45 +46 @@
     ok_new_request=.TRUE.
     is_last_request=.FALSE.
+    aggregated_request=0
     
     CALL set_pack_buffer(MPI_Buffer,buffer_begin)
@@ -87 +89 @@
     pack_buffer(start_pos)=request_size
     message_size=pack_pos-Pending_request(Request_pos)%Pos
+    aggregated_request=aggregated_request+1
 
 
@@ -105 +108 @@
 !      PRINT *,"Request_pos",request_pos
 !      PRINT *,"Pos in Buffer",Pending_request(Request_pos)%Pos,"pack_pos",pack_pos
-      IF ( nb_request_pending==1 .AND. ( (buffer_free < MPI_buffer_size * 0.4) .OR. is_last_request ) ) THEN
+      IF ( nb_request_pending==1 .AND. ( (buffer_free < MPI_buffer_size * 0.4) .OR. is_last_request .OR. (aggregated_request>=max_request/2) )) THEN
         ok_out=.FALSE.
         CALL Wait_us(10)
@@ -124 +127 @@
    ENDDO
    
-   IF (nb_request_pending==0 .OR. (buffer_free < MPI_buffer_size* 0.4 )) THEN
+   IF (nb_request_pending==0 .OR. (buffer_free < MPI_buffer_size* 0.4 ) .OR. (aggregated_request> max_request/2) ) THEN
       
      CALL MPI_ISSEND(MPI_Buffer(Pending_request(Request_pos)%Pos),message_size,MPI_INTEGER8,     &
@@ -143 +146 @@
     
       ok_new_request=.TRUE.
-   
+      aggregated_request=0
     ENDIF
     CALL VTe(VTprocess_event)    

XMLIO_SERVER/trunk/src/IOSERVER/mod_mpi_buffer_server.f90

@@ -110 +110 @@
             ENDIF
             
-            IF (buffer_space < message_size .OR. buffers(n)%request_free==0) THEN
+            IF (buffer_space < message_size .OR. buffers(n)%request_free<=max_request/2) THEN
               ok_out=.TRUE.
 !              PRINT *,"BUFFER FULL !!!!"