Merge tag 'v2.6.0' into next

dawagner · dawagner · commit 1702db4028f6 · 2015-06-15T11:00:36.000+02:00
Conflicts:
	parameter/Android.mk
	parameter/ConfigurableDomain.cpp
	parameter/ConfigurableDomains.cpp
	parameter/Element.cpp
	parameter/Element.h
	parameter/ParameterMgr.cpp
	parameter/SelectionCriterion.cpp
	parameter/SubsystemObject.cpp
	parameter/SubsystemObject.h
	utility/Utility.h
diff --git a/.travis.yml b/.travis.yml
@@ -8,8 +8,7 @@ env:
 
 compiler:
     - gcc
-    # clang not supported yet
-    # - clang
+    - clang
 
 # Install a recent gcc and gcov,
 # it will not be necessary once travis worker is based on ubuntu > 12.04.
diff --git a/bindings/python/Android.mk b/bindings/python/Android.mk
@@ -44,20 +44,22 @@ LOCAL_CLANG := false
 # Android only provides a 32bit version of python.
 LOCAL_32_BIT_ONLY := true
 
-LOCAL_SHARED_LIBRARIES := libparameter_host
-LOCAL_STATIC_LIBRARIES := libxmlserializer_host
+LOCAL_SHARED_LIBRARIES := libxmlserializer_host libparameter_host
+
+# python is only available in 32bits for now, thus arch is forced to 32bits
+PYTHON_INSTALL_PATH := prebuilts/python/$(HOST_OS)-x86/2.7.5/
+PYTHON_INCLUDES_PATH := $(PYTHON_INSTALL_PATH)/include/python2.7
+PYTHON_BIN_PATH := $(PYTHON_INSTALL_PATH)/bin
 
 LOCAL_C_INCLUDES := \
-    prebuilts/python/linux-x86/2.7.5/include/python2.7 \
+    $(PYTHON_INCLUDES_PATH) \
     $(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
@@ -74,6 +76,26 @@ LOCAL_GENERATED_SOURCES := $(generated-sources-dir)/pfw_wrap.cxx $(generated-sou
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(generated-sources-dir)
 
+# Get the interpreter ld options.
+ifeq ($(HOST_OS), darwin)
+    # Contrary to linux, on darwin, a python 64 bit executable is installed
+    # in the x86 prebuild directory,
+    # As all host libraries are 32 bit in android. We can not link and host
+    # python module against the prebuild python library.
+    #
+    # As a *dirty* workaround, use the system's python configuration and hope
+    # it will be compatible with the prebuild python interpreter used at runtime.
+    # To summarize the prebuild python (64 bit?) interpreter will load a
+    # python native module (32bit) linked with the host (32 bit ?) python library.
+    LOCAL_LDLIBS += $(shell python-config --ldflags)
+else
+   # Careful, we need to invoke the android python config not the host's one.
+   # Unfortunately, the internal install directory of python is hardcoded to a dummy value,
+   # As a workaround, we need to manually add the correct path to libs to the library list.
+    LOCAL_LDLIBS += $(shell $(PYTHON_BIN_PATH)/python $(PYTHON_BIN_PATH)/python-config --ldflags) \
+                -L $(PYTHON_INSTALL_PATH)/lib/
+endif
+
 $(generated-sources-dir)/pfw_wrap.h: $(generated-sources-dir)/pfw_wrap.cxx
 
 # The PyPfw.py file is generated in the directory given by -outdir switch, thus
@@ -82,7 +104,7 @@ $(generated-sources-dir)/pfw_wrap.cxx: $(LOCAL_PATH)/pfw.i
 	@echo "Generating Python binding files"
 	mkdir -p $(dir $@) # surprisingly, path is not generated by build system
 	mkdir -p $(HOST_LIBRARY_PATH)
-	prebuilts/misc/linux-x86_64/swig/swig \
+	prebuilts/misc/$(HOST_OS)-$(HOST_ARCH)/swig/swig \
 		-Iprebuilts/misc/common/swig/include/2.0.11/python/ \
 		-Iprebuilts/misc/common/swig/include/2.0.11/ \
 		-Wall -Werror -v -python -c++ -outdir $(HOST_LIBRARY_PATH)/ -o $@ $^
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
@@ -56,13 +56,13 @@ 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")
+# -Wno-error is set to prevent compilation failure in case of the code
+# generated by swig generates warnings
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSWIG_PYTHON_SILENT_MEMLEAK -Wno-error")
 
 
 # Find the python modules install path.
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
@@ -152,7 +152,7 @@ FULL_PATH_NAMES        = YES
 # will be relative from the directory where doxygen is started.
 # This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
-STRIP_FROM_PATH        =
+STRIP_FROM_PATH        = @PROJECT_SOURCE_DIR@
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
 # path mentioned in the documentation of a class, which tells the reader which
@@ -1135,7 +1135,7 @@ HTML_COLORSTYLE_GAMMA  = 80
 # The default value is: YES.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_TIMESTAMP         = YES
+HTML_TIMESTAMP         = NO
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
diff --git a/parameter/Android.mk b/parameter/Android.mk
@@ -130,11 +130,8 @@ common_c_includes := \
     $(LOCAL_PATH)/include/ \
     $(LOCAL_PATH)/log/include/ \
     $(LOCAL_PATH)/../utility/ \
-    $(LOCAL_PATH)/../xmlserializer/ \
     $(LOCAL_PATH)/../remote-processor/
 
-common_shared_libraries := libicuuc
-
 #############################
 # Target build
 
@@ -143,6 +140,8 @@ include $(CLEAR_VARS)
 LOCAL_COPY_HEADERS_TO := $(common_copy_headers_to)
 LOCAL_COPY_HEADERS := $(common_copy_headers)
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) $(LOCAL_PATH)/log/include
+
 LOCAL_CFLAGS := $(common_cflags)
 
 LOCAL_SRC_FILES := $(common_src_files)
@@ -153,12 +152,11 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
 
 LOCAL_C_INCLUDES := $(common_c_includes)
 
-LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libdl
-LOCAL_STATIC_LIBRARIES := libxmlserializer libpfw_utility libxml2
+LOCAL_SHARED_LIBRARIES := libxmlserializer libdl
+LOCAL_STATIC_LIBRARIES := libpfw_utility
 
 LOCAL_REQUIRED_MODULES := libremote-processor
 
-LOCAL_CLANG := false
 include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)
 
