[yast-commit] r57639 - in /trunk/core: ./ dbus/namespace_service/doc/ dbus/namespace_service/src/ dbus/namespace_service/testsuite/ dbus/namespace_service/testsuite/modules/ liby2dbus/src/

Author: lslezak Date: Thu Jun 18 15:25:17 2009 New Revision: 57639 URL: http://svn.opensuse.org/viewcvs/yast?rev=57639&view=rev Log: - merged changes from tmp branch - return exact type which math the Yast function in service introspection and in return values - added basic testsuite Added: trunk/core/dbus/namespace_service/testsuite/modules/ (with props) trunk/core/dbus/namespace_service/testsuite/modules/Makefile.am trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp trunk/core/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any.test trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any2.test trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.List.test trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.ListMapStringAny.test trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Void.test Modified: trunk/core/ (props changed) trunk/core/dbus/namespace_service/doc/org.opensuse.yast.modules.yapi.samba.policy (props changed) trunk/core/dbus/namespace_service/src/DBusModulesServer.cc trunk/core/dbus/namespace_service/testsuite/ (props changed) trunk/core/dbus/namespace_service/testsuite/Makefile.am trunk/core/dbus/namespace_service/testsuite/t1 trunk/core/liby2dbus/src/DBusMsg.cc trunk/core/liby2dbus/src/DBusMsg.h trunk/core/liby2dbus/src/DBusServerBase.cc Modified: trunk/core/dbus/namespace_service/src/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/src/DBusModulesServer.cc?rev=57639&r1=57638&r2=57639&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/src/DBusModulesServer.cc (original) +++ trunk/core/dbus/namespace_service/src/DBusModulesServer.cc Thu Jun 18 15:25:17 2009 @@ -22,6 +22,7 @@ #include "yast_dbus_names.h" + void DBusModulesServer::init_wfm() { if (Y2WFMComponent::instance() == NULL) @@ -113,17 +114,31 @@ DBusSignature sig_marshalled; DBusSignature sig_raw; + bool params_ok_raw = true; - // add return type - std::string rett(Y2Dtype(rettype)); + std::string rett; - if (!rett.empty()) + try { - sig_raw.retval = DBusArgument("ret", rett); + // add return type + rett = DBusMsg::YCPTypeSignature(rettype); + } + catch (const SignatureException &excpt) + { + y2error("Ignoring function %s::%s in raw interface, unsupported return type: %s", nspace.c_str(), fname, rettype->toString().c_str()); + params_ok_raw = false; } - // TODO FIXME void() ? - sig_marshalled.retval = DBusArgument("ret", "(bsv)"); + // check void() + if (!rettype->isVoid() && !rettype->isNil()) + { + if (params_ok_raw) + { + sig_raw.retval = DBusArgument("ret", rett); + } + + sig_marshalled.retval = DBusArgument("ret", "(bsv)"); + } // add parameter types int params = fptr->parameterCount(); @@ -131,20 +146,20 @@ DBusSignature::Params p_marshalled; DBusSignature::Params p_raw; - bool params_ok_raw = true; while(parindex < params) { - std::string partype_raw(Y2Dtype(fptr->parameterType(parindex))); - - if (!partype_raw.empty()) + try { + std::string partype_raw(DBusMsg::YCPTypeSignature(fptr->parameterType(parindex))); + DBusArgument param("param", partype_raw); p_raw.push_back(param); } - else + catch (const SignatureException &excpt) { - y2warning("Function %s is not exported due to an unsupported parameter type", fname); + y2warning("Function %s::%s is not exported due to an unsupported type of parameter number %d", + nspace.c_str(), fname, parindex); params_ok_raw = false; } @@ -259,33 +274,6 @@ register_method(YAST_DBUS_OBJ_PREFIX, YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_LOCK_METHOD, void_sig, manager_callback); } -std::string DBusModulesServer::Y2Dtype(constTypePtr type) const -{ - YCPValueType vt = type->valueType(); - std::string ret; - - switch (vt) - { - case(YT_VOID) : ret = ""; break; - case(YT_BOOLEAN) : ret = DBUS_TYPE_BOOLEAN_AS_STRING; break; - case(YT_INTEGER) : ret = DBUS_TYPE_INT64_AS_STRING; break; - case(YT_FLOAT) : ret = DBUS_TYPE_DOUBLE_AS_STRING; break; - case(YT_STRING) : ret = DBUS_TYPE_STRING_AS_STRING; break; - case(YT_PATH) : ret = DBUS_TYPE_STRING_AS_STRING; break; - case(YT_SYMBOL) : ret = DBUS_TYPE_STRING_AS_STRING; break; - case(YT_LIST) : ret = DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_VARIANT_AS_STRING; break; /* av */ - case(YT_MAP) : ret = DBUS_TYPE_ARRAY_AS_STRING - DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING DBUS_TYPE_STRING_AS_STRING - DBUS_TYPE_VARIANT_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING; break; /* a{sv} */ - case(YT_TERM) : ret = DBUS_TYPE_STRING_AS_STRING; break; -// case(YT_CODE) : ret = DBUS_TYPE_STRING_AS_STRING; break; - - default : y2warning("Value type %d is not supported", vt); break; - } - - return ret; -} - constTypePtr DBusModulesServer::searchFuncType(const std::string &objname, const std::string &fname) const { if (nsmap.find(objname) == nsmap.end()) @@ -413,6 +401,7 @@ y2debug("Requested object: %s, interface: %s, method: %s", object.c_str(), interface.c_str(), method.c_str()); constTypePtr t = searchFuncType(object, method); + constTypePtr rettype = NULL; if (t) { @@ -420,6 +409,8 @@ if (fptr) { + rettype = fptr->returnType(); + int reqarg = fptr->parameterCount(); if (request.arguments() == reqarg) @@ -528,7 +519,7 @@ if (interface == YAST_DBUS_RAW_INTERFACE) { y2debug("Returning direct DBus value"); - reply.addValue(ret); + reply.addValueAs(ret, rettype); } else { @@ -556,7 +547,7 @@ y2milestone("ModuleManager request: object: %s, method: %s, interface: %s", object.c_str(), method.c_str(), interface.c_str()); - YCPValue ret; + reply.createReply(request); if (object == YAST_DBUS_OBJ_PREFIX) { @@ -577,18 +568,20 @@ if (arg->isString()) { std::string required_namespace(arg->asString()->value()); + bool ret; NameSpaceMap::const_iterator nsiter = nsmap.find(required_namespace); if (nsiter != nsmap.end()) { - ret = YCPBoolean(true); + ret = true; } else { - bool retval = importNamespace(arg->asString()->value()); - - ret = YCPBoolean(retval); + ret = importNamespace(arg->asString()->value()); } + + y2milestone("Result: %s", ret ? "true" : "false"); + reply.addBoolean(ret); } else { @@ -613,14 +606,6 @@ } } - reply.createReply(request); - - if (!ret.isNull()) - { - y2milestone("Result: %s", ret->toString().c_str()); - reply.addValue(ret); - } - return reply; } Modified: trunk/core/dbus/namespace_service/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/testsuite/Makefile.am?rev=57639&r1=57638&r2=57639&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/Makefile.am (original) +++ trunk/core/dbus/namespace_service/testsuite/Makefile.am Thu Jun 18 15:25:17 2009 @@ -1,2 +1,6 @@ # adhoc testing, TODO use a decent framework (dejagnu does not qualify) TESTS = t1 + +SUBDIRS = modules + +CLEANFILES = $(wildcard *.test.reply) Added: trunk/core/dbus/namespace_service/testsuite/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/testsuite/modules/Makefile.am?rev=57639&view=auto ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/modules/Makefile.am (added) +++ trunk/core/dbus/namespace_service/testsuite/modules/Makefile.am Thu Jun 18 15:25:17 2009 @@ -0,0 +1,11 @@ + +yast_modules = TEST.ycp + +yast_modules_ybc = $(yast_modules:.ycp=.ybc) + +$(yast_modules_ybc): $(yast_modules) + ycpc -c $< + +all: $(yast_modules_ybc) + +CLEANFILES = $(wildcard *.ybc) Added: trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp?rev=57639&view=auto ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp (added) +++ trunk/core/dbus/namespace_service/testsuite/modules/TEST.ycp Thu Jun 18 15:25:17 2009 @@ -0,0 +1,76 @@ + +{ + +module "TEST"; + +global define list List() +{return [];} + +global define list ListAny() +{return [];} + +global define list ListAny1() +{return [1, "string"];} + +global define list ListAny2() +{return [["dssd", 123], ["zxcxczzx", 456]];} + + +global define list<string> ListString() +{return ["dssd", "sdfdfs"];} + +global define list ListListString() +{return [["dssd", "sdfdfs"], ["zxcxczzx"]];} + +global define list<map> ListMap() +{return [];} + +global define list > ListMapStringString() +{return [];} + +global define list > ListMapStringAny() +{return [ $["a" : "b"], $["c" : [10, 20, "haha", `Symbol]]];} + +global define map MapStringAny() +{return $[];} + +global define map MapStringString() +{return $[];} + +global define map MapStringListString() +{return $[];} + +global define string String() +{return "a";} + +global define any Any() +{return "a";} + +global define any Any2() +{return ["a"];} + +global define integer Integer() +{return 10;} + +global define symbol Symbol() +{return `s;} + +global define map MapAny() +{return $[ ];} + +global define map MapAny2() +{return $[ "3" : "l" ];} + +global define map MapAny3() +{return $[ "3" : ["l", "3"] ];} + +global define map MapAny4() +{return $[ "3" : $["l" : ["3", 10, $["a" : "b"]]]];} + +global define map MapAny5() +{return $[ 3 : 4, "4" : "5" ];} + +global define void Void() +{return;} + +} Added: trunk/core/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test?rev=57639&view=auto ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test (added) +++ trunk/core/dbus/namespace_service/testsuite/org.freedesktop.DBus.Introspectable.Introspect.test Thu Jun 18 15:25:17 2009 @@ -0,0 +1,61 @@ + string "<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" +"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> + +<node> + <interface name='org.freedesktop.DBus.Introspectable'> + <method name='Introspect'> + <arg name='xml_data' type='s' direction='out'/> + </method> + </interface> + <interface name='org.opensuse.YaST.Values'> + <method name='Any'><arg name='ret' type='v' direction='out'/></method> + <method name='Any2'><arg name='ret' type='v' direction='out'/></method> + <method name='Integer'><arg name='ret' type='x' direction='out'/></method> + <method name='List'><arg name='ret' type='av' direction='out'/></method> + <method name='ListAny'><arg name='ret' type='av' direction='out'/></method> + <method name='ListAny1'><arg name='ret' type='av' direction='out'/></method> + <method name='ListAny2'><arg name='ret' type='av' direction='out'/></method> + <method name='ListListString'><arg name='ret' type='aas' direction='out'/></method> + <method name='ListMap'><arg name='ret' type='aa{sv}' direction='out'/></method> + <method name='ListMapStringAny'><arg name='ret' type='aa{sv}' direction='out'/></method> + <method name='ListMapStringString'><arg name='ret' type='aa{ss}' direction='out'/></method> + <method name='ListString'><arg name='ret' type='as' direction='out'/></method> + <method name='MapAny'><arg name='ret' type='a{sv}' direction='out'/></method> + <method name='MapAny2'><arg name='ret' type='a{sv}' direction='out'/></method> + <method name='MapAny3'><arg name='ret' type='a{sv}' direction='out'/></method> + <method name='MapAny4'><arg name='ret' type='a{sv}' direction='out'/></method> + <method name='MapAny5'><arg name='ret' type='a{sv}' direction='out'/></method> + <method name='MapStringAny'><arg name='ret' type='a{sv}' direction='out'/></method> + <method name='MapStringListString'><arg name='ret' type='a{sas}' direction='out'/></method> + <method name='MapStringString'><arg name='ret' type='a{ss}' direction='out'/></method> + <method name='String'><arg name='ret' type='s' direction='out'/></method> + <method name='Symbol'><arg name='ret' type='s' direction='out'/></method> + <method name='Void'></method> + </interface> + <interface name='org.opensuse.YaST.YCPValues'> + <method name='Any'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='Any2'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='Integer'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='List'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='ListAny'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='ListAny1'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='ListAny2'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='ListListString'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='ListMap'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='ListMapStringAny'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='ListMapStringString'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='ListString'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='MapAny'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='MapAny2'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='MapAny3'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='MapAny4'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='MapAny5'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='MapStringAny'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='MapStringListString'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='MapStringString'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='String'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='Symbol'><arg name='ret' type='(bsv)' direction='out'/></method> + <method name='Void'></method> + </interface> +</node> +" Added: trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any.test URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any.test?rev=57639&view=auto ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any.test (added) +++ trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any.test Thu Jun 18 15:25:17 2009 @@ -0,0 +1 @@ + variant string "a" Added: trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any2.test URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any2.test?rev=57639&view=auto ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any2.test (added) +++ trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Any2.test Thu Jun 18 15:25:17 2009 @@ -0,0 +1,3 @@ + variant array [ + variant string "a" + ] Added: trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.List.test URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.List.test?rev=57639&view=auto ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.List.test (added) +++ trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.List.test Thu Jun 18 15:25:17 2009 @@ -0,0 +1,2 @@ + array [ + ] Added: trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.ListMapStringAny.test URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.ListMapStringAny.test?rev=57639&view=auto ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.ListMapStringAny.test (added) +++ trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.ListMapStringAny.test Thu Jun 18 15:25:17 2009 @@ -0,0 +1,19 @@ + array [ + array [ + dict entry( + string "a" + variant string "b" + ) + ] + array [ + dict entry( + string "c" + variant array [ + variant int64 10 + variant int64 20 + variant string "haha" + variant string "`Symbol" + ] + ) + ] + ] Added: trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Void.test URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/testsuite/org.opensuse.YaST.Values.Void.test?rev=57639&view=auto ============================================================================== (empty) Modified: trunk/core/dbus/namespace_service/testsuite/t1 URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/namespace_service/testsuite/t1?rev=57639&r1=57638&r2=57639&view=diff ============================================================================== --- trunk/core/dbus/namespace_service/testsuite/t1 (original) +++ trunk/core/dbus/namespace_service/testsuite/t1 Thu Jun 18 15:25:17 2009 @@ -1,5 +1,7 @@ #! /bin/sh +#set -x + # A basic test: does the server reply to introspection? # TODO: more tests, probably in python or whatever so that @@ -12,11 +14,32 @@ trap "kill $DBUS_SESSION_BUS_PID" EXIT TERM INT echo -n "Hey, server, get on da bus... " -PRG="../src/yast_modules_dbus_server --disable-timer --session" + +# load the modules from the current directory +export Y2DIR=. + +# start the server, preload TEST.ycp module +PRG="../src/yast_modules_dbus_server --disable-timer --session TEST" $PRG & sleep 3 echo "off we go!" SEND0="dbus-send --session --dest=org.opensuse.YaST.modules" CALL="$SEND0 --type=method_call" -REPLY="$CALL --print-reply" -$REPLY / org.freedesktop.DBus.Introspectable.Introspect + +find . -name '*.test' | while read TESTFILE; do + TESTCALL=`echo "$TESTFILE" | sed -e "s#./\(.*\).test#\1#"` + echo -n "Testing $TESTCALL ... " + # call the DBus method, ignore the first two lines (the header) + REPLY=`$CALL --print-reply /org/opensuse/YaST/modules/TEST $TESTCALL | tail -n +2 > $TESTFILE.reply` + + if diff -u $TESTFILE $TESTFILE.reply > /dev/null; then + echo "OK" + else + echo "FAILED!" + echo "Diff: " + diff -u $TESTFILE $TESTFILE.reply + exit 1 + fi +done + + Modified: trunk/core/liby2dbus/src/DBusMsg.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2dbus/src/DBusMsg.cc?rev=57639&r1=57638&r2=57639&view=diff ============================================================================== --- trunk/core/liby2dbus/src/DBusMsg.cc (original) +++ trunk/core/liby2dbus/src/DBusMsg.cc Thu Jun 18 15:25:17 2009 @@ -224,30 +224,64 @@ return ret; } -bool DBusMsg::addValue(const YCPValue &val) +bool DBusMsg::addValueAs(const YCPValue &val, constTypePtr rettype) { if (val.isNull()) { - y2milestone("Ignoring YCPNull value"); + y2error("Ignoring YCPNull value"); return false; } y2debug("Adding YCP value: %s", val->toString().c_str()); + if (!rettype) + { + // return as the current type if not specified + rettype = Type::vt2type(val->valuetype()); + } + else + { + // the required type does not match the value + if (rettype->matchvalue(val) < 0) + { + y2error("Value %s does not match requested type %s", + val->toString().c_str(), rettype->toString().c_str()); + return false; + } + else + { + y2debug("Requested type matches the value"); + } + } + + // create insert iterator DBusMessageIter it; dbus_message_iter_init_append(msg, &it); // add the value - bool ret = addValueAt(val, &it, false); + bool ret = addValueAt(val, &it, rettype); return ret; } -bool DBusMsg::addValueAt(const YCPValue &val, DBusMessageIter *i, bool bsv_encoding) +bool DBusMsg::addValueAt(const YCPValue &val, DBusMessageIter *i, constTypePtr rtype) { + y2milestone("Returning YCP value as type: %s", rtype->toString().c_str()); + int type = typeInt(val); + DBusMessageIter variant_it; + DBusMessageIter *it_backup = i; + if (rtype && rtype->isAny()) + { + // open variant container for "any" type + y2debug("Opening VARIANT container with type %s", typeStr(val, false).c_str()); + dbus_message_iter_open_container(i, DBUS_TYPE_VARIANT, typeStr(val, false).c_str(), &variant_it); + + i = &variant_it; + } + if (val->isInteger()) { dbus_int64_t i64 = val->asInteger()->value(); @@ -279,11 +313,19 @@ else if (val->isList()) { YCPList lst = val->asList(); - int sz = lst->size(); - int index = 0; + std::string list_type("v"); + constTypePtr list_type_ptr = Type::Any; + + if (rtype->isList()) + { + list_type_ptr = ((constListTypePtr)rtype)->type(); + y2debug("Found type list<%s>", list_type_ptr->toString().c_str()); - // use string as fallback for empty list - std::string list_type(sz ? typeStr(lst->value(0), bsv_encoding) : DBUS_TYPE_STRING_AS_STRING); + if (!list_type_ptr->isAny()) + { + list_type = YCPTypeSignature(list_type_ptr); + } + } DBusMessageIter array_it; @@ -291,24 +333,15 @@ y2debug("Opening array container with type: %s", list_type.c_str()); dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, list_type.c_str(), &array_it); + + int sz = lst->size(); + int index = 0; while(index < sz) { y2debug("Adding YCP value at index %d", index); - YCPValue list_item = lst->value(index); - - if (typeStr(list_item, bsv_encoding) != list_type) - { - y2error("Found different type in list: %s (expected %s) - ignoring item %s", - typeStr(list_item, bsv_encoding).c_str(), list_type.c_str(), - list_item->toString().c_str()); - return false; - } - else - { - // add the raw YCP value - addValueAt(lst->value(index), &array_it, bsv_encoding); - } + // add the raw YCP value + addValueAt(lst->value(index), &array_it, list_type_ptr); index++; } @@ -321,24 +354,40 @@ { YCPMap map = val->asMap(); - DBusMessageIter array_it; + std::string map_key_type("s"); + std::string map_val_type("v"); - YCPMap::const_iterator mit = map.begin(); - // use string as fallback for empty map - std::string key_type(mit == map.end() ? DBUS_TYPE_STRING_AS_STRING : typeStr(mit->first, bsv_encoding)); - std::string val_type(mit == map.end() ? DBUS_TYPE_STRING_AS_STRING : typeStr(mit->second, bsv_encoding)); + // YCPMap can contain only YCPString, YCPInteger or YCPSymbol as the key + constTypePtr map_key_type_ptr = Type::String; + constTypePtr map_val_type_ptr = Type::Any; + + if (rtype->isMap()) + { + map_key_type_ptr = ((constMapTypePtr)rtype)->keytype(); - // dbus allows only basic types as key type in a map - const std::string valid_key_types(DBUS_TYPE_INT64_AS_STRING DBUS_TYPE_DOUBLE_AS_STRING - DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_BOOLEAN_AS_STRING); + if (map_key_type_ptr->isAny()) + { + map_key_type_ptr = Type::String; + } - if (valid_key_types.find(key_type) == std::string::npos) - { - y2error("Invalid type of key in map (non-basic type): %s, ignoring the map", key_type.c_str()); - return false; + map_val_type_ptr = ((constMapTypePtr)rtype)->valuetype(); + y2debug("Found type map<%s,%s>", map_key_type_ptr->toString().c_str(), map_val_type_ptr->toString().c_str()); + + if (!map_key_type_ptr->isAny()) + { + map_key_type = YCPTypeSignature(map_key_type_ptr); + } + if (!map_val_type_ptr->isAny()) + { + map_val_type = YCPTypeSignature(map_val_type_ptr); + } } - std::string map_signature("{" + key_type + (bsv_encoding ? "v" : val_type) + "}"); + DBusMessageIter array_it; + + YCPMap::const_iterator mit = map.begin(); + + std::string map_signature("{" + map_key_type + map_val_type + "}"); // open array container y2debug("Opening DICT container with signature: %s", map_signature.c_str()); @@ -349,41 +398,23 @@ YCPValue key = mit->first; YCPValue val = mit->second; - // error: this is a different key type than the announced type - if (key_type != typeStr(key, bsv_encoding)) - { - y2error("Found different key type %s (expected %s) - ignoring pair $[ %s : %s ]", - typeStr(key, bsv_encoding).c_str(), key_type.c_str(), - key->toString().c_str(), val->toString().c_str()); - - continue; - } - DBusMessageIter map_item_it; y2debug("Opening map item container"); dbus_message_iter_open_container(&array_it, DBUS_TYPE_DICT_ENTRY, 0, &map_item_it); - // add the key - addValueAt(key, &map_item_it, bsv_encoding); - - if (bsv_encoding) - { - DBusMessageIter var_it2; - // add VARIANT container - y2debug("Opening VARIANT container with type %s", typeStr(val, bsv_encoding).c_str()); - dbus_message_iter_open_container(&map_item_it, DBUS_TYPE_VARIANT, typeStr(val, bsv_encoding).c_str(), &var_it2); - // add the value - addValueAt(val, &var_it2, bsv_encoding); - - y2debug("Closing VARIANT container"); - dbus_message_iter_close_container(&map_item_it, &var_it2); - } - else + // convert YCPInteger key to string for "any" type + if (key->isInteger() && map_key_type_ptr == Type::String) { - addValueAt(val, &map_item_it, bsv_encoding); + key = YCPString(key->toString()); } + // add the key + addValueAt(key, &map_item_it, map_key_type_ptr); + + // add the value + addValueAt(val, &map_item_it, map_val_type_ptr); + // close map item dbus_message_iter_close_container(&array_it, &map_item_it); y2debug("Closing map item container"); @@ -401,6 +432,13 @@ // TODO add as string? } + if (rtype && rtype->isAny()) + { + // close variant container for "any" type + y2debug("Closing VARIANT container"); + dbus_message_iter_close_container(it_backup, &variant_it); + } + return true; } @@ -1103,9 +1141,7 @@ } else { - YCPList lst = val->asList(); - std::string val_type((lst->size() > 0) ? typeStr(lst->value(0)) : "s"); - return std::string("a") + val_type; + return "av"; } } else if (val->isCode()) @@ -1128,10 +1164,7 @@ } else { - std::string val_type((map.size() > 0) ? typeStr(map.begin()->second) : "s"); - - return std::string(DBUS_TYPE_ARRAY_AS_STRING) + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + - + key_type.c_str() + val_type + DBUS_DICT_ENTRY_END_CHAR_AS_STRING; + return "a{sv}"; } } @@ -1170,3 +1203,76 @@ { return "(bsv)"; } + +std::string DBusMsg::YCPTypeSignature(constTypePtr type) +{ + // handle any type specially + if (type->isAny()) + { + return "v"; + } + + if (type->isList()) + { + constTypePtr list_type = ((constListTypePtr)type)->type(); + y2debug("type list<%s>", list_type->toString().c_str()); + + std::string list_type_str(YCPTypeSignature(list_type)); + + if (list_type_str.empty()) + { + throw SignatureException(); + } + + return std::string("a") + list_type_str; + } + + if (type->isMap()) + { + constMapTypePtr mt = (constMapTypePtr)type; + constTypePtr key_type = mt->keytype(); + constTypePtr val_type = mt->valuetype(); + + if (key_type->isAny()) + { + key_type = Type::String; + } + + y2debug("type map<%s,%s>", key_type->toString().c_str(), val_type->toString().c_str()); + + std::string key_type_str(YCPTypeSignature(key_type)); + std::string val_type_str(YCPTypeSignature(val_type)); + + if (key_type_str.empty() || val_type_str.empty()) + { + throw SignatureException(); + } + + return std::string("a{") + key_type_str + val_type_str + "}"; + } + + YCPValueType vt = type->valueType(); + std::string ret; + + switch (vt) + { + case(YT_VOID) : ret = ""; break; + case(YT_BOOLEAN) : ret = DBUS_TYPE_BOOLEAN_AS_STRING; break; + case(YT_INTEGER) : ret = DBUS_TYPE_INT64_AS_STRING; break; + case(YT_FLOAT) : ret = DBUS_TYPE_DOUBLE_AS_STRING; break; + case(YT_STRING) : ret = DBUS_TYPE_STRING_AS_STRING; break; + case(YT_PATH) : ret = DBUS_TYPE_STRING_AS_STRING; break; + case(YT_SYMBOL) : ret = DBUS_TYPE_STRING_AS_STRING; break; + case(YT_TERM) : ret = DBUS_TYPE_STRING_AS_STRING; break; +// case(YT_CODE) : ret = DBUS_TYPE_STRING_AS_STRING; break; + + default : y2error("Type '%s' is not supported", type->toString().c_str()); throw SignatureException(); + } + + return ret; +} + +SignatureException::SignatureException() +{ + y2error("Signature exception"); +} Modified: trunk/core/liby2dbus/src/DBusMsg.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2dbus/src/DBusMsg.h?rev=57639&r1=57638&r2=57639&view=diff ============================================================================== --- trunk/core/liby2dbus/src/DBusMsg.h (original) +++ trunk/core/liby2dbus/src/DBusMsg.h Thu Jun 18 15:25:17 2009 @@ -9,6 +9,8 @@ #include <string> #include +#include + class YCPValue; // DBusMessage wrapper @@ -43,7 +45,7 @@ bool addDouble(double val); bool addYCPValue(const YCPValue &val); - bool addValue(const YCPValue &val); + bool addValueAs(const YCPValue &val, constTypePtr rettype = NULL); YCPValue getYCPValue(int index) const; @@ -61,12 +63,13 @@ std::string sender() const; static const char *YCPValueSignature(); + static std::string YCPTypeSignature(constTypePtr type); private: bool addValue(int type, void* data); bool addValue(int type, void* data, DBusMessageIter *i); - bool addValueAt(const YCPValue &val, DBusMessageIter *i, bool bsv_encoding = true); + bool addValueAt(const YCPValue &val, DBusMessageIter *i, constTypePtr rtype = NULL); bool addYCPValue(const YCPValue &v, DBusMessageIter *i); bool addYCPValueRaw(const YCPValue &val, DBusMessageIter *i); void release(); @@ -79,5 +82,11 @@ YCPValue getYCPValueRaw(DBusMessageIter *it, const std::string &ycp_type = std::string()) const; }; +class SignatureException : std::exception +{ + public: + SignatureException(); +}; + #endif Modified: trunk/core/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2dbus/src/DBusServerBase.cc?rev=57639&r1=57638&r2=57639&view=diff ============================================================================== --- trunk/core/liby2dbus/src/DBusServerBase.cc (original) +++ trunk/core/liby2dbus/src/DBusServerBase.cc Thu Jun 18 15:25:17 2009 @@ -376,7 +376,7 @@ void DBusServerBase::register_method(const Object &obj, const Interface &intf, const Method &m, const DBusSignature &sig, methodHandler h) { - y2milestone("Registering DBus path: object %s interface %s method %s...", obj.c_str(), intf.c_str(), m.c_str()); + y2milestone("Registering DBus path: object %s interface %s method %s signature %s...", obj.c_str(), intf.c_str(), m.c_str(), sig.asXML().c_str()); Objects::iterator i = registered_objects.find(obj); // create a new data item -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org