Command parser

.travis.yml

@@ -1,23 +1,28 @@
 language: cpp
 compiler:
   - gcc
-#  - clang # not supported yet
+  - clang
 
 # Install a recent gcc, gcov and cmake,
 # it will not be necessary once travis worker is based on ubuntu > 12.04.
-# Install SWIG for bindings generation
+# Download recent SWIG for bindings generation
 before_install:
+  - wget http://mirrors.kernel.org/ubuntu/pool/main/s/swig2.0/swig2.0_2.0.12-1ubuntu1_amd64.deb
   - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
   - sudo add-apt-repository --yes ppa:kalakris/cmake # Non official cmake backport
   - sudo apt-get update -qq
   - sudo pip install cpp-coveralls
 
 install:
-  - sudo apt-get install --yes swig cmake valgrind g++-4.8
-  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 100
-  - sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.8 100
+  - sudo apt-get install --yes cmake valgrind
+  - if [ "$CXX" = "g++"  ] ; then
+        sudo apt-get install --yes g++-4.8 &&
+        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 100 &&
+        sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.8 100 ;
+    fi
   - sudo wget --directory-prefix /usr/include/
               https://raw.github.com/philsquared/Catch/master/single_include/catch.hpp
+  - sudo dpkg -i swig2.0_2.0.12-1ubuntu1_amd64.deb
 
 # how to build
 script:

CMakeLists.txt

@@ -36,7 +36,7 @@ endif(COMMAND cmake_policy)
 
 project(parameter-framework)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -std=c++11")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

README.md

@@ -1,7 +1,7 @@
 # parameter-framework
 
