Review Request 116934: Use KPluginLoader to find kioslaves
Alex Merry
alex.merry at kde.org
Thu Mar 20 20:34:34 UTC 2014
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/116934/
-----------------------------------------------------------
(Updated March 20, 2014, 8:34 p.m.)
Review request for KDE Frameworks.
Changes
-------
src/core/slave.cpp also does the same lookup
Repository: kio
Description
-------
Use KPluginLoader to find kioslaves
KIO slaves are typically installed in PLUGIN_INSTALL_DIR, rather than
QT_PLUGIN_INSTALL_DIR, so we should use KPluginLoader instead of
QPluginLoader to locate them.
Diffs (updated)
-----
src/core/slave.cpp ee84066f96675caaf1fa5ba612c8242eac160c4a
src/kioslave/CMakeLists.txt 64bf7e0f36a1a407dd162e2c0461dedb2f57a13e
src/kioslave/kioslave.cpp 50413d04be29361638ba581383354d79881e844e
Diff: https://git.reviewboard.kde.org/r/116934/diff/
Testing (updated)
-------
In combination with https://git.reviewboard.kde.org/r/116935/
Ran
KDE_SLAVE_VALGRIND=file kdeinit5
and use the kioslavetest app to copy a file; the copy was successful, and the terminal running kdeinit5 output
kdeinit5: preparing to launch '/usr/bin/valgrind'
==20134== Memcheck, a memory error detector
==20134== Copyright (C) 2002-2013, and GNU GPL'd, by Julian Seward et al.
==20134== Using Valgrind-3.9.0 and LibVEX; rerun with -h for copyright info
==20134== Command: /home/kf5-devel/kf5/lib64/kde5/libexec/kioslave kio_file file local:/tmp/runtime-kf5-devel/klauncherJ19850.slave-socket local:/tmp/runtime-kf5-devel/kioslavetestJ20122.slave-socket
==20134==
(20134)/(default) [31m[34mmain[0m: trying to load "kio_file" from "/home/kf5-devel/kf5/lib64/plugins/kf5/kio_file.so"
==20134==
==20134== HEAP SUMMARY:
==20134== in use at exit: 5,846 bytes in 42 blocks
==20134== total heap usage: 998 allocs, 956 frees, 672,987 bytes allocated
==20134==
==20134== LEAK SUMMARY:
==20134== definitely lost: 0 bytes in 0 blocks
==20134== indirectly lost: 0 bytes in 0 blocks
==20134== possibly lost: 0 bytes in 0 blocks
==20134== still reachable: 5,846 bytes in 42 blocks
==20134== suppressed: 0 bytes in 0 blocks
==20134== Rerun with --leak-check=full to see details of leaked memory
==20134==
==20134== For counts of detected and suppressed errors, rerun with: -v
==20134== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 1 from 1)
For the change to src/core/slave.cpp, ran
KDE_FORK_SLAVES=1 ./kioslavetest
and did the same test; uncommented the debug line in that method so it printed
kioslave , "/home/kf5-devel/kf5/lib64/plugins/kf5/kio_file.so" , "file" , "" , QUrl( "local:/tmp/runtime-kf5-devel/kioslavetestJ32621.slave-socket" )
and the copy was successful.
Thanks,
Alex Merry
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20140320/566b7ccf/attachment.html>
More information about the Kde-frameworks-devel
mailing list