@@ -170,6 +168,8 @@ include $(CLEAR_VARS)
 LOCAL_COPY_HEADERS_TO := $(common_copy_headers_to)
 LOCAL_COPY_HEADERS := $(common_copy_headers)
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) $(LOCAL_PATH)/log/include
+
 LOCAL_CFLAGS := $(common_cflags) -O0 -ggdb
 
 LOCAL_SRC_FILES := $(common_src_files)
@@ -181,47 +181,9 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
 LOCAL_C_INCLUDES += \
     $(common_c_includes)
 
-LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)-host
-LOCAL_STATIC_LIBRARIES := libxmlserializer_host libpfw_utility_host libxml2
+LOCAL_SHARED_LIBRARIES := libxmlserializer_host
+LOCAL_STATIC_LIBRARIES := libpfw_utility_host libxml2
 
 LOCAL_LDLIBS += -ldl
 
-LOCAL_CLANG := false
 include $(BUILD_HOST_SHARED_LIBRARY)
-
-################################
-# Export includes for plugins (Target build)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := $(common_module)_includes
-LOCAL_MODULE_OWNER := intel
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_PATH) \
-    $(LOCAL_PATH)/log/include
-
-
-LOCAL_STATIC_LIBRARIES := \
-    libxmlserializer \
-    libpfw_utility \
-    libxml2
-
-include $(BUILD_STATIC_LIBRARY)
-
-################################
-# Export includes for plugins (Host build)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := $(common_module)_includes_host
-LOCAL_MODULE_OWNER := intel
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-
-LOCAL_STATIC_LIBRARIES := \
-    libxmlserializer_host \
-    libpfw_utility_host \
-    libxml2
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/parameter/BitParameter.cpp b/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();
 
diff --git a/parameter/BitParameter.h b/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;
diff --git a/parameter/BitParameterType.cpp b/parameter/BitParameterType.cpp
@@ -192,7 +192,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;
 
