VDR 2.3.8 LOCK Sequenz

Fourty2 · 6. August 2017

Hallo zusammen,

nun hab' ich da noch einen Locking Fehler im skinnopacity (Channel-Info):

Code

Aug  6 14:10:52 roadrunner vdr: [13420] --- begin invalid lock sequence report
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  R  -  -  -  R  -  -  -  -  -  L
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  *  -  -  -  U  -  -  -  -  -  U
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  U  -  -  -  -  -  -  -  -  -  U
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  R  -  -  -  -  -  -  -  -  -  L
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  U  -  -  -  -  -  -  -  -  -  U
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  R  -  -  -  -  -  -  -  -  -  L
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  U  -  -  -  -  -  -  -  -  -  U
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  -  R  -  -  -  -  -  -  -  -  L
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  -  U  -  -  -  -  -  -  -  -  U
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  R  -  -  -  -  -  -  -  -  -  L
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  U  -  -  -  -  -  -  -  -  -  U
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  W  -  -  -  -  -  -  -  -  -  L
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  *  -  -  -  R  -  -  -  -  -  L
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  *  -  -  -  U  -  -  -  -  -  U
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  U  -  -  -  -  -  -  -  -  -  U
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  -  R  -  -  -  -  -  -  -  -  L
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  -  *  -  -  -  -  -  -  -  -  L
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  -  *  -  -  -  -  -  -  -  -  U
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  -  *  -  -  -  -  -  -  -  -  L
Aug  6 14:10:52 roadrunner vdr: [13420] 13420  R  *  -  -  -  -  -  -  -  -  L
Aug  6 14:10:52 roadrunner vdr: [13420] 13420 invalid lock sequence: 1 Timers
Aug  6 14:10:52 roadrunner vdr: [13420] full backtrace:
Aug  6 14:10:52 roadrunner vdr: [13420] /usr/bin/vdr cStateLock::Lock(cStateKey&, bool, int) calling ?? at ??:0
Aug  6 14:10:52 roadrunner vdr: [13420] /usr/bin/vdr cTimers::GetTimersRead(cStateKey&, int) calling ?? at ??:0
Aug  6 14:10:52 roadrunner vdr: [13420] /usr/lib/vdr/plugins/libvdr-skinnopacity.so.2.3.8 cNopacityDisplayChannelView::DrawSourceInfo() at displaychannelview.c:803
Aug  6 14:10:52 roadrunner vdr: [13420] /usr/lib/vdr/plugins/libvdr-skinnopacity.so.2.3.8 cNopacityDisplayChannel::Flush() at displaychannel.c:169
Aug  6 14:10:52 roadrunner vdr: [13420] /usr/bin/vdr cDisplayChannel::ProcessKey(eKeys) calling ?? at ??:0
Aug  6 14:10:52 roadrunner vdr: [13420] /usr/bin/vdr cDisplayChannel::cDisplayChannel(eKeys) calling ?? at ??:0
Aug  6 14:10:52 roadrunner vdr: [13420] /usr/bin/vdr main calling ?? at ??:0
Aug  6 14:10:52 roadrunner vdr: [13420] /lib/x86_64-linux-gnu/libc.so.6 __libc_start_main at ??:?
Aug  6 14:10:52 roadrunner vdr: [13420] /usr/bin/vdr _start calling ?? at ??:0
Aug  6 14:10:52 roadrunner vdr: [13420] --- end invalid lock sequence report

Alles anzeigen

Die gibt es ja entsprechend in anderen Plugins, die Timer-Infos mit anzeigen.

Nun hat der VDR bereits "Channels" gelockt:

Code

// --- cDisplayChannel -------------------------------------------------------


cDisplayChannel *cDisplayChannel::currentDisplayChannel = NULL;


