Ticket #4242: myth_IOMultiplierV2_r15966.diff

libs/libmythtv/ThreadedFileWriter.cpp

@@ -23 +23 @@
 #define LOC_ERR QString("TFW, Error: ")
 
 const uint ThreadedFileWriter::TFW_DEF_BUF_SIZE   = 2*1024*1024;
-const uint ThreadedFileWriter::TFW_MAX_WRITE_SIZE = TFW_DEF_BUF_SIZE / 4;
-const uint ThreadedFileWriter::TFW_MIN_WRITE_SIZE = TFW_DEF_BUF_SIZE / 32;
+const uint ThreadedFileWriter::TFW_MAX_WRITE_SIZE = TFW_DEF_BUF_SIZE / 
+                                                    (128 / (2<<(5-1)));
+const uint ThreadedFileWriter::TFW_MIN_WRITE_SIZE = TFW_DEF_BUF_SIZE /
+                                                    (1024 / (2<<(5-1)));
 
 /** \class ThreadedFileWriter
  *  \brief This class supports the writing of recordings to disk.
@@ -114 +116 @@
  *  \brief Creates a threaded file writer.
  */
 ThreadedFileWriter::ThreadedFileWriter(const QString &fname,
-                                       int pflags, mode_t pmode) :
+                                       int pflags, mode_t pmode,
+                                       uint io_mult) :
     // file stuff
     filename(QDeepCopy<QString>(fname)), flags(pflags),
     mode(pmode),                         fd(-1),
@@ -126 +129 @@
     rpos(0),                             wpos(0),
     written(0),
     // buffer
-    buf(NULL),                           tfw_buf_size(0)
+    buf(NULL),                           tfw_buf_size(0),
+    io_multiplier(io_mult)
 {
 }
 
@@ -151 +155 @@
         bzero(buf, TFW_DEF_BUF_SIZE + 64);
 
         tfw_buf_size = TFW_DEF_BUF_SIZE;
-        tfw_min_write_size = TFW_MIN_WRITE_SIZE;
+
+        tfw_min_write_size = TFW_DEF_BUF_SIZE / (1024 / (2<<(io_multiplier - 1)));
+        tfw_max_write_size = TFW_DEF_BUF_SIZE / (128 / (2<<(io_multiplier - 1)));
+
+        VERBOSE(VB_RECORD, LOC + QString("Using io multiplier %1, "
+                                          "min/max = %2/%3")
+                                                     .arg(io_multiplier)
+                                                     .arg(tfw_min_write_size)
+                                                     .arg(tfw_max_write_size));
+
         pthread_create(&writer, NULL, boot_writer, this);
         pthread_create(&syncer, NULL, boot_syncer, this);
         return true;
@@ -367 +380 @@
            buffer is valid, and we try to write all of it at once which
            takes a long time. During this time, the other thread fills up
            the 10% that was free... */
-        size = (size > TFW_MAX_WRITE_SIZE) ? TFW_MAX_WRITE_SIZE : size;
+        size = (size > tfw_max_write_size) ? tfw_max_write_size : size;
 
         bool write_ok;
         if (ignore_writes)

libs/libmythtv/dbcheck.cpp

@@ -14 +14 @@
 #define MINIMUM_DBMS_VERSION 5
 
 /// This is the DB schema version expected by the running MythTV instance.
-const QString currentDatabaseVersion = "1211";
+const QString currentDatabaseVersion = "1212";
 
 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(const QString updates[], QString version,
@@ -3521 +3521 @@
             return false;
     }
 
+    if (dbver == "1211")
+    {
+        const QString updates[] = {
+"ALTER TABLE storagegroup ADD COLUMN io_multiplier TINYINT(1) NULL; ",
+""
+};
+        if (!performActualUpdate(updates, "1211", dbver))
+            return false;
+    }
+
 //"ALTER TABLE cardinput DROP COLUMN preference;" in 0.22
 //"ALTER TABLE channel DROP COLUMN atscsrcid;" in 0.22
 //"ALTER TABLE recordedmarkup DROP COLUMN offset;" in 0.22

libs/libmythtv/RingBuffer.cpp

@@ -47 +47 @@
 
 const uint RingBuffer::kBufferSize = 3 * 1024 * 1024;
 