-[![Build Status](https://travis-ci.org/01org/parameter-framework.svg?branch=master)](https://travis-ci.org/01org/parameter-framework)
-[![Coverage Status](https://coveralls.io/repos/01org/parameter-framework/badge.svg?branch=master)](https://coveralls.io/r/01org/parameter-framework)
+[![Build Status](https://travis-ci.org/01org/parameter-framework.svg?branch=next)](https://travis-ci.org/01org/parameter-framework)
+[![Coverage Status](https://coveralls.io/repos/01org/parameter-framework/badge.svg?branch=next)](https://coveralls.io/r/01org/parameter-framework)
 
 ## Introduction
 

bindings/c/ParameterFramework.cpp

@@ -105,15 +105,24 @@ class LogWrapper : public CParameterMgrPlatformConnector::ILogger
     LogWrapper() : mLogger() {}
     virtual ~LogWrapper() {}
 private:
-    virtual void log(bool bIsWarning, const string &strLog)
+    virtual void info(const string &msg)
+    {
+        log(pfwLogInfo, msg);
+    }
+
+    virtual void warning(const string &msg)
+    {
+        log(pfwLogWarning, msg);
+    }
+
+    void log(PfwLogLevel level, const string &strLog)
     {
         // A LogWrapper should NOT be register to the pfw (thus log called)
         // if logCb is NULL.
         assert(mLogger.logCb != NULL);
-        mLogger.logCb(mLogger.userCtx,
-                      bIsWarning ? pfwLogWarning : pfwLogInfo,
-                      strLog.c_str());
+        mLogger.logCb(mLogger.userCtx, level, strLog.c_str());
     }
+
     PfwLogger mLogger;
 };
 
@@ -196,9 +205,10 @@ bool PfwHandler::createCriteria(const PfwCriterion criteriaArray[], size_t crite
                 value = valueIndex;
             }
             const char * valueName = criterion.values[valueIndex];
-            if(not type->addValuePair(value, valueName)) {
+            string error;
+            if(not type->addValuePair(value, valueName, error)) {
                 return status.failure("Could not add value " + string(valueName) +
-                                      " to criterion " + criterion.name);
+                                      " to criterion " + criterion.name + ": " + error);
             }
         }
         // Create criterion and add it to the pfw

bindings/c/Test.cpp

@@ -329,6 +329,17 @@ TEST_CASE_METHOD(Test, "Parameter-framework c api use") {
                         REQUIRE(value == 3);
                     }
                 }
+                WHEN("Set a new value to a criterion without committing first") {
+                    const char *criterionName = criteria[0].name;
+                    REQUIRE_SUCCESS(pfwSetCriterion(pfw, criterionName, 0));
+                    THEN("A warning message should have been displayed") {
+                        INFO("Previous pfw log: \n" + logLines);
+                        size_t logPos = logLines.find("Warning: Selection criterion "
+                                                      "'inclusiveCrit' has been modified 1 time(s)"
+                                                      " without any configuration application");
+                        CHECK(logPos != std::string::npos);
+                    }
+                }
             }
             WHEN("Commit criteria without a pfw") {
                 REQUIRE(not pfwApplyConfigurations(NULL));

bindings/python/Android.mk

@@ -46,13 +46,11 @@ LOCAL_C_INCLUDES := \
     prebuilts/python/linux-x86/2.7.5/include/python2.7 \
     $(HOST_OUT_HEADERS)/parameter
 
-# The 'unused-but-set-variable' warning must be disabled because SWIG generates
-# files that do not respect that constraint.
 # '-DSWIG_PYTHON_SILENT_MEMLEAK' is needed because the "memleak" warning
 # pollutes the standard output. At the time of writing, the only warning is
 # spurious anyway, as it relates to "ILogger *" which is an abstract
 # class/interface class and as such cannot be destroyed.
-LOCAL_CFLAGS := -Wno-unused-but-set-variable -fexceptions -DSWIG_PYTHON_SILENT_MEMLEAK
+LOCAL_CFLAGS := -fexceptions -DSWIG_PYTHON_SILENT_MEMLEAK
 
 # Undefined symbols will be resolved at runtime
 LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
@@ -82,5 +80,7 @@ $(generated-sources-dir)/pfw_wrap.cxx: $(LOCAL_PATH)/pfw.i
 		-Iprebuilts/misc/common/swig/include/2.0.11/ \
 		-Wall -Werror -v -python -c++ -outdir $(HOST_LIBRARY_PATH)/ -o $@ $^
 
+LOCAL_CLANG := true
+include external/libcxx/libcxx.mk
 include $(BUILD_HOST_SHARED_LIBRARY)
 

bindings/python/CMakeLists.txt

@@ -54,13 +54,11 @@ swig_link_libraries(PyPfw parameter ${PYTHON_LIBRARIES})
 # ${CMAKE_CURRENT_BINARY_DIR}.
 set_property(TARGET _PyPfw PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
-# The 'unused-but-set-variable' warning must be disabled because SWIG generates
-# files that do not respect that contraint.
 # '-DSWIG_PYTHON_SILENT_MEMLEAK' is needed because the "memleak" warning
 # pollutes the standard output. At the time of writing, the only warning is
 # spurious anyway, as it relates to "ILogger *" which is an abstract
 # class/interface class and as such cannot be destroyed.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable -DSWIG_PYTHON_SILENT_MEMLEAK")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSWIG_PYTHON_SILENT_MEMLEAK")
 
 
 # Find the python modules install path.

bindings/python/pfw.i

@@ -182,7 +182,8 @@ public:
 class ILogger
 {
     public:
-        virtual void log(bool bIsWarning, const std::string& strLog) = 0;
+        virtual void info(const std::string& log) = 0;
+        virtual void warning(const std::string& log) = 0;
     protected:
         virtual ~ILogger() {}
 };
@@ -197,7 +198,7 @@ class ISelectionCriterionTypeInterface
 %}
 
 public:
-    virtual bool addValuePair(int iValue, const std::string& strValue) = 0;
+    virtual bool addValuePair(int iValue, const std::string& strValue, std::string& strError) = 0;
     virtual bool getNumericalValue(const std::string& strValue, int& iValue) const = 0;
     virtual bool getLiteralValue(int iValue, std::string& strValue) const = 0;
     virtual bool isTypeInclusive() const = 0;

parameter/Android.mk

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2014, Intel Corporation
+# Copyright (c) 2011-2015, Intel Corporation
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -44,7 +44,6 @@ common_copy_headers := \
 common_src_files := \
         AreaConfiguration.cpp \
         ArrayParameter.cpp \
-        AutoLog.cpp \
         BaseParameter.cpp \
         BinarySerializableElement.cpp \
         BinaryStream.cpp \
@@ -129,6 +128,7 @@ common_cflags := \
 
 common_c_includes := \
     $(LOCAL_PATH)/include/ \
+    $(LOCAL_PATH)/log/include/ \
     $(LOCAL_PATH)/../utility/ \
     $(LOCAL_PATH)/../xmlserializer/ \
     $(LOCAL_PATH)/../remote-processor/
@@ -158,8 +158,8 @@ LOCAL_STATIC_LIBRARIES := libxmlserializer libpfw_utility libxml2
 
 LOCAL_REQUIRED_MODULES := libremote-processor
 
-LOCAL_CLANG := false
-include external/stlport/libstlport.mk
+LOCAL_CLANG := true
+include external/libcxx/libcxx.mk
 include $(BUILD_SHARED_LIBRARY)
 
 ##############################
@@ -186,7 +186,8 @@ LOCAL_STATIC_LIBRARIES := libxmlserializer_host libpfw_utility_host libxml2
 
 LOCAL_LDLIBS += -ldl
 
-LOCAL_CLANG := false
+LOCAL_CLANG := true
+include external/libcxx/libcxx.mk
 include $(BUILD_HOST_SHARED_LIBRARY)
 
 ################################
@@ -197,7 +198,10 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := $(common_module)_includes
 LOCAL_MODULE_OWNER := intel
 
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+    $(LOCAL_PATH) \
+    $(LOCAL_PATH)/log/include
+
 
 LOCAL_STATIC_LIBRARIES := \
     libxmlserializer \

parameter/AreaConfiguration.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014, Intel Corporation
+ * Copyright (c) 2011-2015, Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -54,14 +54,16 @@ void CAreaConfiguration::save(const CParameterBlackboard* pMainBlackboard)
 }
 
 // Apply data to current
-bool CAreaConfiguration::restore(CParameterBlackboard* pMainBlackboard, bool bSync, std::list<std::string>* plstrError) const
+bool CAreaConfiguration::restore(CParameterBlackboard* pMainBlackboard,
+                                 bool bSync,
+                                 core::Results* errors) const
 {
     assert(_bValid);
 
     copyTo(pMainBlackboard, _pConfigurableElement->getOffset());
 
     // Synchronize if required
-    return !bSync || _pSyncerSet->sync(*pMainBlackboard, false, plstrError);
+    return !bSync || _pSyncerSet->sync(*pMainBlackboard, false, errors);
 }
 
 // Ensure validity

parameter/AreaConfiguration.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014, Intel Corporation
+ * Copyright (c) 2011-2015, Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -32,6 +32,7 @@
 #include "ParameterBlackboard.h"
 #include "BinaryStream.h"
 #include "SyncerSet.h"
+#include "Results.h"
 
 class CConfigurableElement;
 class CXmlElement;
@@ -48,8 +49,14 @@ class CAreaConfiguration
     // Save data from current
     void save(const CParameterBlackboard* pMainBlackboard);
 
-    // Apply data to current
-    bool restore(CParameterBlackboard* pMainBlackboard, bool bSync, std::list<std::string>* plstrError) const;
+    /** Restore the configuration area
+     *
+     * @param[in] pMainBlackboard the application main blackboard
+     * @param[in] bSync indicates if a synchronisation has to be done
+     * @param[out] errors, errors encountered during restoration
+     * @return true if success false otherwise
+     */
+    bool restore(CParameterBlackboard* pMainBlackboard, bool bSync, core::Results* errors) const;
 
     // Ensure validity
     void validate(const CParameterBlackboard* pMainBlackboard);

parameter/BitParameter.cpp

@@ -87,7 +87,7 @@ bool CBitParameter::accessAsBoolean(bool& bValue, bool bSet, CParameterAccessCon
     }
 
     // Rely on integer access
-    uint64_t uiValue;
+    uint32_t uiValue;
 
     if (bSet) {
 
@@ -108,7 +108,7 @@ bool CBitParameter::accessAsBoolean(bool& bValue, bool bSet, CParameterAccessCon
 }
 
 // Integer Access
-bool CBitParameter::accessAsInteger(uint64_t& uiValue, bool bSet, CParameterAccessContext& parameterAccessContext) const
+bool CBitParameter::accessAsInteger(uint32_t& uiValue, bool bSet, CParameterAccessContext& parameterAccessContext) const
 {
     uint32_t uiOffset = getOffset();
 

parameter/BitParameter.h

@@ -49,7 +49,7 @@ class CBitParameter : public CBaseParameter
     virtual bool accessAsBoolean(bool& bValue, bool bSet, CParameterAccessContext& parameterAccessContext) const;
 
     // Integer Access
-    virtual bool accessAsInteger(uint64_t& uiValue, bool bSet, CParameterAccessContext& parameterAccessContext) const;
+    virtual bool accessAsInteger(uint32_t& uiValue, bool bSet, CParameterAccessContext& parameterAccessContext) const;
 
     // AreaConfiguration creation
     virtual CAreaConfiguration* createAreaConfiguration(const CSyncerSet* pSyncerSet) const;

parameter/BitParameterType.cpp

@@ -191,7 +191,7 @@ bool CBitParameterType::toBlackboard(uint64_t uiUserValue, uint64_t& uiValue, CP
     return true;
 }
 
-void CBitParameterType::fromBlackboard(uint64_t& uiUserValue, uint64_t uiValue, CParameterAccessContext& parameterAccessContext) const
+void CBitParameterType::fromBlackboard(uint32_t& uiUserValue, uint64_t uiValue, CParameterAccessContext& parameterAccessContext) const
 {
     (void)parameterAccessContext;
 

parameter/BitParameterType.h

@@ -53,7 +53,7 @@ class CBitParameterType : public CTypeElement
     void fromBlackboard(std::string& strValue, const uint64_t& uiValue, CParameterAccessContext& parameterAccessContext) const;
     // Integer
     bool toBlackboard(uint64_t uiUserValue, uint64_t& uiValue, CParameterAccessContext& parameterAccessContext) const;
-    void fromBlackboard(uint64_t& uiUserValue, uint64_t uiValue, CParameterAccessContext& parameterAccessContext) const;
+    void fromBlackboard(uint32_t& uiUserValue, uint64_t uiValue, CParameterAccessContext& parameterAccessContext) const;
     // Access from area configuration
     uint64_t merge(uint64_t uiOriginData, uint64_t uiNewData) const;
 

parameter/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2014, Intel Corporation
+# Copyright (c) 2014-2015, Intel Corporation
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -29,7 +29,6 @@
 add_library(parameter SHARED
     AreaConfiguration.cpp
     ArrayParameter.cpp
-    AutoLog.cpp
     BaseParameter.cpp
     BinarySerializableElement.cpp
     BinaryStream.cpp
@@ -101,13 +100,17 @@ add_library(parameter SHARED
     VirtualSyncer.cpp
     XmlElementSerializingContext.cpp
     XmlFileIncluderElement.cpp
-    XmlParameterSerializingContext.cpp)
+    XmlParameterSerializingContext.cpp
+    command/src/Parser.cpp)
 
 include_directories(
     include
+    command/include
+    "${PROJECT_SOURCE_DIR}/parameter"
     "${PROJECT_SOURCE_DIR}/xmlserializer"
     "${PROJECT_SOURCE_DIR}/utility"
-    "${PROJECT_SOURCE_DIR}/remote-processor")
+    "${PROJECT_SOURCE_DIR}/remote-processor"
+    "${PROJECT_SOURCE_DIR}/parameter/log/include")
 
 # No need to link with libremote-processor: it is accessed via dlopen()
 find_library(dl dl)
@@ -125,7 +128,6 @@ install(FILES
     DESTINATION "include/parameter/client")
 # Core (plugin) headers
 install(FILES
-    AutoLog.h
     BitParameterBlockType.h
     ConfigurableElement.h
     ConfigurableElementWithMapping.h
@@ -138,7 +140,7 @@ install(FILES
     InstanceConfigurableElement.h
     Mapper.h
     MappingContext.h
-    NamedElementBuilderTemplate.h
+    LoggingElementBuilderTemplate.h
     ParameterBlockType.h
     ParameterType.h
     PathNavigator.h
@@ -151,3 +153,5 @@ install(FILES
     TypeElement.h
     VirtualSubsystem.h
     DESTINATION "include/parameter/plugin")
+install(DIRECTORY log/include/log/
+        DESTINATION "include/parameter/plugin/log")