Changeset 699 for soft/giet_vm/giet_kernel/sys_handler.c

Timestamp:

Aug 7, 2015, 5:42:07 PM (9 years ago)

Author:

guerin

Message:

kernel: use non-trivial CMA allocator

File:

• soft/giet_vm/giet_kernel/sys_handler.c (modified) (4 diffs)

soft/giet_vm/giet_kernel/sys_handler.c

@@ -96 +96 @@
 
 __attribute__((section(".kdata")))
-unsigned int _cma_channel_allocator    = 0;
+unsigned int _cma_channel[NB_CMA_CHANNELS]  = {0};
 
 __attribute__((section(".kdata")))
@@ -819 +819 @@
     if ( channel == -1 )
     {
-        _printf("\n[GIET_ERROR] in _sys_tty_alloc() : TTY channel already released\n");
+        _printf("\n[GIET_ERROR] in _sys_tty_release() : TTY channel already released\n");
         return -1;
     }
@@ -1039 +1039 @@
 
     // get a CMA channel index
-    cma_channel = _atomic_increment( &_cma_channel_allocator, 1 );
+    for ( cma_channel = 0 ; cma_channel < NB_CMA_CHANNELS ; cma_channel++ )
+    {
+        if ( !_cma_channel[cma_channel] )
+        {
+            _cma_channel[cma_channel] = 1;
+            break;
+        }
+    }
 
     if ( cma_channel >= NB_CMA_CHANNELS )
@@ -1649 +1656 @@
 int _sys_fbf_cma_alloc()
 {
-   // get a new CMA channel index 
-    unsigned int channel = _atomic_increment( &_cma_channel_allocator, 1 );
+    if ( _get_context_slot( CTX_CMA_FB_ID ) < NB_CMA_CHANNELS )
+    {
+        _printf("\n[GIET ERROR] in _sys_fbf_cma_alloc() : CMA channel already allocated\n");
+        return 0;
+    }
+
+    // get a new CMA channel index
+    unsigned int channel;
+
+    for ( channel = 0 ; channel < NB_CMA_CHANNELS ; channel++ )
+    {
+        if ( !_cma_channel[channel] )
+        {
+            _cma_channel[channel] = 1;
+            break;
+        }
+    }
 
     if ( channel >= NB_CMA_CHANNELS )
     {
-        _printf("\n[GIET ERROR] in _sys_fbf_cma_alloc() : not enough CMA channels\n");
+        _printf("\n[GIET ERROR] in _sys_fbf_cma_alloc() : no CMA channel available\n");
         return -1;
     }