ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [43/45] ignite git commit: Merge branch 'gridgain-7.6.2'
Date Wed, 20 Jul 2016 09:29:54 GMT
Merge branch 'gridgain-7.6.2'


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c9a0b8cf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c9a0b8cf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c9a0b8cf

Branch: refs/heads/ignite-1232-1
Commit: c9a0b8cfe7597d736796511ded87781cf9a064a6
Parents: 5b0dbca 6b8020d
Author: Pavel Tupitsyn <ptupitsyn@apache.org>
Authored: Wed Jul 20 11:56:35 2016 +0300
Committer: Pavel Tupitsyn <ptupitsyn@apache.org>
Committed: Wed Jul 20 11:56:35 2016 +0300

----------------------------------------------------------------------
 .../PlatformDotNetConfigurationClosure.java     |  5 +++++
 modules/platforms/cpp/jni/src/java.cpp          | 20 ++++++++++----------
 .../Apache.Ignite.Core.Tests.csproj             |  1 +
 .../Config/Cache/Affinity/affinity-function.xml |  2 +-
 .../Apache.Ignite.Core.csproj                   |  3 +++
 .../Impl/Unmanaged/UnmanagedCallbacks.cs        |  9 +++++----
 6 files changed, 25 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c9a0b8cf/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c9a0b8cf/modules/platforms/cpp/jni/src/java.cpp
