Changeset 1721


Ignore:
Timestamp:
02/26/10 18:36:53 (11 years ago)
Author:
merek
Message:

Merge from UMP r1793

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/oscam.c

    r1716 r1721  
    961961}
    962962
    963 #ifdef USE_PTHREAD
    964 static void cs_logger(void *dummy)
    965 #else
    966963static void cs_logger(void)
    967 #endif
    968964{
    969965  *log_fd=client[cs_idx].fd_m2c;
     
    977973    FD_SET(fd_m2c, &fds);
    978974    select(fd_m2c+1, &fds, 0, 0, 0);
    979 #ifndef USE_PTHREAD
     975
    980976    if (master_pid!=getppid())
    981977      cs_exit(0);
    982 #endif
     978
    983979    if (FD_ISSET(fd_m2c, &fds))
    984980    {
     
    1000996{
    1001997  int i;
    1002 #ifdef USE_PTHREAD
    1003   pthread_t tid;
    1004   if ((i=pthread_create(&tid, (pthread_attr_t *)0, (void *) &cs_logger, (void *) 0)))
    1005     cs_log("ERROR: can't create logging-thread (err=%d)", i);
    1006   else
    1007   {
    1008     cs_log("logging thread started");
    1009     pthread_detach(tid);
    1010   }
    1011 #endif
     998
    1012999  cs_sleepms(1000); // wait for reader
    10131000  while(1)
     
    10921079        case 96: start_anticascader();
    10931080#endif
    1094 #ifdef USE_PTHREAD
    1095         case 97: cs_logger(dummy);
    1096 #else
    10971081        case 97: cs_logger();
    1098 #endif
    10991082        case 98: start_resolver();
    11001083#ifdef WEBIF
Note: See TracChangeset for help on using the changeset viewer.