Ticket #1241: pr1241.diff

objectallocate.c

@@ -46 +46 @@
     (Objects_Control *) _Chain_Get( &information->Inactive );
 
   if ( information->auto_extend ) {
-    /*
-     *  If the list is empty then we are out of objects and need to
-     *  extend information base.
-     */
+    the_object = _Objects_Allocate_extended_helper(
+      information,
+      the_object
+    );
 
-    if ( !the_object ) {
-      _Objects_Extend_information( information );
-      the_object =  (Objects_Control *) _Chain_Get( &information->Inactive );
-    }
-
-    if ( the_object ) {
-      uint32_t   block;
-
-      block = _Objects_Get_index( the_object->id ) -
-              _Objects_Get_index( information->minimum_id );
-      block /= information->allocation_size;
-
-      information->inactive_per_block[ block ]--;
-      information->inactive--;
-    }
   }
 
   return the_object;

objectextendinformation.c

@@ -124 +124 @@
       object_blocks = (void**)
         _Workspace_Allocate(
           block_count *
-             (sizeof(void *) + sizeof(uint32_t  ) + sizeof(Objects_Name *)) +
+             (sizeof(void *) + sizeof(uint32_t) + sizeof(Objects_Name *)) +
           ((maximum + minimum_index) * sizeof(Objects_Control *))
           );
 
@@ -135 +135 @@
       object_blocks = (void**)
         _Workspace_Allocate_or_fatal_error(
           block_count *
-             (sizeof(void *) + sizeof(uint32_t  ) + sizeof(Objects_Name *)) +
+             (sizeof(void *) + sizeof(uint32_t) + sizeof(Objects_Name *)) +
           ((maximum + minimum_index) * sizeof(Objects_Control *))
         );
     }
@@ -148 +148 @@
     inactive_per_block = (uint32_t   *) _Addresses_Add_offset(
         object_blocks, block_count * sizeof(void*) );
     name_table = (Objects_Name *) _Addresses_Add_offset(
-        inactive_per_block, block_count * sizeof(uint32_t  ) );
+        inactive_per_block, block_count * sizeof(uint32_t) );
     local_table = (Objects_Control **) _Addresses_Add_offset(
         name_table, block_count * sizeof(Objects_Name *) );
 
@@ -171 +171 @@
               block_count * sizeof(void*) );
       memcpy( inactive_per_block,
               information->inactive_per_block,
-              block_count * sizeof(uint32_t  ) );
+              block_count * sizeof(uint32_t) );
       memcpy( name_table,
               information->name_table,
               block_count * sizeof(Objects_Name *) );

objectinitializeinformation.c

@@ -96 +96 @@
    *  Are we operating in unlimited, or auto-extend mode
    */
 
-  information->auto_extend = (maximum & OBJECTS_UNLIMITED_OBJECTS) ? TRUE : FALSE;
-  maximum                 &= ~OBJECTS_UNLIMITED_OBJECTS;
+  information->auto_extend = 
+      (maximum & OBJECTS_UNLIMITED_OBJECTS) ? TRUE : FALSE;
+  maximum &= ~OBJECTS_UNLIMITED_OBJECTS;
 
   /*
    *  The allocation unit is the maximum value

threadchangepriority.c

@@ -95 +95 @@
    */
   state = the_thread->current_state;
   if ( state != STATES_TRANSIENT ) {
+    the_thread->current_state = _States_Clear( STATES_TRANSIENT, state );
+    _ISR_Enable( level );
     if ( _States_Is_waiting_on_thread_queue( state ) ) {
-       _ISR_Enable( level ); 
       _Thread_queue_Requeue( the_thread->Wait.queue, the_thread );
-      _ISR_Disable( level );  /* redisable so state is cleared with ISR off */
     }
-    the_thread->current_state = _States_Clear( STATES_TRANSIENT, state );
-    _ISR_Enable( level );
     return;
   }
 

threadqdequeuepriority.c

@@ -75 +75 @@
 
     case THREAD_QUEUE_NOTHING_HAPPENED:
     case THREAD_QUEUE_TIMEOUT:
+printk( "BUMP\n");
       the_thread_queue->sync_state = THREAD_QUEUE_SATISFIED;
       _ISR_Enable( level );
       return _Thread_Executing;

threadqenqueuepriority.c

@@ -75 +75 @@
   _ISR_Disable( level );
   search_thread = (Thread_Control *) header->first;
   while ( !_Chain_Is_tail( header, (Chain_Node *)search_thread ) ) {
+    if ( the_thread_queue->sync_state != THREAD_QUEUE_NOTHING_HAPPENED )
+      goto synchronize;
     search_priority = search_thread->current_priority;
     if ( priority <= search_priority )
       break;
@@ -122 +124 @@
   _ISR_Disable( level );
   search_thread = (Thread_Control *) header->last;
   while ( !_Chain_Is_head( header, (Chain_Node *)search_thread ) ) {
+    if ( the_thread_queue->sync_state != THREAD_QUEUE_NOTHING_HAPPENED )
+      goto synchronize;
     search_priority = search_thread->current_priority;
     if ( priority >= search_priority )
       break;
@@ -163 +167 @@
   return;
 
 equal_priority:               /* add at end of priority group */
+    if ( the_thread_queue->sync_state != THREAD_QUEUE_NOTHING_HAPPENED )
+      goto synchronize;
   search_node   = _Chain_Tail( &search_thread->Wait.Block2n );
   previous_node = search_node->previous;
   the_node      = (Chain_Node *) the_thread;
@@ -177 +183 @@
 
 synchronize:
 
+printk("\nSYNC\n");
   sync_state = the_thread_queue->sync_state;
   the_thread_queue->sync_state = THREAD_QUEUE_SYNCHRONIZED;
 

threadqrequeue.c

@@ -43 +43 @@
 )
 {
   /* just in case the thread really wasn't blocked here */
-  if ( !the_thread_queue )
+  if ( !the_thread_queue ) {
     return;
+  }
 
   switch ( the_thread_queue->discipline ) {
     case THREAD_QUEUE_DISCIPLINE_FIFO:
@@ -52 +53 @@
       break;
     case THREAD_QUEUE_DISCIPLINE_PRIORITY: {
       Thread_queue_Control *tq = the_thread_queue;
+      ISR_Level             level;
 
-      _Thread_queue_Enter_critical_section( tq );
+      _ISR_Disable( level );
+      if ( _States_Is_waiting_on_thread_queue( the_thread->current_state ) ) {
+        _Thread_queue_Enter_critical_section( tq );
         _Thread_queue_Extract_priority_helper( tq, the_thread, TRUE );
         _Thread_queue_Enqueue_priority( tq, the_thread );
       }
+      _ISR_Enable( level );
       break;
-   }
+    }
+  }
 }