Ticket #13207: 13207-debug1.patch

File 13207-debug1.patch, 3.9 KB (added by gigem, 6 years ago)
  • mythtv/libs/libmythtv/recorders/dvbchannel.cpp

    diff --git a/mythtv/libs/libmythtv/recorders/dvbchannel.cpp b/mythtv/libs/libmythtv/recorders/dvbchannel.cpp
    index dbdf7adc11..9327614bc3 100644
    a b void DVBChannel::Close(DVBChannel *who) 
    149149
    150150    IsOpenMap::iterator it = is_open.find(who);
    151151    if (it == is_open.end())
     152    {
     153        LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##Not open");
    152154        return; // this caller didn't have it open in the first place..
     155    }
    153156
    154157    is_open.erase(it);
    155158
    void DVBChannel::Close(DVBChannel *who) 
    163166        master->Close(this);
    164167        fd_frontend = -1;
    165168        ReturnMasterLock(master);
     169        LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##master->Close9) succeeded");
    166170        return;
    167171    }
    168172    ReturnMasterLock(master); // if we're the master we don't need this lock..
    169173
    170174    if (!is_open.empty())
     175    {
     176        LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##still has other callers");
    171177        return; // not all callers have closed the DVB channel yet..
     178    }
    172179
    173180    if (diseqc_tree)
    174181        diseqc_tree->Close();
    void DVBChannel::Close(DVBChannel *who) 
    180187
    181188        dvbcam->Stop();
    182189    }
     190    LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##Succeeded");
    183191}
    184192
    185193bool DVBChannel::Open(DVBChannel *who)
    186194{
    187     LOG(VB_CHANNEL, LOG_INFO, LOC + "Opening DVB channel");
     195    LOG(VB_CHANNEL, LOG_INFO, LOC + "##Opening DVB channel");
    188196
    189197    if (!m_inputid)
    190198    {
    191199        if (!InitializeInput())
     200        {
     201            LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##InitializeInput() failed");
    192202            return false;
     203        }
    193204    }
    194205
    195206    QMutexLocker locker(&hw_lock);
    196207
    197208    if (fd_frontend >= 0)
    198209    {
     210        LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##fd_frontend already set");
    199211        is_open[who] = true;
    200212        return true;
    201213    }
    bool DVBChannel::Open(DVBChannel *who) 
    205217    {
    206218        if (!master->Open(who))
    207219        {
     220            LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##master->Open() failed");
    208221            ReturnMasterLock(master);
    209222            return false;
    210223        }
    bool DVBChannel::Open(DVBChannel *who) 
    223236
    224237        if (!InitializeInput())
    225238        {
     239            LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##InitializeInput2() failed");
    226240            Close();
    227241            ReturnMasterLock(master);
    228242            return false;
    229243        }
    230244
     245        LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##InitializeInput2() succedded");
    231246        ReturnMasterLock(master);
    232247        return true;
    233248    }
    bool DVBChannel::Open(DVBChannel *who) 
    242257        if (fd_frontend >= 0)
    243258            break;
    244259        LOG(VB_GENERAL, LOG_WARNING, LOC +
    245             "Opening DVB frontend device failed." + ENO);
     260            "  ##Opening DVB frontend device failed." + ENO);
    246261        if (tries >= 20 || (errno != EBUSY && errno != EAGAIN))
    247262        {
    248263            LOG(VB_GENERAL, LOG_ERR, LOC +
    249                 QString("Failed to open DVB frontend device due to "
     264                QString("  ##Failed to open DVB frontend device due to "
    250265                        "fatal error or too many attempts."));
    251266            return false;
    252267        }
    bool DVBChannel::Open(DVBChannel *who) 
    258273    if (ioctl(fd_frontend, FE_GET_INFO, &info) < 0)
    259274    {
    260275        LOG(VB_GENERAL, LOG_ERR, LOC +
    261             "Failed to get frontend information." + ENO);
     276            "  ##Failed to get frontend information." + ENO);
    262277
    263278        close(fd_frontend);
    264279        fd_frontend = -1;
    bool DVBChannel::Open(DVBChannel *who) 
    312327
    313328    if (!InitializeInput())
    314329    {
     330        LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##InitializeInput3() failed");
    315331        Close();
    316332        return false;
    317333    }
    bool DVBChannel::Open(DVBChannel *who) 
    319335    if (fd_frontend >= 0)
    320336        is_open[who] = true;
    321337
     338    LOG(VB_CHANNEL, LOG_INFO, LOC + "##Succedded");
    322339    return (fd_frontend >= 0);
    323340}
    324341