[Boost-commit] svn:boost r76290 - trunk/libs/mpi/src/python

Subject: [Boost-commit] svn:boost r76290 - trunk/libs/mpi/src/python
From: troyer_at_[hidden]
Date: 2012-01-03 12:27:56

Author: troyer
Date: 2012-01-03 12:27:54 EST (Tue, 03 Jan 2012)
New Revision: 76290
URL: http://svn.boost.org/trac/boost/changeset/76290

Log:
Applied patch for #4657
Text files modified: 
   trunk/libs/mpi/src/python/datatypes.cpp      |     2 +                                       
   trunk/libs/mpi/src/python/py_environment.cpp |    62 ++++++++++++++++++++++++++++++++++++++- 
   2 files changed, 61 insertions(+), 3 deletions(-)

Modified: trunk/libs/mpi/src/python/datatypes.cpp
==============================================================================
--- trunk/libs/mpi/src/python/datatypes.cpp	(original)
+++ trunk/libs/mpi/src/python/datatypes.cpp	2012-01-03 12:27:54 EST (Tue, 03 Jan 2012)
@@ -17,7 +17,9 @@
 
 void export_datatypes()
 {
+#if PY_MAJOR_VERSION < 3 
   register_serialized(long(0), &PyInt_Type);
+#endif
   register_serialized(false, &PyBool_Type);
   register_serialized(double(0.0), &PyFloat_Type);
 }

Modified: trunk/libs/mpi/src/python/py_environment.cpp
==============================================================================
--- trunk/libs/mpi/src/python/py_environment.cpp	(original)
+++ trunk/libs/mpi/src/python/py_environment.cpp	2012-01-03 12:27:54 EST (Tue, 03 Jan 2012)
@@ -11,6 +11,9 @@
  *  This file reflects the Boost.MPI "environment" class into Python
  *  methods at module level.
  */
+
+#include <locale>
+#include <string>
 #include <boost/python.hpp>
 #include <boost/mpi.hpp>
 
@@ -50,11 +53,64 @@
 
   // If anything changed, convert C-style argc/argv into Python argv
   if (mpi_argv != my_argv)
+  {
+#if PY_MAJOR_VERSION >= 3
+
+    wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
+    /* We need a second copy, as Python might modify the first one. */
+    wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
+
+    if (!argv_copy || !argv_copy2) {
+      fprintf(stderr, "out of memory\n");
+      return false;
+    }
+
+    std::locale mylocale;
+    mbstate_t mystate;
+
+    const std::codecvt<char, wchar_t, mbstate_t>& myfacet =
+      std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale);
+
+    for (int i = 0; i < mpi_argc; i++) 
+    {
+      size_t length = strlen(mpi_argv[i]);
+
+      wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1));
+
+      const char *from_next;
+      wchar_t *to_next;
+
+      std::codecvt<wchar_t,char,mbstate_t>::result myresult = 
+        myfacet.out(mystate,
+            mpi_argv[i], mpi_argv[i] + length + 1, from_next,
+            dest, dest+length+1, to_next);
+
+      if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok )
+      {
+        fprintf(stderr, "failure translating argv\n");
+        return 1;
+      }
+
+      argv_copy2[i] = argv_copy[i] = dest;
+      if (!argv_copy[i])
+          return false;
+    }
+
+    PySys_SetArgv(mpi_argc, argv_copy);
+
+    for (int i = 0; i < mpi_argc; i++) {
+        PyMem_Free(argv_copy2[i]);
+    }
+    PyMem_Free(argv_copy);
+    PyMem_Free(argv_copy2);
+#else
     PySys_SetArgv(mpi_argc, mpi_argv);
+#endif
+  }
 
-  for (int arg = 0; arg < my_argc; ++arg)
-    free(my_argv[arg]);
-  delete [] my_argv;
+  for (int arg = 0; arg < mpi_argc; ++arg)
+    free(mpi_argv[arg]);
+  delete [] mpi_argv;
 
   return true;
 }