comparison recpt1/recpt1.c @ 24:f2cce7becf52

fixed a bug that recpt1 could not exit when recsec is specified.

23:f80731a89036

                if(code < 0) {
                    fprintf(stderr, "b25_decode failed\n");
                    break;
                }
                wc = write(wfd, dbuf.data, dbuf.size);
                if(wc <= 0 && errno == EPIPE) {
                    pthread_kill(signal_thread, SIGPIPE);
                }

                if(use_udp && sfd != -1) {
                    sendto(sfd, dbuf.data, dbuf.size, 0,
                           addr, sizeof(struct sockaddr_in));
                }
                free(buf);
            }
            else {
                wc = write(wfd, sbuf.data, sbuf.size);
                if(wc <= 0 && errno == EPIPE) {
                    pthread_kill(signal_thread, SIGPIPE);
                }

                if(use_udp && sfd != -1) {
                    sendto(sfd, sbuf.data, sbuf.size, 0,
                           addr, sizeof(struct sockaddr_in));

                    if(code < 0) {
                        fprintf(stderr, "b25_finish failed\n");
                        break;
                    }
                    wc = write(wfd, dbuf.data, dbuf.size);
                    if(wc <= 0 && errno == EPIPE) {
                        pthread_kill(signal_thread, SIGPIPE);
                    }

                    if(use_udp && sfd != -1) {
                        sendto(sfd, dbuf.data, dbuf.size, 0,
                               addr, sizeof(struct sockaddr_in));

    sigemptyset(&waitset);
    sigaddset(&waitset, SIGPIPE);
    sigaddset(&waitset, SIGINT);
    sigaddset(&waitset, SIGTERM);

    sigwait(&waitset, &sig);

    switch(sig) {
    case SIGPIPE:

        break;
    case SIGTERM:
        fprintf(stderr, "\nSIGTERM received. cleaning up...\n");
        cleanup(sdata);
        break;
    }

    return NULL; /* dummy */
}

    sigemptyset(&blockset);
    sigaddset(&blockset, SIGPIPE);
    sigaddset(&blockset, SIGINT);
    sigaddset(&blockset, SIGTERM);

    if(pthread_sigmask(SIG_BLOCK, &blockset, NULL))
        fprintf(stderr, "pthread_sigmask() failed.\n");

    pthread_create(signal_thread, NULL, process_signals, sdata);

    int recsec;
    int indefinite = FALSE;
    time_t start_time, cur_time;
    FREQUENCY freq;
    ISDB_T_FREQ_CONV_TABLE *ptr;
    pthread_t dequeue_thread;
    pthread_t signal_thread;
    QUEUE_T *p_queue = create_queue(MAX_QUEUE);
    BUFSZ   *bufptr;
    decoder *dec = NULL;
    static reader_thread_data tdata;

    tdata.queue = p_queue;
    tdata.decoder = dec;
    tdata.wfd = wfd;
    tdata.sock_data = sockdata;
    tdata.signal_thread = signal_thread;
    pthread_create(&dequeue_thread, NULL, reader_func, &tdata);

    /* start recording */
    if(ioctl(tfd, START_REC, 0) < 0) {
        fprintf(stderr, "Tuner could not start recording\n");
        return 1;

            }
            break;
        }
    }

    /* close tuner */
    if(ptr->type == CHTYPE_SATELLITE) {
        if(ioctl(tfd, LNB_DISABLE, 0) < 0) {
            return 0 ;
        }
    }
    close(tfd);

    /* wait for threads */
    pthread_join(dequeue_thread, NULL);
    pthread_join(signal_thread, NULL);

    /* release queue */
    destroy_queue(p_queue);

    /* close output file */
    if(!use_stdout)