-#define CHUNK 32768 /* readblocksize increments */
+#define DEF_CHUNK 32768 /* default readblocksize increments */
 
 #define PNG_MIN_SIZE   20 /* header plus one empty chunk */
 #define NUV_MIN_SIZE  204 /* header size? */
@@ -86 +86 @@
  */
 RingBuffer::RingBuffer(const QString &lfilename,
                        bool write, bool readahead,
-                       uint read_retries)
+                       uint read_retries, uint io_multiplier)
     : filename(QDeepCopy<QString>(lfilename)),
       tfw(NULL),                fd2(-1),
       writemode(false),
@@ -101 +101 @@
       readsallowed(false),      wantseek(false), setswitchtonext(false),
       rawbitrate(4000),         playspeed(1.0f),
       fill_threshold(65536),    fill_min(-1),
-      readblocksize(CHUNK),     wanttoread(0),
+      readblocksize(DEF_CHUNK), wanttoread(0),
       numfailures(0),           commserror(false),
       dvdPriv(NULL),            oldfile(false),
       livetvchain(NULL),        ignoreliveeof(false),
@@ -109 +109 @@
 {
     pthread_rwlock_init(&rwlock, NULL);
 
+    if ((io_multiplier > 5) || (io_multiplier < 2))
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("Read/Write multiplier value of %1 is "
+                                  "out of range, setting to the default value %2.")
+                         .arg(io_multiplier).arg(StorageGroup::DEF_IO_MULTIPLIER));
+        io_multiplier = StorageGroup::DEF_IO_MULTIPLIER;
+    }
+
     if (write)
     {
         tfw = new ThreadedFileWriter(
-            filename, O_WRONLY|O_TRUNC|O_CREAT|O_LARGEFILE, 0644);
+            filename, O_WRONLY|O_TRUNC|O_CREAT|O_LARGEFILE, 0644,
+            io_multiplier);
 
         if (!tfw->Open())
         {
@@ -123 +132 @@
         return;
     }
 
+    read_chunk_size = (2<<(io_multiplier - 1)) * 1024;
+    max_read_size = 640 / (32 / (2<<(io_multiplier - 1))) * 1024;
+
+    VERBOSE(VB_GENERAL, LOC + QString("Using io multiplier %1, chunk/max = "
+                                                                     "%2/%3")
+                                                          .arg(io_multiplier)
+                                                          .arg(read_chunk_size)
+                                                          .arg(max_read_size));
+
     if (read_retries != (uint)-1)
         OpenFile(filename, read_retries);
 }
@@ -537 +555 @@
     pthread_rwlock_wrlock(&rwlock);
     wantseek       = false;
     readsallowed   = false;
-    readblocksize  = CHUNK;
+    readblocksize  = read_chunk_size;
 
     // loop without sleeping if the buffered data is less than this
-    fill_threshold = CHUNK * 2;
+    fill_threshold = read_chunk_size * 2;
     fill_min       = 1;
 
 #ifdef USING_FRONTEND
