Changeset 13135 for trunk/FACT++/dim/src/dis.c

Timestamp:

03/18/12 20:53:49 (13 years ago)

Author:

tbretz

Message:

Updated to v19r30

File:

• trunk/FACT++/dim/src/dis.c (modified) (15 diffs)

trunk/FACT++/dim/src/dis.c

@@ -1388 +1388 @@
         register SERVICE *servp;
         char str[80], def[MAX_NAME];
-        register char *ptr;
-        int last_conn_id;
+        int conn_id, last_conn_id;
         int *pkt_buffer, header_size, aux;
 #ifdef WIN32
@@ -1406 +1405 @@
         reqp->delay_delete++;
         servp = reqp->service_ptr;
+        conn_id = reqp->conn_id;
+
+if(Debug_on)
+{
+dim_print_date_time();
+printf("Updating %s for %s@%s (req_id = %d)\n",
+           servp->name, 
+           Net_conns[conn_id].task, Net_conns[conn_id].node, 
+           reqp->req_id);
+}
+
         last_conn_id = Curr_conn_id;
-        Curr_conn_id = reqp->conn_id;
-        ptr = servp->def;
+        Curr_conn_id = conn_id;
         if(servp->type == COMMAND)
         {
@@ -1415 +1424 @@
                 size = 26;
                 sprintf(def,"c:26");
-                ptr = def;
         }
         else if( servp->user_routine != 0 ) 
@@ -1491 +1499 @@
                 buffp, size);
         Dis_packet->size = htovl(header_size + size);
-        if( !dna_write_nowait(reqp->conn_id, Dis_packet, header_size + size) ) 
-        {
+        if( !dna_write_nowait(conn_id, Dis_packet, header_size + size) ) 
+        {
+                if(Net_conns[conn_id].write_timedout)
+                {
+                        dim_print_date_time();
+                        if(reqp->delay_delete > 1)
+                        {
+                                printf(" Server (Explicitly) Updating Service %s: Couldn't write to Conn %3d : Client %s@%s\n",
+                                        servp->name, conn_id,
+                                        Net_conns[conn_id].task, Net_conns[conn_id].node);
+                        }
+                        else
+                        {
+                                printf(" Server Updating Service %s: Couldn't write to Conn %3d : Client %s@%s\n",
+                                        servp->name, conn_id,
+                                        Net_conns[conn_id].task, Net_conns[conn_id].node);
+                        }
+                }
+                fflush(stdout);
                 if(reqp->delay_delete > 1)
                 {
@@ -1500 +1525 @@
                 {
                         reqp->delay_delete = 0;
-                        release_conn(reqp->conn_id, 1, 0);
+                        release_conn(conn_id, 1, 0);
                 }
         }
@@ -1513 +1538 @@
         }
 */
-        reqp->delay_delete--;
+        if(reqp->delay_delete > 0)
+                reqp->delay_delete--;
         return(1);
 }
@@ -1520 +1546 @@
 {
         register REQUEST *reqp;
-        register SERVICE *servp;
         static DIS_PACKET *dis_packet;
         static int packet_size = 0;
@@ -1528 +1553 @@
         if(!reqp)
                 return;
-        servp = reqp->service_ptr;
         if( !packet_size ) {
                 dis_packet = (DIS_PACKET *)malloc(DIS_HEADER);
@@ -1708 +1732 @@
                 (DLL *) reqp)) ) 
         {
+/*
 if(Debug_on)
 {
@@ -1715 +1740 @@
            Net_conns[reqp->conn_id].task, Net_conns[reqp->conn_id].node, reqp->req_id, (unsigned long)reqp);
 }
+*/
                 if(check_client(reqp, client_ids))
                 {
@@ -2051 +2077 @@
                 if( !dna_write_nowait(conn_id, dis_packet, size + DIS_HEADER) )
                 {
+                        dim_print_date_time();
+                        printf(" Server Sending Service: Couldn't write to Conn %3d : Client %s@%s\n",conn_id,
+                                Net_conns[conn_id].task, Net_conns[conn_id].node);
+                        fflush(stdout);
                         release_conn(conn_id, 1, 0);
                 }
@@ -2142 +2172 @@
         n_services = dnsp->dis_n_services;
 
-        ENABLE_AST
         if(dnsp->serving)
         {
                 if(n_services == 5)
                 {
+                        if(Dis_conn_id)
+                        {
+                                dna_close(Dis_conn_id);
+                                Dis_conn_id = 0;
+                        }
+                        ENABLE_AST
 /*
                         dis_stop_serving();
@@ -2152 +2187 @@
                         do_dis_stop_serving_dns(dnsp);
                 }
+                else
+                {
+                        ENABLE_AST
+                }
+        }
+        else
+        {
+                ENABLE_AST
         }
         return(found);
@@ -2281 +2324 @@
 register SERVICE *servp, *prevp;
 void dim_stop_threads(void);
+int dis_find_client_conns();
 int hash_index;
 
@@ -2335 +2379 @@
         if(Serving != -1)
 */
-        dim_stop_threads();
+        if(!dis_find_client_conns())
+                dim_stop_threads();
+}
+
+int dis_find_client_conns()
+{
+        int i;
+        int n = 0;
+
+        for( i = 0; i< Curr_N_Conns; i++ )
+        {
+                if(Net_conns[i].channel != 0)
+                {
+                        if(Dna_conns[i].read_ast == dis_insert_request)
+                        {
+                                dna_close(i);
+                        }
+                        else
+                        {
+                                n++;
+                        }
+                }
+        }
+        return(n);
 }