Diff: call_box_manager.cpp

Revision:

89:0fe315117b00

Parent:

86:bf7b0d4c3232

Child:

92:92df17f538a8

--- a/call_box_manager.cpp	Tue Jan 06 16:39:09 2015 +0000
+++ b/call_box_manager.cpp	Wed Jan 07 21:48:53 2015 +0000
@@ -2,6 +2,7 @@
 
 Timer timer_refresh;
 Timer timer_aging;
+Timer timer_sync_refresh;
 
 Call_Box * __find_CB__( Vector * v_cb, int ext ){
     Call_Box * cb = NULL;
@@ -16,7 +17,6 @@
     if( v_cb != NULL && data != NULL  && write_buffer != NULL ){
         static int lst_index = 0;
         
-        //eu nao deveria precisar disso
         if( cb != NULL ){
             timer_refresh.reset();
             
@@ -28,22 +28,19 @@
             if( debug_refresh ) send_msg("Refresh specific %d", cb->get_ext() );
             
             return( 0x10 );
-        //}else if( timer_refresh.read() > 1 ){
-        }else if( timer_refresh.read() > 1 ){
-            timer_refresh.reset();
+        }else{
             if( v_cb->size() > 0 ){
                 if( lst_index >= v_cb->size() ) lst_index = 0;
                 
                 Call_Box * cb = (Call_Box * )v_cb->get_element( lst_index++ );
                 
-                //if( cb != NULL && cb->status != cb_on_call ){
-                    if( cb != NULL && cb->status == cb_idle ){
+                if( cb != NULL && cb->status == cb_idle ){
+                    
                     if( cb->get_ext() % 2 == 1 ){ 
                         Call_Box * cb_master =  __find_CB__( v_cb, cb->get_ext() - 1 );
-
                         if( cb_master != NULL && cb_master->status != cb_idle ) return( 0x20 );
                     }
-                
+            
                     cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ( ~BIT7 ) );
                             
                     send2callboxes( __build_cb_package__( cb->get_ext(), cb->get_port(), __REGISTRY__, 
@@ -52,10 +49,10 @@
                     if( debug_refresh ) send_msg("Refresh %d", cb->get_ext() );
                     
                     return( 0 );
-                }else return( -3 );
-            }else return( 1 );
-        }else return( -1 );
-    }else return( -3 );
+                }else return( -5 );
+            }else return( -3 );
+        }
+    }else return( -1 );
 }
 
 //FiXME se validar, nao preciso de tantos parametros ...
@@ -69,71 +66,21 @@
                 v_cb->remove_element( i );
                 delete( cb );
                 break;
-            }//else{
-                //refresh( v_cb, data, write_buffer, cb );
-            //}
+            }
         }
     }
-    /*
-    if( v_cb != NULL && data != NULL  && write_buffer != NULL ){
-        uint8_t enough = 0;
-        
-        static int lst_ext = 0;
-        
-        if( timer_aging.read_ms() > 200 ){
-            timer_aging.reset();
-
-            for( register int i = 0; i < v_cb->size(); i++ ){
-                Call_Box * cb = (Call_Box * )v_cb->get_element( i );
-                if( cb->is_timeout() ){
-                    if( cb->has_next_try() == false ){
-                        if( debug_aging ) debug_msg( "time to really go ( ext %d removed )", cb->get_ext() );
-                        v_cb->remove_element( i );
-                        delete( cb );
-                        break;
-                    }else{
-                        if( lst_ext == max_ext ) lst_ext = 0;
-                        
-                        if( lst_ext == 0 ) lst_ext = cb->get_ext();
-                        
-                        if( cb->get_ext() < lst_ext ) continue;
-                        
-                        lst_ext = cb->get_ext();
-                        
-                        cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ( ~BIT7 ) );
-                        
-                        int8_t type = cb->get_next_aging_type();
-                        
-                        uint8_t msg_type = 0x00;
-                        
-                        if( type == REQUEST_REGISTRY ){ 
-                            msg_type = __REGISTRY__;
-                            if( debug_aging ) debug_msg("Registry request Cbx %d -- On msg-id %d", cb->get_ext(), cb->get_msg_id() );
-                        }else if( type == REQUEST_PEND ){
-                            msg_type = __PROMPT__;
-                            strcpy( ( char * )data, "pend\r\r\r\n" );
-                            if( debug_aging ) debug_msg("Pend Request Cbx %d -- On msg-id %d", cb->get_ext(), cb->get_msg_id() );
-                        }else if( ( type == REQUEST_PING ) ){
-                            msg_type = __PROMPT__;
-                            strcpy( ( char * )data, "ping\r\r\r\n" );
-                            if( debug_aging ) debug_msg("Ping on Cbx %d -- On msg-id %d", cb->get_ext(), cb->get_msg_id() );
-                        }
-                        
-                        send2callboxes( __build_cb_package__( cb->get_ext(), cb->get_port(), msg_type, 
-                            ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
-                        return;
-                    }
-                }
-            }
-            if( debug_aging ) if( enough > 1 ) debug_msg( " out( %d ) ", enough );
-        }
-    }
-    */
 }
 
+/*
+    A ideia desse cara aqui ... a cada x sec. ele vai passar pelos cbx registrados na logica, 
+    contidos em v_cb e verificar quais estao ausentes ( pares, masters, slaves ) e mandar um
+    registry pra cada um deles ... um por ver ... mantendo uma lista com os que estao ainda
+    off, e deveriam estar on, e atualizar essa lista ... por exemplo a cada 3 sec.
+
+*/
 void wake_all_up( Vector * v_cb, uint8_t * data, uint8_t * write_buffer ){
     if( v_cb != NULL && data != NULL  && write_buffer != NULL ){
-        int ext_list[ __MAX_CB_IN_A_BRANCH__ ];
+        static int ext_list[ __MAX_CB_IN_A_BRANCH__ ];
         uint8_t size = v_cb->size();
         
         bool once = true;