@@ -612 +630 @@
 void RingBuffer::ResetReadAhead(long long newinternal)
 {
     readAheadLock.lock();
-    readblocksize = CHUNK;
+    readblocksize = read_chunk_size;
     rbrpos = 0;
     rbwpos = 0;
     internalreadpos = newinternal;
@@ -726 +744 @@
 
     struct timeval lastread, now;
     gettimeofday(&lastread, NULL);
-    const int KB640 = 640*1024;
     int readtimeavg = 300;
     int readinterval;
 
     pausereadthread = false;
 
-    readAheadBuffer = new char[kBufferSize + KB640];
+    readAheadBuffer = new char[kBufferSize + max_read_size];
 
     ResetReadAhead(0);
     totfree = ReadBufFree();
@@ -783 +800 @@
 
             readtimeavg = (readtimeavg * 9 + readinterval) / 10;
 
-            if (readtimeavg < 200 && readblocksize < KB640)
+            if (readtimeavg < 200 && readblocksize < max_read_size)
             {
-                readblocksize += CHUNK;
+                readblocksize += read_chunk_size;
                 //VERBOSE(VB_PLAYBACK,
                 //    QString("Avg read interval was %1 msec. %2K block size")
                 //            .arg(readtimeavg).arg(readblocksize/1024));
                 readtimeavg = 300;
             }
-            else if (readtimeavg > 400 && readblocksize > CHUNK)
+            else if (readtimeavg > 400 && readblocksize > read_chunk_size)
             {
-                readblocksize -= CHUNK;
+                readblocksize -= read_chunk_size;
                 //VERBOSE(VB_PLAYBACK,
                 //    QString("Avg read interval was %1 msec. %2K block size")
                 //            .arg(readtimeavg).arg(readblocksize/1024));

libs/libmythtv/tv_play.cpp

@@ -44 +44 @@
 #include "datadirect.h"
 #include "sourceutil.h"
 #include "cardutil.h"
+#include "storagegroup.h"
 #include "util-osx-cocoa.h"
 #include "compat.h"
 
@@ -1501 +1502 @@
         {
             QString playbackURL = playbackinfo->GetPlaybackURL();
 
+            StorageGroup sgroup(playbackinfo->storagegroup,
+                                playbackinfo->hostname);
+
+            QString dirname =
+              sgroup.FindRecordingDir(playbackinfo->GetRecordBasename());
+
+            uint io_multiplier = sgroup.ioMultiplier(dirname);
+
             tvchain->SetProgram(playbackinfo);
 
             bool opennow = (tvchain->GetCardType(-1) != "DUMMY");
             prbuffer = new RingBuffer(playbackURL, false, true,
-                                      opennow ? 12 : (uint)-1);
+                                      opennow ? 12 : (uint)-1,
+                                      io_multiplier);
             prbuffer->SetLiveMode(tvchain);
         }
 
@@ -1563 +1573 @@
             playbackURL = playbackinfo->GetPlaybackURL(
                               desiredNextState != kState_WatchingRecording);
 
-        prbuffer = new RingBuffer(playbackURL, false);
+        StorageGroup sgroup(playbackinfo->storagegroup,
+                            playbackinfo->hostname);
+
+        QString dirname =
+          sgroup.FindRecordingDir(playbackinfo->GetRecordBasename());
+
+        uint io_multiplier = sgroup.ioMultiplier(dirname);
+
+        prbuffer = new RingBuffer(playbackURL, false, true, 12, io_multiplier);
         if (prbuffer->IsOpen())
         {
             gContext->DisableScreensaver();
@@ -3805 +3823 @@
         {
             QString playbackURL = playbackinfo->GetPlaybackURL();
 
+            StorageGroup sgroup(playbackinfo->storagegroup,
+                                playbackinfo->hostname);
+
+            QString dirname =
+              sgroup.FindRecordingDir(playbackinfo->GetRecordBasename());
+
+            uint io_multiplier = sgroup.ioMultiplier(dirname);
+
             piptvchain->SetProgram(playbackinfo);
-            piprbuffer = new RingBuffer(playbackURL, false);
+            piprbuffer = new RingBuffer(playbackURL, false, true, 12,
+                                        io_multiplier);
             piprbuffer->SetLiveMode(piptvchain);
         }
 
@@ -4557 +4584 @@
         {
             QString playbackURL = playbackinfo->GetPlaybackURL();
 
+            StorageGroup sgroup(playbackinfo->storagegroup,
+                                playbackinfo->hostname);
+
+            QString dirname =
+              sgroup.FindRecordingDir(playbackinfo->GetRecordBasename());
+
+            uint io_multiplier = sgroup.ioMultiplier(dirname);
+
             tvchain->SetProgram(playbackinfo);
-            prbuffer = new RingBuffer(playbackURL, false);
+            prbuffer = new RingBuffer(playbackURL, false, true, 12,
+                                      io_multiplier);
             prbuffer->SetLiveMode(tvchain);
         }
 

libs/libmythtv/RingBuffer.h

@@ -13 +13 @@
 }
 
 #include "mythexp.h"
+#include "storagegroup.h"
 
 class RemoteFile;
 class RemoteEncoder;
@@ -24 +25 @@
 {
   public:
     RingBuffer(const QString &lfilename, bool write,
-               bool usereadahead = true, uint read_retries = 12/*6*/);
+               bool usereadahead = true, uint read_retries = 12/*6*/,
+               uint io_multiplier = StorageGroup::DEF_IO_MULTIPLIER);
    ~RingBuffer();
 
     // Sets
@@ -126 +128 @@
     long long readpos;
     long long writepos;
 
+    uint read_chunk_size;
+    uint max_read_size;
+
     bool stopreads;
 
     mutable pthread_rwlock_t rwlock;
@@ -155 +160 @@
     float          playspeed;
     int            fill_threshold;
     int            fill_min;
-    int            readblocksize;
+    uint           readblocksize;
 
     QWaitCondition pauseWait;
 

libs/libmythtv/tv_rec.cpp

@@ -14 +14 @@
 #include <qapplication.h>
 #include <qsqldatabase.h>
 #include <qsocket.h>
+#include <qfileinfo.h>
 
 // MythTV headers
 #include "mythconfig.h"
@@ -3931 +3932 @@
 
     if (lastTuningRequest.flags & kFlagRecording)
     {
-        SetRingBuffer(new RingBuffer(rec->GetFileName(), true));
+        StorageGroup sgroup(rec->storagegroup, gContext->GetHostName());
+        QString filename = rec->GetFileName();
+        QString dirname = QFileInfo(filename).dirPath(true);
+        uint io_multiplier = sgroup.ioMultiplier(dirname);
+
+        SetRingBuffer(new RingBuffer(filename, true, true, 12,
+                                     io_multiplier));
         if (!ringBuffer->IsOpen())
         {
             VERBOSE(VB_IMPORTANT, LOC_ERR +
                     QString("RingBuffer '%1' not open...")
-                    .arg(rec->GetFileName()));
+                    .arg(filename));
             SetRingBuffer(NULL);
             ClearFlags(kFlagPendingActions);
             goto err_ret;
@@ -4303 +4310 @@
     MythEvent me(QString("QUERY_NEXT_LIVETV_DIR %1").arg(cardid));
     gContext->dispatch(me);
 
+    StorageGroup sgroup(prog->storagegroup, gContext->GetHostName());
+
     if (WaitForNextLiveTVDir())
     {
         QMutexLocker lock(&nextLiveTVDirLock);
         prog->pathname = nextLiveTVDir;
     }
     else
-    {
-        StorageGroup sgroup("LiveTV", gContext->GetHostName());
         prog->pathname = sgroup.FindNextDirMostFree();
-    }
 
     StartedRecording(prog);
 
-    *rb = new RingBuffer(prog->GetFileName(), true);
+    QString filename = prog->GetFileName();
+    QString dirname = QFileInfo(filename).dirPath(true);
+
+    uint io_multiplier = sgroup.ioMultiplier(dirname);
+
+    *rb = new RingBuffer(filename, true, true, 12, io_multiplier);
     if (!(*rb)->IsOpen())
     {
         VERBOSE(VB_IMPORTANT, LOC_ERR +
                 QString("RingBuffer '%1' not open...")
-                .arg(prog->GetFileName()));
+                .arg(filename));
 
         delete *rb;
         delete prog;

libs/libmythtv/ThreadedFileWriter.h

@@ -7 +7 @@
 #include <qwaitcondition.h>
 #include <qstring.h>
 
+#include "storagegroup.h"
+
 class ThreadedFileWriter
 {
   public:
-    ThreadedFileWriter(const QString &fname, int flags, mode_t mode);
+    ThreadedFileWriter(const QString &fname, int flags, mode_t mode,
+                       uint io_mult = StorageGroup::DEF_IO_MULTIPLIER);
     ~ThreadedFileWriter();
 
     bool Open(void);
@@ -40 +43 @@
     int             flags;
     mode_t          mode;
     int             fd;
+    uint            io_multiplier;
 
     // state
     bool            no_writes;
@@ -48 +52 @@
     bool            in_dtor;
     bool            ignore_writes;
     long long       tfw_min_write_size;
+    long long       tfw_max_write_size;
 
     // buffer position state
     uint            rpos;    ///< points to end of data written to disk

libs/libmyth/storagegroup.cpp

@@ -19 +19 @@
     << "DB Backups"
     ;
 
+DirectoryConfig::DirectoryConfig(QString &dir, uint &io_multiplier)
+{
+    ConfigurationGroup* group = new VerticalConfigurationGroup(false, false);
+
+    if (dir.isEmpty())
+        group->setLabel(QObject::tr("Add new directory"));
+    else
+        group->setLabel(QObject::tr("Settings for directory: ") + dir);
+
+    group->addChild(new DirectoryPathSetting(dir));
+    group->addChild(new ioMultiplierSetting(io_multiplier));
+
+    addChild(group);
+}
+
+
 /****************************************************************************/
 
 /** \brief StorageGroup constructor.
@@ -314 +330 @@
     return QDeepCopy<QStringList>(groups);
 }
 
+uint StorageGroup::ioMultiplier(QString dirname)
+{
+    if (dirname.isEmpty() || m_groupname.isEmpty() || m_hostname.isEmpty())
+        return StorageGroup::DEF_IO_MULTIPLIER;
+
+    if (dirname.right(1) != "/")
+        dirname.append("/");
+
+    uint io_multiplier;
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    query.prepare("SELECT io_multiplier FROM storagegroup "
+                  "WHERE groupname = :GROUP "
+                  "AND hostname = :HOSTNAME "
+                  "AND dirname = :DIRNAME;");
+    query.bindValue(":GROUP", m_groupname);
+    query.bindValue(":HOSTNAME", m_hostname);
+    query.bindValue(":DIRNAME", dirname);
+
+    if (!query.exec() || !query.isActive())
+        MythContext::DBError("StorageGroup::ioMultiplier()", query);
+    else if (!query.next())
+    {
+        VERBOSE(VB_FILE, LOC + QString("Unable to find storage group %1 "
+                                       "for hostname %2, using default "
+                                       "io_multiplier of %3.")
+                                     .arg(m_groupname).arg(m_hostname)
+                                     .arg(StorageGroup::DEF_IO_MULTIPLIER));
+
+        return StorageGroup::DEF_IO_MULTIPLIER;
+    }
+
+    io_multiplier = query.value(0).toUInt();
+
+    if (!io_multiplier)
+        io_multiplier = StorageGroup::DEF_IO_MULTIPLIER;
+
+    return io_multiplier;
+}
+
 /****************************************************************************/
 typedef enum {
     SGPopup_OK = 0,
@@ -385 +441 @@
 
     if (name == "__CREATE_NEW_STORAGE_DIRECTORY__")
     {
+        uint m_io_multiplier = StorageGroup::DEF_IO_MULTIPLIER;
         name = "";
-        SGPopupResult result = StorageGroupPopup::showPopup(
-            gContext->GetMainWindow(), 
-            tr("Add Storage Group Directory"),
-            tr("Enter directory name or press SELECT to enter text via the "
-               "On Screen Keyboard"), name);
-        if (result == SGPopup_CANCEL)
+
+        DirectoryConfig config(name, m_io_multiplier);
+
+        if (config.exec() != MythDialog::Accepted)
             return;
 
         if (name.right(1) != "/")
             name.append("/");
 
         MSqlQuery query(MSqlQuery::InitCon());
-        query.prepare("INSERT INTO storagegroup (groupname, hostname, dirname) "
-                      "VALUES (:NAME, :HOSTNAME, :DIRNAME);");
+        query.prepare("INSERT INTO storagegroup (groupname, hostname, "
+                      "dirname, io_multiplier) "
+                      "VALUES (:NAME, :HOSTNAME, :DIRNAME, :IO_MULTIPLIER);");
         query.bindValue(":NAME", m_group.utf8());
         query.bindValue(":DIRNAME", name.utf8());
+        query.bindValue(":IO_MULTIPLIER", m_io_multiplier);
         query.bindValue(":HOSTNAME", gContext->GetHostName());
         if (!query.exec())
             MythContext::DBError("StorageGroupEditor::open", query);
         else
             lastValue = name;
     } else {
-        SGPopupResult result = StorageGroupPopup::showPopup(
-            gContext->GetMainWindow(), 
-            tr("Edit Storage Group Directory"),
-            tr("Enter directory name or press SELECT to enter text via the "
-               "On Screen Keyboard"), name);
-        if (result == SGPopup_CANCEL)
+        uint m_io_multiplier = multiplier_map[name];
+
+        if (!m_io_multiplier)
+            m_io_multiplier = StorageGroup::DEF_IO_MULTIPLIER;
+
+        DirectoryConfig config(name, m_io_multiplier);
+
+        if (config.exec() != MythDialog::Accepted)
             return;
 
         if (name.right(1) != "/")
@@ -431 +490 @@
         if (!query.exec())
             MythContext::DBError("StorageGroupEditor::open", query);
 
-        query.prepare("INSERT INTO storagegroup (groupname, hostname, dirname) "
-                      "VALUES (:NAME, :HOSTNAME, :DIRNAME);");
+        query.prepare("INSERT INTO storagegroup (groupname, hostname, "
+                      "dirname, io_multiplier) "
+                      "VALUES (:NAME, :HOSTNAME, :DIRNAME, :IO_MULTIPLIER);");
         query.bindValue(":NAME", m_group.utf8());
         query.bindValue(":DIRNAME", name.utf8());
+        query.bindValue(":IO_MULTIPLIER", m_io_multiplier);
         query.bindValue(":HOSTNAME", gContext->GetHostName());
         if (!query.exec())
             MythContext::DBError("StorageGroupEditor::open", query);
@@ -482 +543 @@
 
 void StorageGroupEditor::load(void) {
     listbox->clearSelections();
+    multiplier_map.clear();
 
     MSqlQuery query(MSqlQuery::InitCon());
-    query.prepare("SELECT dirname, id FROM storagegroup "
+    query.prepare("SELECT dirname, io_multiplier, id FROM storagegroup "
                   "WHERE groupname = :NAME AND hostname = :HOSTNAME "
                   "ORDER BY id;");
     query.bindValue(":NAME", m_group.utf8());
@@ -502 +564 @@
                 first = false;
             }
             listbox->addSelection(query.value(0).toString());
+            multiplier_map[query.value(0).toString()] = query.value(1).toUInt();
         }
     }
 
@@ -528 +591 @@
     return dialog;
 }
 
+
 /****************************************************************************/
 
 StorageGroupListEditor::StorageGroupListEditor(void) :

libs/libmyth/storagegroup.h

@@ -3 +3 @@
 
 #include <qstringlist.h>
 #include <qdeepcopy.h>
+#include <qmap.h>
 
 #include "libmyth/settings.h"
 #include "libmyth/mythwidgets.h"
 
+class DirectoryPathSetting : public LineEditSetting, public Storage
+{
+  public:
+    DirectoryPathSetting(QString &dir) :
+        LineEditSetting(this), m_dir(dir)
+    {
+        setLabel(QObject::tr("Directory Path"));
+        QString help = QObject::tr("Specify the path to add to this "
+                                   "storage group.");
+        setHelpText(help);
+    }
+
+    virtual void load(void)
+    {
+        setValue(m_dir);
+    }
+
+    virtual void save(void)
+    {
+        m_dir = getValue();
+    }
+
+  private:
+    QString &m_dir;
+};
+
+class ioMultiplierSetting : public SpinBoxSetting, public Storage
+{
+  public:
+    ioMultiplierSetting(uint &io_multiplier) :
+        SpinBoxSetting(this, 2, 5, 1), m_io_multiplier(io_multiplier)
+    {
+        setLabel(QObject::tr("Read/Write Buffer"));
+        QString help = QObject::tr("Specify the amount of buffering to "
+                                   "use for this directory. Default 5. "
+                                   "Use caution when adjusting this.");
+        setHelpText(help);
+    }
+
+    virtual void load(void)
+    {
+        setValue(m_io_multiplier);
+    }
+
+    virtual void save(void)
+    {
+        m_io_multiplier = getValue().toUInt();
+    }
+
+  private:
+    uint &m_io_multiplier;
+};
+
+class DirectoryConfig : public QObject, public ConfigurationWizard
+{
+  public:
+    DirectoryConfig(QString &dir, uint &io_multiplier);
+};
+
+
 class MPUBLIC StorageGroup: public ConfigurationWizard
 {
   public:
@@ -33 +94 @@
 
     static QStringList getRecordingsGroups(void);
 
+    uint ioMultiplier(QString dirname);
+
+    static const uint DEF_IO_MULTIPLIER = 5;
+
   private:
     QString      m_groupname;
     QString      m_hostname;
     QStringList  m_dirlist;
+    uint         io_multiplier;
 };
 
 class MPUBLIC StorageGroupEditor :
@@ -57 +123 @@
     void doDelete(void);
 
   protected:
+    void editDirectory(QString &dir, uint &io_multiplier);
+
     QString         m_group;
     ListBoxSetting *listbox;
     QString         lastValue;
+    QMap<QString, uint> multiplier_map;
 };
 
 class MPUBLIC StorageGroupListEditor :

programs/mythbackend/mainserver.h

@@ -142 +142 @@
     FileTransfer *getFileTransferByID(int id);
     FileTransfer *getFileTransferBySock(MythSocket *socket);
 
-    QString LocalFilePath(QUrl &url);
+    QString LocalFilePath(QUrl &url, uint &io_multiplier);
 
     static void *SpawnDeleteThread(void *param);
     void DoDeleteThread(const DeleteStruct *ds);

programs/mythbackend/filetransfer.cpp

@@ -14 +14 @@
 #include "libmyth/mythsocket.h"
 
 FileTransfer::FileTransfer(QString &filename, MythSocket *remote,
-                           bool usereadahead, int retries) :
+                           bool usereadahead, int retries, uint io_mult) :
     readthreadlive(true),
-    rbuffer(new RingBuffer(filename, false, usereadahead, retries)),
+    rbuffer(new RingBuffer(filename, false, usereadahead, retries, io_mult)),
     sock(remote), ateof(false), refCount(0)
 {
 }
 
-FileTransfer::FileTransfer(QString &filename, MythSocket *remote)
+FileTransfer::FileTransfer(QString &filename, MythSocket *remote,
+                           uint io_mult)
 {
-    rbuffer = new RingBuffer(filename, false);
+    rbuffer = new RingBuffer(filename, false, true, 12, io_mult);
     sock = remote;
     readthreadlive = true;
     ateof = false;

programs/mythbackend/mainserver.cpp

@@ -1007 +1007 @@
         VERBOSE(VB_IMPORTANT, QString("adding: %1 as a remote file transfer")
                                .arg(commands[2]));
         QUrl qurl = slist[1];
-        QString filename = LocalFilePath(qurl);
+        uint io_multiplier = 0;
 
+        QString filename = LocalFilePath(qurl, io_multiplier);
+
         FileTransfer *ft = NULL;
         bool usereadahead = true;
         int retries = -1;
@@ -1019 +1021 @@
         }
 
         if (retries >= 0)
-            ft = new FileTransfer(filename, socket, usereadahead, retries);
+            ft = new FileTransfer(filename, socket, usereadahead, retries,
+                                  io_multiplier);
         else
-            ft = new FileTransfer(filename, socket);
+            ft = new FileTransfer(filename, socket, io_multiplier);
         
         sockListLock.lock();
         fileTransferList.push_back(ft);
@@ -4233 +4236 @@
     delete chain;
 }
 