----------------------------------------------------------------------
diff --cc modules/platforms/cpp/jni/src/java.cpp
index 685afd3,56e042c..0af7ef4
--- a/modules/platforms/cpp/jni/src/java.cpp
+++ b/modules/platforms/cpp/jni/src/java.cpp
@@@ -370,9 -366,7 +370,9 @@@ namespace ignit
              JniMethod M_PLATFORM_CALLBACK_UTILS_AFFINITY_FUNCTION_ASSIGN_PARTITIONS = JniMethod("affinityFunctionAssignPartitions",
"(JJJJ)V", true);
              JniMethod M_PLATFORM_CALLBACK_UTILS_AFFINITY_FUNCTION_REMOVE_NODE = JniMethod("affinityFunctionRemoveNode",
"(JJJ)V", true);
              JniMethod M_PLATFORM_CALLBACK_UTILS_AFFINITY_FUNCTION_DESTROY = JniMethod("affinityFunctionDestroy",
"(JJ)V", true);
-             
+ 
 +            JniMethod M_PLATFORM_CALLBACK_UTILS_CONSOLE_WRITE = JniMethod("consoleWrite",
"(Ljava/lang/String;Z)V", true);
 +
              const char* C_PLATFORM_UTILS = "org/apache/ignite/internal/processors/platform/utils/PlatformUtils";
              JniMethod M_PLATFORM_UTILS_REALLOC = JniMethod("reallocate", "(JI)V", true);
              JniMethod M_PLATFORM_UTILS_ERR_DATA = JniMethod("errorData", "(Ljava/lang/Throwable;)[B",
true);
@@@ -2508,35 -2488,6 +2508,35 @@@
                  }
              }
  
 +            void JniContext::SetConsoleHandler(ConsoleWriteHandler consoleHandler) {
 +                if (!consoleHandler)
 +                    throw std::invalid_argument("consoleHandler can not be null");
 +
 +                CONSOLE_LOCK.Enter();
-                     
++
 +                consoleWriteHandlers.push_back(consoleHandler);
 +
 +                CONSOLE_LOCK.Leave();
 +            }
 +
 +            int JniContext::RemoveConsoleHandler(ConsoleWriteHandler consoleHandler) {
 +                if (!consoleHandler)
 +                    throw std::invalid_argument("consoleHandler can not be null");
 +
 +                CONSOLE_LOCK.Enter();
 +
 +                int oldSize = static_cast<int>(consoleWriteHandlers.size());
-                     
-                 consoleWriteHandlers.erase(remove(consoleWriteHandlers.begin(), consoleWriteHandlers.end(),

++
++                consoleWriteHandlers.erase(remove(consoleWriteHandlers.begin(), consoleWriteHandlers.end(),
 +                    consoleHandler), consoleWriteHandlers.end());
 +
 +                int removedCnt = oldSize - static_cast<int>(consoleWriteHandlers.size());
 +
 +                CONSOLE_LOCK.Leave();
 +
 +                return removedCnt;
 +            }
 +
              void JniContext::ThrowToJava(char* msg) {
                  JNIEnv* env = Attach();
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/c9a0b8cf/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index 5c10612,f5eef65..9373f35
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
@@@ -58,11 -56,9 +58,12 @@@
      <Compile Include="Binary\BinaryBuilderSelfTestFullFooter.cs" />
      <Compile Include="Binary\BinaryCompactFooterInteropTest.cs" />
      <Compile Include="Binary\BinarySelfTestFullFooter.cs" />
 -    <Compile Include="Cache\CacheAffinityFieldTest.cs" />
 +    <Compile Include="Binary\BinaryStringTest.cs" />
 +    <Compile Include="Cache\Affinity\AffinityFieldTest.cs" />
 +    <Compile Include="Cache\Affinity\AffinityFunctionSpringTest.cs" />
 +    <Compile Include="Cache\Affinity\AffinityFunctionTest.cs" />
      <Compile Include="Cache\CacheConfigurationTest.cs" />
+     <Compile Include="Cache\Affinity\AffinityFunctionSpringTest.cs" />
      <Compile Include="Cache\CacheDynamicStartTest.cs" />
      <Compile Include="Cache\CacheNearTest.cs" />
      <Compile Include="Cache\CacheTestAsyncWrapper.cs" />

http://git-wip-us.apache.org/repos/asf/ignite/blob/c9a0b8cf/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Cache/Affinity/affinity-function.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/c9a0b8cf/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index b0adf61,823f9f2..f6569b1
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@@ -166,16 -164,13 +166,19 @@@
      <Compile Include="Common\IgniteFutureCancelledException.cs" />
      <Compile Include="Common\IgniteGuid.cs" />
      <Compile Include="Common\Package-Info.cs" />
 +    <Compile Include="Impl\Binary\DateTimeSerializer.cs" />
 +    <Compile Include="Impl\Binary\SerializableSerializer.cs" />
      <Compile Include="Impl\Binary\BinaryWriterExtensions.cs" />
      <Compile Include="Impl\Cache\Affinity\AffinityFunctionBase.cs" />
 +    <Compile Include="Impl\Binary\UserSerializerProxy.cs" />
 +    <Compile Include="Impl\Cache\Affinity\AffinityFunctionSerializer.cs" />
 +    <Compile Include="Impl\Cache\Affinity\PlatformAffinityFunction.cs" />
 +    <Compile Include="Impl\Common\ObjectInfoHolder.cs" />
      <Compile Include="Impl\Common\Platform.cs" />
+     <Compile Include="Impl\Cache\Affinity\AffinityFunctionSerializer.cs" />
+     <Compile Include="Impl\Cache\Affinity\PlatformAffinityFunction.cs" />
      <Compile Include="Impl\Cache\Event\JavaCacheEntryEventFilter.cs" />
+     <Compile Include="Impl\Common\ObjectInfoHolder.cs" />
      <Compile Include="Impl\Common\PlatformJavaObjectFactoryProxy.cs" />
      <Compile Include="Compute\ComputeExecutionRejectedException.cs" />
      <Compile Include="Compute\ComputeJobAdapter.cs" />

http://git-wip-us.apache.org/repos/asf/ignite/blob/c9a0b8cf/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
index 9719bba,b3489a2..ad8c8aa
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
@@@ -55,13 -56,6 +56,13 @@@ namespace Apache.Ignite.Core.Impl.Unman
          Justification = "This class instance usually lives as long as the app runs.")]
      internal unsafe class UnmanagedCallbacks
      {
 +        /** Console write delegate. */
 +        private static readonly ConsoleWriteDelegate ConsoleWriteDel = ConsoleWrite;
 +
 +        /** Console write pointer. */
-         private static readonly void* ConsoleWritePtr = 
++        private static readonly void* ConsoleWritePtr =
 +            Marshal.GetFunctionPointerForDelegate(ConsoleWriteDel).ToPointer();
 +
          /** Unmanaged context. */
          private volatile UnmanagedContext _ctx;
  
@@@ -940,12 -932,7 +941,12 @@@
          {
              SafeCall(() =>
              {
 -                var svc = _handleRegistry.Get<IService>(svcPtr, true);
 +                var svc = _handleRegistry.Get<IService>(svcPtr);
 +
 +                // Ignite does not guarantee that Cancel is called after Execute exits
 +                // So missing handle is a valid situation
 +                if (svc == null)
-                     return;   
++                    return;
  
                  using (var stream = IgniteManager.Memory.Get(memPtr).GetStream())
                  {


Mime
View raw message