24:f2cce7becf52

                if(code < 0) {
                    fprintf(stderr, "b25_decode failed\n");
                    break;
                }
                wc = write(wfd, dbuf.data, dbuf.size);
                if(wc < 0) {
                    if(errno == EPIPE)
                        pthread_kill(signal_thread, SIGPIPE);
                    else
                        pthread_kill(signal_thread, SIGUSR2);
                }

                if(use_udp && sfd != -1) {
                    sendto(sfd, dbuf.data, dbuf.size, 0,
                           addr, sizeof(struct sockaddr_in));
                }
                free(buf);
            }
            else {
                wc = write(wfd, sbuf.data, sbuf.size);
                if(wc < 0) {
                    if(errno == EPIPE)
                        pthread_kill(signal_thread, SIGPIPE);
                    else
                        pthread_kill(signal_thread, SIGUSR2);
                }

                if(use_udp && sfd != -1) {
                    sendto(sfd, sbuf.data, sbuf.size, 0,
                           addr, sizeof(struct sockaddr_in));

                    if(code < 0) {
                        fprintf(stderr, "b25_finish failed\n");
                        break;
                    }
                    wc = write(wfd, dbuf.data, dbuf.size);
                    if(wc < 0) {
                        if(errno == EPIPE)
                            pthread_kill(signal_thread, SIGPIPE);
                        else
                            pthread_kill(signal_thread, SIGUSR2);
                    }

                    if(use_udp && sfd != -1) {
                        sendto(sfd, dbuf.data, dbuf.size, 0,
                               addr, sizeof(struct sockaddr_in));

    sigemptyset(&waitset);
    sigaddset(&waitset, SIGPIPE);
    sigaddset(&waitset, SIGINT);
    sigaddset(&waitset, SIGTERM);
    sigaddset(&waitset, SIGUSR1);
    sigaddset(&waitset, SIGUSR2);

    sigwait(&waitset, &sig);

    switch(sig) {
    case SIGPIPE:

        break;
    case SIGTERM:
        fprintf(stderr, "\nSIGTERM received. cleaning up...\n");
        cleanup(sdata);
        break;
    case SIGUSR1: /* normal exit*/
        cleanup(sdata);
        break;
    case SIGUSR2: /* error */
        fprintf(stderr, "\nSomething is wrong. cleaning up...\n");
        cleanup(sdata);
        break;
    }

    return NULL; /* dummy */
}

    sigemptyset(&blockset);
    sigaddset(&blockset, SIGPIPE);
    sigaddset(&blockset, SIGINT);
    sigaddset(&blockset, SIGTERM);
    sigaddset(&blockset, SIGUSR1);
    sigaddset(&blockset, SIGUSR2);

    if(pthread_sigmask(SIG_BLOCK, &blockset, NULL))
        fprintf(stderr, "pthread_sigmask() failed.\n");

    pthread_create(signal_thread, NULL, process_signals, sdata);

    int recsec;
    int indefinite = FALSE;
    time_t start_time, cur_time;
    FREQUENCY freq;
    ISDB_T_FREQ_CONV_TABLE *ptr;
    pthread_t reader_thread;
    pthread_t signal_thread;
    QUEUE_T *p_queue = create_queue(MAX_QUEUE);
    BUFSZ   *bufptr;
    decoder *dec = NULL;
    static reader_thread_data tdata;

    tdata.queue = p_queue;
    tdata.decoder = dec;
    tdata.wfd = wfd;
    tdata.sock_data = sockdata;
    tdata.signal_thread = signal_thread;
    pthread_create(&reader_thread, NULL, reader_func, &tdata);

    /* start recording */
    if(ioctl(tfd, START_REC, 0) < 0) {
        fprintf(stderr, "Tuner could not start recording\n");
        return 1;

            }
            break;
        }
    }

    pthread_kill(signal_thread, SIGUSR1);

    /* wait for threads */
    pthread_join(reader_thread, NULL);
    pthread_join(signal_thread, NULL);

    /* close tuner */
    if(ptr->type == CHTYPE_SATELLITE) {
        if(ioctl(tfd, LNB_DISABLE, 0) < 0) {
            return 0 ;
        }
    }
    close(tfd);

    /* release queue */
    destroy_queue(p_queue);

    /* close output file */
    if(!use_stdout)