Changeset 5371


Ignore:
Timestamp:
Jun 11, 2011, 2:08:40 PM (9 years ago)
Author:
Admin
Message:

Fully remove unneeded codepath for dbox/dm500 which was needeed because of wrong toolchain used on this plattform. If you use a dbox/dm500 you need to use the right toolchain or use the ppc.old binaries.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/module-dvbapi.c

    r5344 r5371  
    16081608    client->thread=pthread_self();
    16091609    pthread_setspecific(getclient, cli);
    1610 #ifndef NO_PTHREAD_CLEANUP_PUSH
    16111610    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
    16121611    pthread_cleanup_push(cleanup_thread, (void *) client);
    1613 #endif
    16141612
    16151613    dvbapi_client=cli;
     
    17891787        }
    17901788    }
    1791 #ifndef NO_PTHREAD_CLEANUP_PUSH
    17921789    pthread_cleanup_pop(1);
    1793 #else
    1794     cs_exit(0);
    1795 #endif
    17961790    return NULL;
    17971791}
     
    25992593    pthread_setspecific(getclient, cli);
    26002594    dvbapi_client=cli;
    2601     #ifndef NO_PTHREAD_CLEANUP_PUSH
    26022595    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
    26032596    pthread_cleanup_push(cleanup_thread, (void *) client);
    2604     #endif
    26052597
    26062598    struct s_auth *account;
     
    27132705    }
    27142706    cs_log("openxcas: invalid message");
    2715     #ifndef NO_PTHREAD_CLEANUP_PUSH
    27162707    pthread_cleanup_pop(1);
    2717     #else
    2718     cs_exit(0);
    2719     #endif
    27202708    return NULL;
    27212709}
  • trunk/oscam-reader.c

    r5370 r5371  
    784784    struct s_client * client = reader->client; 
    785785    if(!client) cs_exit(1);
    786     #ifndef NO_PTHREAD_CLEANUP_PUSH
    787786    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
    788787    pthread_cleanup_push(cleanup_thread, (void *)client);
    789     #endif
    790788   
    791789    client->thread=pthread_self();
     
    827825 
    828826  reader_main(reader);
    829   #ifndef NO_PTHREAD_CLEANUP_PUSH
    830827  pthread_cleanup_pop(1);
    831   #else
    832   cs_exit(0);
    833   #endif
    834828    return NULL; //dummy to prevent compiler error
    835829}
  • trunk/oscam.c

    r5370 r5371  
    569569        cl->cleaned++;//cleaned=2
    570570        add_garbage(cl);
    571 #ifndef NO_PTHREAD_CLEANUP_PUSH
    572571        cs_cleanlocks();
    573 #endif
    574572    }
    575573}
     
    812810    if (cl->typ != 's') {
    813811        cs_log("thread %8X ended!", pthread_self());
    814 #ifdef NO_PTHREAD_CLEANUP_PUSH
    815         cleanup_thread(cl);
    816 #endif
    817812        //Restore signals before exiting thread
    818813        set_signal_handler(SIGPIPE , 0, cs_sigpipe);
     
    11561151    memcpy(&clientinit, init, sizeof(struct s_clientinit)); //copy to stack to free init pointer
    11571152    free(init);
    1158 #ifndef NO_PTHREAD_CLEANUP_PUSH
    11591153    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
    11601154    pthread_setspecific(getclient, clientinit.client);
     
    11621156    clientinit.handler(clientinit.client);
    11631157    pthread_cleanup_pop(1);
    1164 #else
    1165     clientinit.handler(clientinit.client);
    1166     cs_exit(0);
    1167 #endif
    11681158    return NULL;
    11691159}
     
    12101200    pthread_cancel(thread);
    12111201    pthread_join(thread, NULL);
    1212 #ifndef NO_PTHREAD_CLEANUP_PUSH
    12131202    int32_t cnt = 0;
    12141203    while(cnt < 10 && cl && cl->cleaned < 2){
     
    12231212    }
    12241213
    1225 #else
    1226     cs_sleepms(50);
    1227     cleanup_thread(cl);
    1228 #endif
    12291214    cs_log("thread %8X killed!", thread);
    12301215    return;
Note: See TracChangeset for help on using the changeset viewer.