Diff: call_box_manager.cpp

Revision:

80:61d61c9eb75c

Parent:

78:1353744f01e1

Child:

81:3656f00ab3db

--- a/call_box_manager.cpp	Tue Dec 16 16:50:25 2014 +0000
+++ b/call_box_manager.cpp	Tue Dec 16 19:34:30 2014 +0000
@@ -1,7 +1,6 @@
 #include "call_box_manager.h"
 
-int max_ext = 0;
-int min_ext = 0;
+Timer timer_refresh;
 Timer timer_aging;
 
 Call_Box * __find_CB__( Vector * v_cb, int ext ){
@@ -13,11 +12,65 @@
     return( NULL );
 }
 
+int init_refresh( void ){
+    timer_refresh.start();
+    return( 0 );    
+}
+
 int init_aging( void ){
     timer_aging.start();
     return( 0 );    
 }
+
+int refresh( Vector * v_cb, uint8_t * data, uint8_t * write_buffer, Call_Box * cb ){
+    if( v_cb != NULL && data != NULL  && write_buffer != NULL ){
+        if( cb != NULL ){
+            timer_refresh.reset();
+            
+            send2callboxes( __build_cb_package__( cb->get_ext(), cb->get_port(), __REGISTRY__, 
+                        ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
+            
+            return( 0x10 );
+        }
+        
+        static int lst_index = 0;
+        if( timer_refresh.read_ms() > 500 ){
+            timer_refresh.reset();
+            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->set_msg_id( ( cb->get_msg_id() + 1 ) & ( ~BIT7 ) );
+                    
+                    send2callboxes( __build_cb_package__( cb->get_ext(), cb->get_port(), __REGISTRY__, 
+                        ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
+                    
+                    return( 0 );
+                }else return( -3 );
+            }else return( 1 );
+        }else return( -1 );
+    }else return( -3 );
+}
+
+//FiXME se validar, nao preciso de tantos parametros ...
 void registry_aging( Vector * v_cb, uint8_t * data, uint8_t * write_buffer ){
+    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( debug_aging ) debug_msg("sands for %d", cb->get_ext() );
+            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{
+                refresh( v_cb, data, write_buffer, cb );
+            }
+        }
+    }
+    /*
     if( v_cb != NULL && data != NULL  && write_buffer != NULL ){
         uint8_t enough = 0;
         
@@ -25,28 +78,23 @@
         
         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 " );
-                        if( debug_aging ) debug_msg("( ext %d removed )", cb->get_ext() );
+                        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( enough++ == 2 ){
-                            if( debug_aging ) debug_msg( "Not enough in this cycle" );
-                            return;
-                        }
-                        */
+                        if( lst_ext == max_ext ) lst_ext = 0;
                         
                         if( lst_ext == 0 ) lst_ext = cb->get_ext();
                         
-                        if( lst_ext == max_ext ) lst_ext = 0;
+                        if( cb->get_ext() < lst_ext ) continue;
                         
-                        if( cb->get_ext() < lst_ext ) continue;
+                        lst_ext = cb->get_ext();
                         
                         cb->set_msg_id( ( cb->get_msg_id() + 1 ) & ( ~BIT7 ) );
                         
@@ -68,8 +116,7 @@
                         }
                         
                         send2callboxes( __build_cb_package__( cb->get_ext(), cb->get_port(), msg_type, 
-                            ( char * )data, 0x19, __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
-                            
+                            ( char * )data, cb->get_msg_id(), __CB_BUFFER_SIZE__ - __VZ_HEADER_OFFSET__, write_buffer ) );
                         return;
                     }
                 }
@@ -77,6 +124,7 @@
             if( debug_aging ) if( enough > 1 ) debug_msg( " out( %d ) ", enough );
         }
     }
+    */
 }
 
 void wake_all_up( Vector * v_cb, uint8_t * data, uint8_t * write_buffer ){