diff --git a/parameter/BitParameterType.h b/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;
 
diff --git a/parameter/ParameterMgr.h b/parameter/ParameterMgr.h
@@ -85,9 +85,9 @@ class CParameterMgr
         const char* _pcDescription;
     };
     // Version
-    static const uint32_t guiEditionMajor = 0x2;
-    static const uint32_t guiEditionMinor = 0x5;
-    static const uint32_t guiRevision = 0x0;
+    static const uint32_t guiEditionMajor = 2;
+    static const uint32_t guiEditionMinor = 6;
+    static const uint32_t guiRevision = 0;
 
     // Parameter handle friendship
     friend class CParameterHandle;
diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk
@@ -49,9 +49,6 @@ common_cflags := \
         -Werror \
         -Wextra \
         -Wno-unused-parameter \
-        -pthread
-
-common_ldlibs := -pthread
 
 #############################
 # Target build
@@ -63,7 +60,6 @@ LOCAL_SRC_FILES := $(common_src_files)
 LOCAL_STATIC_LIBRARIES := libpfw_utility
 
 LOCAL_CFLAGS := $(common_cflags)
-LOCAL_LDLIBS := $(common_ldlibs)
 
 LOCAL_MODULE := $(common_module)
 LOCAL_MODULE_OWNER := intel
@@ -81,8 +77,8 @@ LOCAL_SRC_FILES := $(common_src_files)
 
 LOCAL_STATIC_LIBRARIES := libpfw_utility_host
 
-LOCAL_CFLAGS := $(common_cflags)
-LOCAL_LDLIBS := $(common_ldlibs)
+LOCAL_CFLAGS := $(common_cflags) -pthread
+LOCAL_LDLIBS := -lpthread
 
 LOCAL_MODULE := $(common_module)_host
 LOCAL_MODULE_OWNER := intel
diff --git a/remote-processor/Socket.cpp b/remote-processor/Socket.cpp
@@ -39,8 +39,9 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <sys/time.h>
+#include <signal.h>
 
-CSocket::CSocket() : _iSockFd(socket(AF_INET, SOCK_STREAM, 0))
+CSocket::CSocket() : _iSockFd(socket(AF_INET, SOCK_STREAM, 0)), mSendFlag(0)
 {
     assert(_iSockFd != -1);
 
@@ -50,6 +51,19 @@ CSocket::CSocket() : _iSockFd(socket(AF_INET, SOCK_STREAM, 0))
     // they are ready to be sent, instead of waiting for more data on the
     // socket.
     setsockopt(_iSockFd, IPPROTO_TCP, TCP_NODELAY, (char *)&iNoDelay, sizeof(iNoDelay));
+
+    // Disable sigpipe reception on send
+#   if not defined(SIGPIPE)
+        // Pipe signal does not exist, there no sigpipe to ignore on send
+#   elif defined(SO_NOSIGPIPE)
+        const int set = 1;
+        setsockopt(_iSockFd, SOL_SOCKET, SO_NOSIGPIPE, &set, sizeof(set));
+#   elif defined(MSG_NOSIGNAL)
+        // Use flag NOSIGNAL on send call
+        mSendFlag = MSG_NOSIGNAL;
+#   else
+#       error Can not disable SIGPIPE
+#   endif
 }
 
 CSocket::CSocket(int iSockId) : _iSockFd(iSockId)
@@ -59,7 +73,11 @@ CSocket::CSocket(int iSockId) : _iSockFd(iSockId)
 
 CSocket::~CSocket()
 {
-    close(_iSockFd);
+    // fd might be invalide if send had an error.
+    // valgrind displays a warning if closing an invalid fd.
+    if (_iSockFd != -1) {
+        close(_iSockFd);
+    }
 }
 
 // Socket address init
