Attachment 209299 Details for Bug 381917

[patch] lazy-zypp-fate302119.patch

lazy-zypp-fate302119.patch (text/plain), 10.63 KB, created by Martin Vidner on 2008-04-21 13:25:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Vidner

Created: 2008-04-21 13:25:35 UTC

Size: 10.63 KB

patch

obsolete

>Index: src/Y2PkgFunction.h
>===================================================================
>--- src/Y2PkgFunction.h	(revision 46901)
>+++ src/Y2PkgFunction.h	(working copy)
>@@ -6,10 +6,12 @@
> 
> #include <y2/Y2Function.h>
> 
>+class PkgModuleFunctions;
> class Y2PkgFunction: public Y2Function
> {
>     unsigned int m_position;
>-    PkgFunctions* m_instance;
>+    // originally PkgFunctions* m_instance, but changed to delay loading zypp
>+    PkgModuleFunctions* m_ns_instance;
>     YCPValue m_param1;
>     YCPValue m_param2;
>     YCPValue m_param3;
>@@ -18,7 +20,7 @@
>     string m_name;
> public:
> 
>-    Y2PkgFunction (string name, PkgFunctions* instance, unsigned int pos);
>+    Y2PkgFunction (string name, PkgModuleFunctions* instance, unsigned int pos);
>     bool attachParameter (const YCPValue& arg, const int position);
>     constTypePtr wantedParameterType () const;
>     bool appendParameter (const YCPValue& arg);
>Index: src/PkgFunctions.cc
>===================================================================
>--- src/PkgFunctions.cc	(revision 46901)
>+++ src/PkgFunctions.cc	(working copy)
>@@ -37,6 +37,8 @@
> #include <ycp/YCPVoid.h>
> 
> #include <zypp/ZYppFactory.h>
>+#include <zypp/base/Logger.h>
>+#include <zypp/base/LogControl.h>
> 
> // sleep
> #include <unistd.h>
>@@ -49,6 +51,45 @@
> 
> const zypp::ResStatus::TransactByValue PkgFunctions::whoWantsIt = zypp::ResStatus::APPL_HIGH;
> 
>+struct YaSTZyppLogger : public zypp::base::LogControl::LineWriter
>+{
>+  virtual void writeOut( const std::string & formated_r )
>+  {
>+    // don't log empty (debug) messages  
>+    if (!formated_r.empty())
>+    {
>+	y2lograw((formated_r+"\n").c_str());
>+    }
>+  }
>+};
>+
>+struct YaSTZyppFormatter : public zypp::base::LogControl::LineFormater
>+{
>+    virtual std::string format( const std::string & group_r,
>+	    zypp::base::logger::LogLevel    level_r,
>+	    const char *        file_r,
>+	    const char *        func_r,
>+	    int                 line_r,
>+	    const std::string & message_r )
>+    {
>+	if (get_log_debug() || level_r > zypp::base::logger::E_DBG)
>+	{
>+	    // call the default implementation
>+	    return zypp::base::LogControl::LineFormater::format(group_r, level_r, file_r, func_r, line_r, message_r);
>+	}
>+
>+	// return empty string (ignore debug messages when debug is tuned off)
>+	return std::string();
>+    }
>+
>+};
>+
>+extern "C" {
>+PkgFunctions * createPkgFunctions () {
>+    return new PkgFunctions ();
>+}
>+}
>+
> /**
>  * Constructor.
>  */
>@@ -59,6 +100,12 @@
>     ,_callbackHandler( *new CallbackHandler(*this) )
>     ,target_log_set(false)
> {
>+    y2milestone("Redirecting ZYPP log to y2log");
>+    boost::shared_ptr<YaSTZyppLogger> myLogger( new YaSTZyppLogger );
>+    zypp::base::LogControl::instance().setLineWriter( myLogger );
>+    boost::shared_ptr<YaSTZyppFormatter> myFormatter( new YaSTZyppFormatter );
>+    zypp::base::LogControl::instance().setLineFormater( myFormatter );
>+
>     const char *domain = "pkg-bindings";
>     bindtextdomain( domain, LOCALEDIR );
>     bind_textdomain_codeset( domain, "utf8" );
>Index: src/PkgModuleFunctions.cc
>===================================================================
>--- src/PkgModuleFunctions.cc	(revision 46901)
>+++ src/PkgModuleFunctions.cc	(working copy)
>@@ -27,6 +27,7 @@
> #include <y2/Y2Function.h>
> #include <ycp/YCPVoid.h>
> #include "log.h"
>+#include <dlfcn.h>
> 
> /////////////////////////////////////////////////////////////////////////////
> 
>@@ -36,6 +37,7 @@
>  */
> PkgModuleFunctions::PkgModuleFunctions ()
>     : Y2Namespace()
>+    , pkg_functions (NULL)
> {
>     registerFunctions ();
> }
>@@ -45,6 +47,7 @@
>  */
> PkgModuleFunctions::~PkgModuleFunctions()
> {
>+    delete pkg_functions;
> }
> 
> Y2Function* PkgModuleFunctions::createFunctionCall (const string name, constFunctionTypePtr type)
>@@ -57,9 +60,33 @@
> 	return NULL;
>     }
> 
>-    return new Y2PkgFunction (name, &pkg_functions, it - _registered_functions.begin ());
>+    return new Y2PkgFunction (name, this, it - _registered_functions.begin ());
> }
> 
>+PkgFunctions* PkgModuleFunctions::get_impl ()
>+{
>+    if (pkg_functions == NULL) {
>+	y2milestone ("Now creating PkgFunctions");
>+	// Load the zypp dependencies lazily (fate#302119).
>+	// No version suffix. we take whatever there is,
>+	// the interface changes too fast
>+	void * pkg_handle = dlopen (PLUGINDIR "/libpy2Pkgzypp.so",
>+				RTLD_LAZY | RTLD_GLOBAL);
>+	if (pkg_handle) {
>+	    typedef PkgFunctions * (* cPF_t)();
>+	    cPF_t cPF = (cPF_t) dlsym (pkg_handle, "createPkgFunctions");
>+	    if (cPF) {
>+		pkg_functions = (*cPF)();
>+	    }
>+	}
>+	if (pkg_functions == NULL) {
>+	    y2error ("Could not load zypp implementation of Pkg: %s", dlerror ());
>+	    throw std::runtime_error("Pkg zypp failed");
>+	}
>+    }
>+    return pkg_functions;
>+}
>+
> YCPValue PkgModuleFunctions::evaluate(bool cse)
> {
>     if (cse) return YCPNull ();
>Index: src/PkgModule.cc
>===================================================================
>--- src/PkgModule.cc	(revision 46901)
>+++ src/PkgModule.cc	(working copy)
>@@ -23,56 +23,12 @@
> #include <PkgModule.h>
> #include "log.h"
> 
>-#include <zypp/base/Logger.h>
>-#include <zypp/base/LogControl.h>
>-
> PkgModule* PkgModule::current_pkg = NULL;
> 
>-struct YaSTZyppLogger : public zypp::base::LogControl::LineWriter
>-{
>-  virtual void writeOut( const std::string & formated_r )
>-  {
>-    // don't log empty (debug) messages  
>-    if (!formated_r.empty())
>-    {
>-	y2lograw((formated_r+"\n").c_str());
>-    }
>-  }
>-};
>-
>-struct YaSTZyppFormatter : public zypp::base::LogControl::LineFormater
>-{
>-    virtual std::string format( const std::string & group_r,
>-	    zypp::base::logger::LogLevel    level_r,
>-	    const char *        file_r,
>-	    const char *        func_r,
>-	    int                 line_r,
>-	    const std::string & message_r )
>-    {
>-	if (get_log_debug() || level_r > zypp::base::logger::E_DBG)
>-	{
>-	    // call the default implementation
>-	    return zypp::base::LogControl::LineFormater::format(group_r, level_r, file_r, func_r, line_r, message_r);
>-	}
>-
>-	// return empty string (ignore debug messages when debug is tuned off)
>-	return std::string();
>-    }
>-
>-};
>-
> PkgModule* PkgModule::instance ()
> {
>     if (current_pkg == NULL)
>     {
>-	y2milestone("Redirecting ZYPP log to y2log");
>-
>-        boost::shared_ptr<YaSTZyppLogger> myLogger( new YaSTZyppLogger );
>-        zypp::base::LogControl::instance().setLineWriter( myLogger );
>-
>-        boost::shared_ptr<YaSTZyppFormatter> myFormatter( new YaSTZyppFormatter );
>-        zypp::base::LogControl::instance().setLineFormater( myFormatter );
>-
> 	current_pkg = new PkgModule ();
>     }
>     
>Index: src/Y2PkgFunction.cc
>===================================================================
>--- src/Y2PkgFunction.cc	(revision 46901)
>+++ src/Y2PkgFunction.cc	(working copy)
>@@ -22,6 +22,7 @@
> 
> 
> #include "Y2PkgFunction.h"
>+#include "PkgModuleFunctions.h"
> 
> #include <ycp/YCPBoolean.h>
> #include <ycp/YCPValue.h>
>@@ -35,9 +36,9 @@
> 
> #include <ycp/y2log.h>
> 
>-    Y2PkgFunction::Y2PkgFunction (string name, PkgFunctions* instance, unsigned int pos) :
>+    Y2PkgFunction::Y2PkgFunction (string name, PkgModuleFunctions* instance, unsigned int pos) :
> 	m_position (pos)
>-	, m_instance (instance)
>+	, m_ns_instance (instance)
> 	, m_param1 ( YCPNull () )
> 	, m_param2 ( YCPNull () )
> 	, m_param3 ( YCPNull () )
>@@ -108,6 +109,8 @@
> 
> 	try
> 	{
>+	    PkgFunctions* m_instance = m_ns_instance->get_impl ();
>+
> 	    switch (m_position) {
> #include "PkgBuiltinCalls.h"
> 	    }
>Index: src/PkgFunctions.h
>===================================================================
>--- src/PkgFunctions.h	(revision 46901)
>+++ src/PkgFunctions.h	(working copy)
>@@ -750,4 +750,9 @@
> 	RepoId logFindAlias(const std::string &alias) const;
> 
> };
>+
>+extern "C" {
>+PkgFunctions * createPkgFunctions ();
>+}
>+
> #endif // PkgFunctions_h
>Index: src/PkgModuleFunctions.h
>===================================================================
>--- src/PkgModuleFunctions.h	(revision 46901)
>+++ src/PkgModuleFunctions.h	(working copy)
>@@ -25,8 +25,8 @@
> 
> #include <string>
> #include <y2/Y2Namespace.h>
>-#include "PkgFunctions.h"
> 
>+class PkgFunctions;
> /**
>  * A simple class for package management access
>  */
>@@ -62,11 +62,15 @@
> 
> 	virtual Y2Function* createFunctionCall (const std::string name, constFunctionTypePtr type);
> 
>+	// load the implementation on demand
>+	PkgFunctions* get_impl ();
>+
>     private:
> 
> 	void registerFunctions ();
> 
>-	PkgFunctions pkg_functions;
>+	PkgFunctions * pkg_functions;
>+
>         std::vector<std::string> _registered_functions;
> };
> #endif // PkgModuleFunctions_h
>Index: src/Makefile.am
>===================================================================
>--- src/Makefile.am	(revision 46901)
>+++ src/Makefile.am	(working copy)
>@@ -6,26 +6,28 @@
> AM_CXXFLAGS = -DY2LOG=\"Pkg\"			\
> 	-DSUSEVERSION=\"${SUSEVERSION}\"	\
> 	-DLOCALEDIR=\"${localedir}\"		\
>+	-DPLUGINDIR=\"${plugindir}\"		\
> 	-fno-inline				\
> 	-Woverloaded-virtual			\
> 	-DZYPP_BASE_LOGGER_LOGGROUP=\"Pkg\"
> 
>+# Pkg is a stub that dlopens Pkgzypp (and zypp) lazily
>+# at the last moment (fate#302119)
>+plugin_LTLIBRARIES = libpy2Pkg.la libpy2Pkgzypp.la
> 
>-# to look for the packagemanager in the prefix first (really first?)
>-AM_LDFLAGS = -L${libdir}
>+libpy2Pkg_la_SOURCES =				\
>+	PkgModule.cc PkgModule.h		\
>+	PkgModuleFunctions.h			\
>+	PkgModuleFunctions.cc			\
>+	Y2PkgFunction.cc Y2PkgFunction.h	\
>+	Y2PkgComponent.cc Y2PkgComponent.h	\
>+	Y2CCPkg.cc Y2CCPkg.h
> 
>-plugin_LTLIBRARIES = libpy2Pkg.la
>-
>-libpy2Pkg_la_SOURCES =				\
>+libpy2Pkgzypp_la_SOURCES =			\
> 	PkgError.cc PkgError.h			\
>-	Y2PkgComponent.cc Y2PkgComponent.h	\
>-	Y2CCPkg.cc Y2CCPkg.h			\
> 	ycpTools.cc ycpTools.h			\
>-	PkgModule.cc PkgModule.h		\
> 	PkgProgress.cc PkgProgress.h		\
> 	ProvideProcess.cc ProvideProcess.h	\
>-	PkgModuleFunctions.h			\
>-	PkgModuleFunctions.cc			\
> 	PkgFunctions.h PkgFunctions.cc		\
> 	Package.cc				\
> 	Patch.cc				\
>@@ -49,15 +51,22 @@
> 	Callbacks.h				\
> 	Callbacks.YCP.h Callbacks.YCP.cc	\
> 	Callbacks.cc Callbacks_Register.cc	\
>-	Y2PkgFunction.cc Y2PkgFunction.h	\
> 	YRepo.h YRepo.cc			\
> 	HelpTexts.h i18n.h log.h
> 
> 
> libpy2Pkg_la_LDFLAGS = -version-info 2:0
> libpy2Pkg_la_LIBADD = \
>+	-L${libdir}	\
> 	-lycp		\
> 	-ly2		\
>+	-ly2util
>+
>+libpy2Pkgzypp_la_LDFLAGS = -version-info 2:0
>+libpy2Pkgzypp_la_LIBADD = \
>+	-L${libdir}	\
>+	-lycp		\
>+	-ly2		\
> 	-ly2util	\
> 	${ZYPP_LIBS}
> 
>Index: yast2-pkg-bindings.spec.in
>===================================================================
>--- yast2-pkg-bindings.spec.in	(revision 46901)
>+++ yast2-pkg-bindings.spec.in	(working copy)
>@@ -20,11 +20,14 @@
> 
> @INSTALL@
> rm -rf %{buildroot}/@plugindir@/libpy2Pkg.la
>+rm -rf %{buildroot}/@plugindir@/libpy2Pkg.so
>+rm -rf %{buildroot}/@plugindir@/libpy2Pkgzypp.la
> 
> @CLEAN@
> 
> %files
> %defattr(-,root,root)
> @plugindir@/libpy2Pkg.so.*
>-@plugindir@/libpy2Pkg.so
>+@plugindir@/libpy2Pkgzypp.so
>+@plugindir@/libpy2Pkgzypp.so.*
> %doc @docdir@

Actions: View | Diff

Attachments on bug 381917: 209299 | 209300 | 209301