-QString MainServer::LocalFilePath(QUrl &url)
+QString MainServer::LocalFilePath(QUrl &url, uint &io_multiplier)
 {
     QString lpath = url.path();
 
+    io_multiplier = StorageGroup::DEF_IO_MULTIPLIER;
+
     if (lpath.section('/', -2, -2) == "channels")
     {
         // This must be an icon request. Check channel.icon to be safe.
@@ -4270 +4275 @@
         ProgramInfo *pginfo = ProgramInfo::GetProgramFromBasename(fpath);
         if (pginfo)
         {
+            StorageGroup sgroup(pginfo->storagegroup, gContext->GetHostName());
+            QString dirname =
+              sgroup.FindRecordingDir(pginfo->GetRecordBasename());
+            io_multiplier = sgroup.ioMultiplier(dirname);
             QString pburl = GetPlaybackURL(pginfo);
             if (pburl.left(1) == "/")
             {
@@ -4292 +4301 @@
             lpath = QFileInfo(lpath).fileName();
             StorageGroup sgroup;
             QString tmpFile = sgroup.FindRecordingFile(lpath);
+            QString tmpPath = QFileInfo(tmpFile).dirPath(true);
+            io_multiplier = sgroup.ioMultiplier(tmpPath);
             if (!tmpFile.isEmpty())
             {
                 lpath = tmpFile;

programs/mythbackend/filetransfer.h

@@ -12 +12 @@
 #include <qstring.h>
 #include <qmutex.h>
 
+#include "storagegroup.h"
+
 class RingBuffer;
 class MythSocket;
 
@@ -20 +22 @@
     friend class QObject; // quiet OSX gcc warning
 
   public:
-    FileTransfer(QString &filename, MythSocket *remote);
     FileTransfer(QString &filename, MythSocket *remote,
-                 bool usereadahead, int retries);
+                 uint io_mult = StorageGroup::DEF_IO_MULTIPLIER);
+    FileTransfer(QString &filename, MythSocket *remote, bool usereadahead,
+                 int retries, uint io_mult = StorageGroup::DEF_IO_MULTIPLIER);
 
     MythSocket *getSocket() { return sock; }