Changeset 8cb529e


Ignore:
Timestamp:
Jul 14, 2017, 12:20:57 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
eb2fe4f
Parents:
4ec769c
Message:

Preemption now properly(?) use si_code in addition to si_value

Location:
src/libcfa/concurrency
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/concurrency/alarm.c

    r4ec769c r8cb529e  
    4343
    4444void __kernel_set_timer( __cfa_time_t alarm ) {
    45         LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : set timer to %lu\n", (__cfa_time_t)alarm );
     45        LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : set timer to %llu\n", (__cfa_time_t)alarm );
    4646        itimerval val;
    4747        val.it_value.tv_sec = alarm / TIMEGRAN;                 // seconds
    48         val.it_value.tv_usec = (alarm % TIMEGRAN) / ( TIMEGRAN / 1_000_000L ); // microseconds
     48        val.it_value.tv_usec = max( (alarm % TIMEGRAN) / ( TIMEGRAN / 1_000_000L ), 1000 ); // microseconds
    4949        val.it_interval.tv_sec = 0;
    5050        val.it_interval.tv_usec = 0;
  • src/libcfa/concurrency/alarm.h

    r4ec769c r8cb529e  
    1919
    2020#include <stdbool.h>
     21#include <stdint.h>
    2122
    2223#include "assert"
    2324
    24 typedef unsigned long int __cfa_time_t;
     25typedef uint64_t __cfa_time_t;
    2526
    2627struct thread_desc;
  • src/libcfa/concurrency/preemption.c

    r4ec769c r8cb529e  
    6666
    6767void tick_preemption() {
    68         // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Ticking preemption\n" );
    69 
    7068        alarm_list_t * alarms = &systemProcessor->alarms;
    7169        __cfa_time_t currtime = __kernel_get_time();
     70
     71        // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Ticking preemption @ %llu\n", currtime );
    7272        while( alarms->head && alarms->head->alarm < currtime ) {
    7373                alarm_node_t * node = pop(alarms);
     
    8383                verify( validate( alarms ) );
    8484
    85                 if( node->period > 0 ) {
    86                         node->alarm = currtime + node->period;
     85                __cfa_time_t period = node->period;
     86                if( period > 0 ) {
     87                        node->alarm = currtime + period;
     88                        // LIB_DEBUG_PRINT_BUFFER_LOCAL( STDERR_FILENO, "Reinsert %p @ %llu (%llu + %llu)\n", node, node->alarm, currtime, period );
    8789                        insert( alarms, node );
    8890                }
     
    101103
    102104void update_preemption( processor * this, __cfa_time_t duration ) {
    103         LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Processor : %p updating preemption to %lu\n", this, duration );
     105        LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Processor : %p updating preemption to %llu\n", this, duration );
    104106
    105107        alarm_node_t * alarm = this->preemption_alarm;
     
    273275                siginfo_t info;
    274276                int sig = sigwaitinfo( &mask, &info );
    275                 if( sig < 0 ) {
    276                         abortf( "internal error, sigwait" );
    277                 }
    278                 else if( sig == SIGALRM )
     277                assertf(sig == SIGALRM, "Kernel Internal Error, sigwait: Unexpected signal %d (%d : %d)\n", sig, info.si_code, info.si_value.sival_int);
     278
     279                LIB_DEBUG_PRINT_SAFE("Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int );
     280                switch( info.si_code )
    279281                {
    280                         LIB_DEBUG_PRINT_SAFE("Kernel : Caught signal %d (%d)\n", sig, info.si_value.sival_int );
    281                         if( info.si_value.sival_int == 0 )
    282                         {
    283                                 LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread tick\n");
    284                                 lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
    285                                 tick_preemption();
    286                                 unlock( &systemProcessor->alarm_lock );
    287                         }
    288                         else if( info.si_value.sival_int == 1 )
    289                         {
    290                                 break;
    291                         }
    292                 }
    293                 else
    294                 {
    295                         LIB_DEBUG_PRINT_SAFE("Kernel : Unexpected signal %d (%d)\n", sig, info.si_value.sival_int);
    296                 }
    297         }
    298 
     282                case SI_TIMER:
     283                case SI_KERNEL:
     284                        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread tick\n");
     285                        lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
     286                        tick_preemption();
     287                        unlock( &systemProcessor->alarm_lock );
     288                        break;
     289                case SI_QUEUE:
     290                        goto EXIT;
     291                }
     292        }
     293
     294EXIT:
    299295        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread stopping\n");
    300296        return NULL;
Note: See TracChangeset for help on using the changeset viewer.