cDisplayChannel::cDisplayChannel(int Number, bool Switched)
:cOsdObject(true)
{
  currentDisplayChannel = this;
  group = -1;
  withInfo = !Switched || Setup.ShowInfoOnChSwitch;
  displayChannel = Skins.Current()->DisplayChannel(withInfo);
  number = 0;
  timeout = Switched || Setup.TimeoutRequChInfo;
  cOsdProvider::OsdSizeChanged(osdState); // just to get the current state
  positioner = NULL;
  channel = NULL;
  LOCK_CHANNELS_READ;
  channel = Channels->GetByNumber(Number);
  lastPresent = lastFollowing = NULL;
  if (channel) {
     DisplayChannel();
     DisplayInfo();
     displayChannel->Flush();
     }
  lastTime.Set();
}

Alles anzeigen

Das kann man im Plugin

Code

void cNopacityDisplayChannelView::DrawSourceInfo(void) {
    const cChannel *channel = cDevice::ActualDevice()->GetCurrentlyTunedTransponder();
    const cSource *source = (channel) ? Sources.Get(channel->Source()) : NULL;
    cString channelInfo = "";
    if (source) {
        channelInfo = cString::sprintf("%s #%d", source->Description(), cDevice::ActualDevice()->DeviceNumber());
    }
    if (cRecordControls::Active()) {
        LOCK_TIMERS_READ;
                cSortedTimers SortedTimers(Timers);
        bool first = true;
[..]

Alles anzeigen

ja nicht mehr "umdrehen". Was tun? In menu.c "Timers" mit locken?

Stefan

Fourty2 · 6. August 2017

Hallo zusammen,

Versuch macht kluch...

Diff

--- a/menu.c
+++ b/menu.c
@@ -4522,6 +4522,7 @@
   cOsdProvider::OsdSizeChanged(osdState); // just to get the current state
   positioner = NULL;
   channel = NULL;
+  LOCK_TIMERS_READ;
   LOCK_CHANNELS_READ;
   channel = Channels->GetByNumber(Number);
   lastPresent = lastFollowing = NULL;
@@ -4568,6 +4569,7 @@
 void cDisplayChannel::DisplayInfo(void)
 {
   if (withInfo && channel) {
+     LOCK_TIMERS_READ;
      LOCK_SCHEDULES_READ;
      if (const cSchedule *Schedule = Schedules->GetSchedule(channel)) {
         const cEvent *Present = Schedule->GetPresentEvent();

Alles anzeigen

Und das Syslog ist derzeit ruhig. Vielleicht nicht die beste Lösung, aber mal sehen, ob was verunfallt.

Grüße,
Stefan

kls · 6. August 2017

Aus skins.h:

// Several member functions of the following classes are called with a pointer to
// an object from a global list (cTimer, cChannel, cRecording or cEvent). In these
// cases the core VDR code holds a lock on the respective list. While in general a
// plugin should only work with the objects and data that is explicitly given to it
// in the function call, the called function may itself set a read lock (not a write
// lock!) on this list, because read locks can be nested. It may also set read locks
// (not write locks!) on higher order lists.
// For instance, a function that is called with a cChannel may lock cRecordings and/or
// cSchedules (which contains cEvent objects), but not cTimers. If a plugin needs to
// set locks of its own (on mutexes defined inside the plugin code), it shall do so
// after setting any locks on VDR's global lists, and it shall always set these
// locks in the same sequence, to avoid deadlocks.

Der Patch ist also bestenfalls ein Workaround, aber keine Lösung (und wird natürlich keinen Eingang in die VDR-Source finden ;-).

Wenn cNopacityDisplayChannelView Timer anzeigen will, dann sollte es das in seiner Flush()-Funktion tun (siehe cSkinLCARSDisplayChannel::Flush()) oder in einem separaten Thread.

Klaus

Fourty2 · 6. August 2017

Ja Klaus,

daß ist schon ein Kreuz mit den lieb gewonnenen Plugin-Leichen...

Grüße,
Stefan

VDR 2.3.8 LOCK Sequenz

Jetzt mitmachen!

Teilen