[zypp-commit] r8088 - in /trunk/libzypp: devel/devel.ma/NewPool.cc package/libzypp.changes zypp/PathInfo.cc zypp/PathInfo.h zypp/ZYppFactory.cc

Author: mlandres Date: Mon Dec 10 12:49:03 2007 New Revision: 8088 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8088&view=rev Log: Log more details about zypp lock owner. Modified: trunk/libzypp/devel/devel.ma/NewPool.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/PathInfo.cc trunk/libzypp/zypp/PathInfo.h trunk/libzypp/zypp/ZYppFactory.cc Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.cc?rev=8088&r1=8087&r2=8088&view=diff ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Mon Dec 10 12:49:03 2007 @@ -476,6 +476,7 @@ USR << "pool: " << pool << endl; pool.satSync(); + waitForInput(); //std::for_each( pool.begin(), pool.end(), Xprint() ); Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=8088&r1=8087&r2=8088&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Dec 10 12:49:03 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Dec 10 12:46:26 CET 2007 - ma@suse.de + +- Log more details about zypp lock owner. (#294094) +- revision 8088 + +------------------------------------------------------------------- Fri Dec 7 15:47:53 CET 2007 - ma@suse.de - Remove runtime dependency for libboost_filesystem (#345773) Modified: trunk/libzypp/zypp/PathInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PathInfo.cc?rev=8088&r1=8087&r2=8088&view=diff ============================================================================== --- trunk/libzypp/zypp/PathInfo.cc (original) +++ trunk/libzypp/zypp/PathInfo.cc Mon Dec 10 12:49:03 2007 @@ -735,6 +735,27 @@ /////////////////////////////////////////////////////////////////// // + // METHOD NAME : readlink + // METHOD TYPE : int + // + int readlink( const Pathname & symlink_r, Pathname & target_r ) + { + static const ssize_t bufsiz = 2047; + static char buf[bufsiz+1]; + ssize_t ret = ::readlink( symlink_r.c_str(), buf, bufsiz ); + if ( ret == -1 ) + { + target_r = Pathname(); + MIL << "readlink " << symlink_r; + return _Log_Result( errno ); + } + buf[ret] = '\0'; + target_r = buf; + return 0; + } + + /////////////////////////////////////////////////////////////////// + // // METHOD NAME : copy_file2dir // METHOD TYPE : int // Modified: trunk/libzypp/zypp/PathInfo.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PathInfo.h?rev=8088&r1=8087&r2=8088&view=diff ============================================================================== --- trunk/libzypp/zypp/PathInfo.h (original) +++ trunk/libzypp/zypp/PathInfo.h Mon Dec 10 12:49:03 2007 @@ -567,6 +567,21 @@ int hardlink( const Pathname & oldpath, const Pathname & newpath ); /** + * Like '::readlink'. Return the contents of the symbolic link + * \a symlink_r via \a target_r. + * + * @return 0 on success, errno on failure. + */ + int readlink( const Pathname & symlink_r, Pathname & target_r ); + /** \overload Return an empty Pathname on error. */ + inline Pathname readlink( const Pathname & symlink_r ) + { + Pathname target; + readlink( symlink_r, target ); + return target; + } + + /** * Like 'cp file dest'. Copy file to dest dir. * * @return 0 on success, EINVAL if file is not a file, ENOTDIR if dest Modified: trunk/libzypp/zypp/ZYppFactory.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYppFactory.cc?rev=8088&r1=8087&r2=8088&view=diff ============================================================================== --- trunk/libzypp/zypp/ZYppFactory.cc (original) +++ trunk/libzypp/zypp/ZYppFactory.cc Mon Dec 10 12:49:03 2007 @@ -9,16 +9,16 @@ /** \file zypp/ZYppFactory.cc * */ - +extern "C" +{ #include -#include <cstdio> -#include -#include <fstream> +} #include <iostream> -#include <sstream> +#include <fstream> #include "zypp/base/Logger.h" #include "zypp/base/Gettext.h" +#include "zypp/base/IOStream.h" #include "zypp/PathInfo.h" #include "zypp/ZYppFactory.h" @@ -28,7 +28,6 @@ #define ZYPP_LOCK_FILE "/var/run/zypp.pid" using std::endl; -using namespace std; /////////////////////////////////////////////////////////////////// namespace zypp @@ -163,14 +162,29 @@ closeLockFile(); } - bool isProcessRunning(pid_t pid) + bool isProcessRunning(pid_t pid_r) { - // it is another program, not me, see if it is still running - stringstream ss; - ss << "/proc/" << pid << "/status"; - Pathname procfile = Pathname(ss.str()); - MIL << "Checking " << procfile << " to determine if pid is running: " << pid << std::endl; - bool still_running = PathInfo(procfile).isExist(); + // it is another program, not me, see if it is still running + Pathname procdir( "/proc"/str::numstring(pid_r) ); + + PathInfo status( procdir/"status" ); + MIL << "Checking " << status << endl; + bool still_running = status.isExist(); + + if ( still_running ) + { + Pathname p( procdir/"exe" ); + MIL << p << " -> " << filesystem::readlink( p ) << endl; + + p = procdir/"cmdline"; + MIL << p << ": "; + std::ifstream infile( p.c_str() ); + for( iostr::EachLine in( infile ); in; in.next() ) + { + MIL << *in << endl; + } + } + return still_running; } @@ -337,9 +351,9 @@ /*--------------------------------------------------*/ if ( globalLock.zyppLocked() ) { - string t = str::form(N_("System management is locked by the application with pid %d. " - "Please close this application before trying again."), - globalLock.locker_pid()); + std::string t = str::form(N_("System management is locked by the application with pid %d. " + "Please close this application before trying again."), + globalLock.locker_pid()); ZYPP_THROW(ZYppFactoryException(t, globalLock.locker_pid())); } else -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org