@@ -108,7 +126,7 @@ bool CSocket::read(void* pvData, uint32_t uiSize)
 
     while (uiSize) {
 
-        int32_t iAccessedSize = ::recv(_iSockFd, &pucData[uiOffset], uiSize, MSG_NOSIGNAL);
+        int32_t iAccessedSize = ::recv(_iSockFd, &pucData[uiOffset], uiSize, 0);
 
         switch (iAccessedSize) {
         case 0:
@@ -140,17 +158,19 @@ bool CSocket::write(const void* pvData, uint32_t uiSize)
 
     while (uiSize) {
 
-        int32_t iAccessedSize = ::send(_iSockFd, &pucData[uiOffset], uiSize, MSG_NOSIGNAL);
+        int32_t iAccessedSize = ::send(_iSockFd, &pucData[uiOffset], uiSize, mSendFlag);
 
         if (iAccessedSize == -1) {
-            if (errno == ECONNRESET) {
-                // Peer has disconnected
-                _disconnected = true;
-            }
-            // errno == EINTR => The send system call was interrupted, try again
-            if (errno != EINTR) {
-                return false;
+            if (errno == EINTR) {
+                // The send system call was interrupted, try again
+                continue;
             }
+
+            // An error occured, forget this socket
+            _disconnected = true;
+            close(_iSockFd);
+            _iSockFd = -1; // Avoid writing again on the same socket
+            return false;
         } else {
             uiSize -= iAccessedSize;
             uiOffset += iAccessedSize;
diff --git a/remote-processor/Socket.h b/remote-processor/Socket.h
@@ -108,4 +108,5 @@ class CSocket
      * See hasPeerDisconnected for more details.
      */
     bool _disconnected;
+    int mSendFlag;
 };
diff --git a/support/android/build_pfw_settings.mk b/support/android/build_pfw_settings.mk
@@ -35,7 +35,8 @@ $(LOCAL_BUILT_MODULE): MY_TOOL := $(HOST_OUT)/bin/domainGenerator.py
 # As of Android K, python is available as prebuilt. We can't reliably use the
 # host's default python because the low-level python binding has been compiled
 # against Android's Python headers.
-$(LOCAL_BUILT_MODULE): MY_PYTHON := prebuilts/python/linux-x86/2.7.5/bin/python
+# BTW, python is only available in 32bits for now, thus arch is forced to 32bits
+$(LOCAL_BUILT_MODULE): MY_PYTHON := prebuilts/python/$(HOST_OS)-x86/2.7.5/bin/python
 # The parameter-framework binding module is installed on these locations on
 # Android (On 64bit machines, PyPfw.py is installed in the 'lib64' directory
 # and _PyPfw.so is installed in the 'lib' directory, hence the need for these
diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk
diff --git a/test/test-platform/TestPlatform.cpp b/test/test-platform/TestPlatform.cpp
diff --git a/test/test-platform/TestPlatform.h b/test/test-platform/TestPlatform.h
diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ bool CBitParameter::accessAsBoolean(bool& bValue, bool bSet, CParameterAccessCon`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`// Rely on integer access`
`90`		`- uint64_t uiValue;`
	`90`	`+ uint32_t uiValue;`
`91`	`91`
`92`	`92`	`if (bSet) {`
`93`	`93`
`@@ -108,7 +108,7 @@ bool CBitParameter::accessAsBoolean(bool& bValue, bool bSet, CParameterAccessCon`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`// Integer Access`
`111`		`-bool CBitParameter::accessAsInteger(uint64_t& uiValue, bool bSet, CParameterAccessContext& parameterAccessContext) const`
	`111`	`+bool CBitParameter::accessAsInteger(uint32_t& uiValue, bool bSet, CParameterAccessContext& parameterAccessContext) const`
`112`	`112`	`{`
`113`	`113`	`uint32_t uiOffset = getOffset();`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ bool CBitParameterType::toBlackboard(uint64_t uiUserValue, uint64_t& uiValue, CP`
`192`	`192`	`return true;`
`193`	`193`	`}`
`194`	`194`
`195`		`-void CBitParameterType::fromBlackboard(uint64_t& uiUserValue, uint64_t uiValue, CParameterAccessContext& parameterAccessContext) const`
	`195`	`+void CBitParameterType::fromBlackboard(uint32_t& uiUserValue, uint64_t uiValue, CParameterAccessContext& parameterAccessContext) const`
`196`	`196`	`{`
`197`	`197`	`(void)parameterAccessContext;`
`198`	`198`