KDE Applications 18.12.0 Beta (last try; fix any other issue post acceptance)
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=90
This commit is contained in:
parent
aede14d6b0
commit
ccd53c785b
@ -1,60 +0,0 @@
|
|||||||
From 40d962d80b6f2e9d04428c5d1944834de1208fac Mon Sep 17 00:00:00 2001
|
|
||||||
From: Harald Sitter <sitter@kde.org>
|
|
||||||
Date: Wed, 12 Sep 2018 16:58:04 +0200
|
|
||||||
Subject: [PATCH] [sftp] bump pending request count from 1 to 128
|
|
||||||
|
|
||||||
Summary:
|
|
||||||
with the previous value we basically did sync reading which means that
|
|
||||||
network and cyrptographic overhead head a huge impact on throughput.
|
|
||||||
meanwhile the perfect way to use asyncness is to schedule a whole bunch of
|
|
||||||
requests before starting to read.
|
|
||||||
previously this was documented as auto-adjusting, which it never was,
|
|
||||||
there's also little to be gained from adjusting this value on the fly.
|
|
||||||
more requests in most scenarios will simply mean a larger RAM footprint as
|
|
||||||
more data potentially sits in libssh waiting to be read. with 128 requests
|
|
||||||
that'd be ~8mb (assuming the file transferred is that large)
|
|
||||||
|
|
||||||
this improves read performance with libssh 0.8 by up to 20 times for large
|
|
||||||
files. read performance with libssh 0.6 is 2 to 3 times better.
|
|
||||||
the faster the connection the higher the gain of course.
|
|
||||||
|
|
||||||
128 gives somewhat competitive performance results compared to openssh's
|
|
||||||
ssh implementations while not having too large a footprint.
|
|
||||||
|
|
||||||
in raw numbers: a local link read was averaging around 10mb/s on both
|
|
||||||
libssh versions. with 128 requests this goes up to 200. competitive is
|
|
||||||
between 200 and 300 it seems (obviously all specific to my system)
|
|
||||||
|
|
||||||
CHANGELOG: sftp file reading is now up to 20 times faster
|
|
||||||
|
|
||||||
Reviewers: broulik
|
|
||||||
|
|
||||||
Reviewed By: broulik
|
|
||||||
|
|
||||||
Differential Revision: https://phabricator.kde.org/D15452
|
|
||||||
---
|
|
||||||
sftp/kio_sftp.h | 7 ++++---
|
|
||||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/sftp/kio_sftp.h b/sftp/kio_sftp.h
|
|
||||||
index cc6b9e09..e5639970 100644
|
|
||||||
--- a/sftp/kio_sftp.h
|
|
||||||
+++ b/sftp/kio_sftp.h
|
|
||||||
@@ -141,10 +141,11 @@ private: // Private variables
|
|
||||||
* @param file the sftp_file object which should be transferred.
|
|
||||||
* @param sb the attributes of that sftp_file object.
|
|
||||||
* @param maxPendingRequests the maximum number of parallel requests to start with.
|
|
||||||
- * The number will be adjusted automatically depending
|
|
||||||
- * on the connection speed.
|
|
||||||
+ * The more are pending the higher the potential memory
|
|
||||||
+ * foot print, however if the connection allows it
|
|
||||||
+ * we'll get better throughput.
|
|
||||||
*/
|
|
||||||
- GetRequest(sftp_file file, sftp_attributes sb, ushort maxPendingRequests = 1);
|
|
||||||
+ GetRequest(sftp_file file, sftp_attributes sb, ushort maxPendingRequests = 128);
|
|
||||||
/**
|
|
||||||
* Removes all pending requests and closes the SFTP channel and attributes
|
|
||||||
* in order to avoid memory leaks.
|
|
||||||
--
|
|
||||||
2.18.0
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
|||||||
diff --git a/mtp/kio_mtp.cpp b/mtp/kio_mtp.cpp
|
|
||||||
index 8a9b26e..7003968 100644
|
|
||||||
--- a/mtp/kio_mtp.cpp
|
|
||||||
+++ b/mtp/kio_mtp.cpp
|
|
||||||
@@ -347,6 +347,14 @@ void MTPSlave::listDir(const QUrl &url)
|
|
||||||
entry.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
+ // We also need a writable UDSEntry for "."
|
|
||||||
+ KIO::UDSEntry entry;
|
|
||||||
+ entry.insert(KIO::UDSEntry::UDS_NAME, QStringLiteral("."));
|
|
||||||
+ entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
|
|
||||||
+ entry.insert(KIO::UDSEntry::UDS_SIZE, 0);
|
|
||||||
+ entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH);
|
|
||||||
+ listEntry(entry);
|
|
||||||
+
|
|
||||||
finished();
|
|
||||||
|
|
||||||
qCDebug(LOG_KIO_MTP) << "[SUCCESS] Files";
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:450d69b16a873da51190c9397b2b0ecb08bc0dcae0d2a07f7ab1d2efcd02c280
|
|
||||||
size 552044
|
|
3
kio-extras-18.11.80.tar.xz
Normal file
3
kio-extras-18.11.80.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:c0d7e7509382e071cb552f2a33a624e4f7f74c62044ec182d080aa78600808de
|
||||||
|
size 561580
|
@ -1,3 +1,24 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 20 06:22:25 UTC 2018 - Luca Beltrame <lbeltrame@kde.org>
|
||||||
|
|
||||||
|
- Run spec-cleaner
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 20 05:57:04 UTC 2018 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
- Update to 18.11.80
|
||||||
|
* New feature release
|
||||||
|
* For more details please see:
|
||||||
|
* https://www.kde.org/announcements/announce-applications-18.11.80.php
|
||||||
|
- Changes since 18.08.3:
|
||||||
|
* Too many changes to list here
|
||||||
|
- Dropped patches, now upstream:
|
||||||
|
* 0001-sftp-bump-pending-request-count-from-1-to-128.patch
|
||||||
|
- Dropped patches, superseded by upstream changes:
|
||||||
|
* fix-mtp-paste-with-KF5-5.25.diff
|
||||||
|
- Provide / obsolete kde-odf-thumbnail. now kio-extras ships with
|
||||||
|
its own ODF thumbnailer
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Nov 08 20:43:38 UTC 2018 - lbeltrame@kde.org
|
Thu Nov 08 20:43:38 UTC 2018 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package kio-extras5
|
# spec file for package kio-extras5
|
||||||
#
|
#
|
||||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -12,27 +12,23 @@
|
|||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
# published by the Open Source Initiative.
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%bcond_without lang
|
|
||||||
|
|
||||||
Name: kio-extras5
|
|
||||||
Version: 18.08.3
|
|
||||||
Release: 0
|
|
||||||
%define kf5_version 5.26.0
|
%define kf5_version 5.26.0
|
||||||
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
|
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
|
||||||
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
|
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
|
||||||
|
%bcond_without lang
|
||||||
|
Name: kio-extras5
|
||||||
|
Version: 18.11.80
|
||||||
|
Release: 0
|
||||||
Summary: Additional KIO slaves for KDE applications
|
Summary: Additional KIO slaves for KDE applications
|
||||||
License: GPL-2.0+
|
License: GPL-2.0-or-later
|
||||||
Group: System/GUI/KDE
|
Group: System/GUI/KDE
|
||||||
Url: http://www.kde.org
|
URL: http://www.kde.org
|
||||||
Source: kio-extras-%{version}.tar.xz
|
Source: kio-extras-%{version}.tar.xz
|
||||||
Source99: %{name}-rpmlintrc
|
Source99: %{name}-rpmlintrc
|
||||||
Patch0: fix-mtp-paste-with-KF5-5.25.diff
|
|
||||||
# PATCH-FEATURE-UPSTREAM
|
|
||||||
Patch1: 0001-sftp-bump-pending-request-count-from-1-to-128.patch
|
|
||||||
BuildRequires: OpenEXR-devel
|
BuildRequires: OpenEXR-devel
|
||||||
BuildRequires: flac-devel
|
BuildRequires: flac-devel
|
||||||
BuildRequires: gperf
|
BuildRequires: gperf
|
||||||
@ -69,13 +65,14 @@ BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0
|
|||||||
BuildRequires: pkgconfig(bzip2)
|
BuildRequires: pkgconfig(bzip2)
|
||||||
BuildRequires: pkgconfig(exiv2)
|
BuildRequires: pkgconfig(exiv2)
|
||||||
BuildRequires: pkgconfig(smbclient)
|
BuildRequires: pkgconfig(smbclient)
|
||||||
|
Recommends: %{name}-lang
|
||||||
Recommends: kimageformats
|
Recommends: kimageformats
|
||||||
# we want some imageformats in
|
# we want some imageformats in
|
||||||
Recommends: libqt5-qtimageformats
|
Recommends: libqt5-qtimageformats
|
||||||
#BuildRequires: update-desktop-files
|
|
||||||
Provides: kfileaudiopreview = 4.100.0
|
Provides: kfileaudiopreview = 4.100.0
|
||||||
Obsoletes: kfileaudiopreview < 4.100.0
|
Obsoletes: kfileaudiopreview < 4.100.0
|
||||||
Recommends: %{name}-lang
|
Provides: kde-odf-thumbnail = %{version}
|
||||||
|
Obsoletes: kde-odf-thumbnail < %{version}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Additional KIO-slaves for KDE applications.
|
Additional KIO-slaves for KDE applications.
|
||||||
@ -103,8 +100,6 @@ This is the development package for libkioarchive
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n kio-extras-%{version}
|
%setup -q -n kio-extras-%{version}
|
||||||
%autopatch -p1
|
|
||||||
|
|
||||||
sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
|
sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -114,8 +109,8 @@ sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
|
|||||||
%install
|
%install
|
||||||
%kf5_makeinstall -C build
|
%kf5_makeinstall -C build
|
||||||
%if %{with lang}
|
%if %{with lang}
|
||||||
%kf5_find_lang
|
%{kf5_find_lang}
|
||||||
%kf5_find_htmldocs
|
%{kf5_find_htmldocs}
|
||||||
%endif
|
%endif
|
||||||
# we don't need nor want devel symlink, and dbus interface -- kio-extras don't install any headers,
|
# we don't need nor want devel symlink, and dbus interface -- kio-extras don't install any headers,
|
||||||
# nor are meant for development
|
# nor are meant for development
|
||||||
@ -123,7 +118,6 @@ sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
|
|||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
%post -n libkioarchive5 -p /sbin/ldconfig
|
%post -n libkioarchive5 -p /sbin/ldconfig
|
||||||
%postun -n libkioarchive5 -p /sbin/ldconfig
|
%postun -n libkioarchive5 -p /sbin/ldconfig
|
||||||
|
|
||||||
@ -142,6 +136,7 @@ sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
|
|||||||
%{_kf5_sharedir}/mime/packages/kf5_network.xml
|
%{_kf5_sharedir}/mime/packages/kf5_network.xml
|
||||||
%{_kf5_sharedir}/remoteview/
|
%{_kf5_sharedir}/remoteview/
|
||||||
%{_kf5_sharedir}/solid/
|
%{_kf5_sharedir}/solid/
|
||||||
|
%{_kf5_debugdir}/kio-extras.categories
|
||||||
|
|
||||||
%files -n libkioarchive-devel
|
%files -n libkioarchive-devel
|
||||||
%{_kf5_includedir}/kio_archivebase.h
|
%{_kf5_includedir}/kio_archivebase.h
|
||||||
|
Loading…
Reference in New Issue
Block a user