[GR-61499] Build bz2 module for windows

msimacek · msimacek · commit 879c840845cf · 2025-01-21T12:04:47.000Z
PullRequest: graalpython/3651
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_bz2.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_bz2.txt
diff --git a/graalpython/lib-python/3/test/conftest.toml b/graalpython/lib-python/3/test/conftest.toml
@@ -47,11 +47,3 @@ selector = [
     # when the runner exits. We don't know which tests can trigger this, so we exclude the whole file.
     'test_multiprocessing_graalpy',
 ]
-
-[[test_rules]]
-exclude_on = ['win32']
-selector = [
-    # TODO fails to load bz2 library
-    # java.lang.UnsatisfiedLinkError: ...\lib-graalpython\bz2support.dll GetLastError: 126
-    'test_bz2',
-]
diff --git a/graalpython/lib-python/3/test/test_bz2.py b/graalpython/lib-python/3/test/test_bz2.py
@@ -677,7 +677,6 @@ def testCompress4G(self, size):
         finally:
             data = None
 
-    @support.impl_detail("GR-27707: basicsize for native objects not yet supported", graalpy=False)
     def testPickle(self):
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
             with self.assertRaises(TypeError):
@@ -736,7 +735,6 @@ def testDecompress4G(self, size):
             compressed = None
             decompressed = None
 
-    @support.impl_detail("GR-27707: basicsize for native objects not yet supported", graalpy=False)
     def testPickle(self):
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
             with self.assertRaises(TypeError):
diff --git a/graalpython/python-libbz2/CMakeLists.txt b/graalpython/python-libbz2/CMakeLists.txt
@@ -44,7 +44,7 @@ add_library(${TARGET_BZIP2SUPPORT} SHARED)
 target_compile_definitions(${TARGET_BZIP2SUPPORT} PRIVATE NDEBUG)
 
 if(WIN32)
-    target_compile_options(${TARGET_BZIP2SUPPORT} PRIVATE /O2 /WX)
+    target_compile_options(${TARGET_BZIP2SUPPORT} PRIVATE /O2)
 else()
     target_compile_options(${TARGET_BZIP2SUPPORT} PRIVATE -Wall -Werror -O3)
 endif()
@@ -53,7 +53,9 @@ endif()
 set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
 
 target_sources(${TARGET_BZIP2SUPPORT} PRIVATE "src/bz2.c")
-set_target_properties(${TARGET_BZIP2SUPPORT} PROPERTIES COMPILE_WARNING_AS_ERROR ON)
+if(NOT WIN32)
+    set_target_properties(${TARGET_BZIP2SUPPORT} PROPERTIES COMPILE_WARNING_AS_ERROR ON)
+endif()
 # variable 'BZIP2_SRC' is provided by file 'libbz2.cmake'
 target_include_directories(${TARGET_BZIP2SUPPORT} PRIVATE ${BZIP2_SRC})
 target_link_libraries(${TARGET_BZIP2SUPPORT} PRIVATE ${TARGET_LIBBZ2})
diff --git a/graalpython/python-libbz2/src/bz2.c b/graalpython/python-libbz2/src/bz2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -56,6 +56,14 @@
 
 typedef char  Byte;  /* 8 bits */
 
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#define API_FUNC __declspec(dllexport)
+#else
+#define API_FUNC
+#endif
+
 // Integer.MAX_INT
 #define GRAALPYTHON_MAX_SIZE (INT_MAX)
 
@@ -216,7 +224,7 @@ static void bz_release_buffer(off_heap_buffer *o) {
 }
 
 // nfi_function: name('createStream') map('bzst_stream*', 'POINTER')
-bzst_stream *bz_create_bzst_stream() {
+API_FUNC bzst_stream *bz_create_bzst_stream() {
     bzst_stream *bzst = (bzst_stream *) malloc(sizeof(bzst_stream));
     bzst->bzs.opaque = NULL;
     bzst->bzs.bzalloc = BZ2_Malloc;
@@ -236,7 +244,7 @@ bzst_stream *bz_create_bzst_stream() {
 }
 
 // nfi_function: name('getTimeElapsed') map('bzst_stream*', 'POINTER')  static(true)
-double bz_get_timeElapsed(bzst_stream* zst) {
+API_FUNC double bz_get_timeElapsed(bzst_stream* zst) {
 #ifdef BENCHMARK
     double t = bzst->timeElapsed;
     LOG_FINEST("time Elapsed: %.2f\n", t);
@@ -248,7 +256,7 @@ double bz_get_timeElapsed(bzst_stream* zst) {
 }
 
 // nfi_function: name('deallocateStream') map('bzst_stream*', 'POINTER')
-void bz_free_stream(bzst_stream* bzst) {
+API_FUNC void bz_free_stream(bzst_stream* bzst) {
     if (!bzst) {
         return;
     }
@@ -265,27 +273,27 @@ void bz_free_stream(bzst_stream* bzst) {
 }
 
 // nfi_function: name('gcReleaseHelper') map('bzst_stream*', 'POINTER') release(true)
-void bz_gc_helper(bzst_stream* bzst) {
+API_FUNC void bz_gc_helper(bzst_stream* bzst) {
     bz_free_stream(bzst);
 }
 
 // nfi_function: name('getNextInIndex') map('bzst_stream*', 'POINTER')
-ssize_t bz_get_next_in_index(bzst_stream *bzst) {
+API_FUNC ssize_t bz_get_next_in_index(bzst_stream *bzst) {
     return bzst->next_in_index;
 }
 
 // nfi_function: name('getBzsAvailInReal') map('bzst_stream*', 'POINTER')
-ssize_t bz_get_bzs_avail_in_real(bzst_stream *bzst) {
+API_FUNC ssize_t bz_get_bzs_avail_in_real(bzst_stream *bzst) {
     return bzst->bzs_avail_in_real;
 }
 
 // nfi_function: name('setBzsAvailInReal') map('bzst_stream*', 'POINTER')
-void bz_set_bzs_avail_in_real(bzst_stream *bzst, ssize_t v) {
+API_FUNC void bz_set_bzs_avail_in_real(bzst_stream *bzst, ssize_t v) {
     bzst->bzs_avail_in_real = v;
 }
 
 // nfi_function: name('getOutputBufferSize') map('bzst_stream*', 'POINTER')
-size_t bz_get_output_buffer_size(bzst_stream *bzst) {
+API_FUNC size_t bz_get_output_buffer_size(bzst_stream *bzst) {
     LOG_INFO("bz_get_output_buffer_size(%p)\n", bzst);
     size_t size = bzst->output_size;
     if (size > GRAALPYTHON_MAX_SIZE) {
@@ -303,7 +311,7 @@ static void clear_output(bzst_stream *bzst) {
 }
 
 // nfi_function: name('getOutputBuffer') map('bzst_stream*', 'POINTER')
-void bz_get_output_buffer(bzst_stream *bzst, Byte *dest) {
+API_FUNC void bz_get_output_buffer(bzst_stream *bzst, Byte *dest) {
     LOG_INFO("bz_get_off_heap_buffer(%p)\n", bzst);
     off_heap_buffer *buffer = bzst->output;
     size_t size = bzst->output_size;
@@ -376,7 +384,7 @@ grow_buffer(bzst_stream *bzst, ssize_t max_length) {
 
 
 // nfi_function: name('compressInit') map('bzst_stream*', 'POINTER')
-int bz_compressor_init(bzst_stream *bzst, int compresslevel) {
+API_FUNC int bz_compressor_init(bzst_stream *bzst, int compresslevel) {
     LOG_INFO("bz_compressor_init(%p, %d)\n", bzst, compresslevel);
     int bzerror = BZ2_bzCompressInit(&bzst->bzs, compresslevel, 0, 0);
     if (!isOK(bzerror)) {
@@ -387,7 +395,7 @@ int bz_compressor_init(bzst_stream *bzst, int compresslevel) {
 }
 
 // nfi_function: name('compress') map('bzst_stream*', 'POINTER')
-int bz_compress(bzst_stream *bzst, Byte *data, ssize_t len, int action, ssize_t bufsize) {
+API_FUNC int bz_compress(bzst_stream *bzst, Byte *data, ssize_t len, int action, ssize_t bufsize) {
     LOG_INFO("bz_compress(%p, %zd, %d, %zd)\n", bzst, len, action, bufsize);
     size_t data_size = 0;
 
@@ -462,7 +470,7 @@ int bz_compress(bzst_stream *bzst, Byte *data, ssize_t len, int action, ssize_t
  ************************************************/
 
 // nfi_function: name('decompressInit') map('bzst_stream*', 'POINTER')
-int bz_decompress_init(bzst_stream *bzst) {
+API_FUNC int bz_decompress_init(bzst_stream *bzst) {
     LOG_INFO("bz_decompress_init(%p)\n", bzst);
     int bzerror = BZ2_bzDecompressInit(&bzst->bzs, 0, 0);
     if (!isOK(bzerror)) {
@@ -479,7 +487,7 @@ int bz_decompress_init(bzst_stream *bzst) {
    returned, so some of the input may not be consumed. d->bzs.next_in and
    d->bzs_avail_in_real are updated to reflect the consumed input. */
 // nfi_function: name('decompress') map('bzst_stream*', 'POINTER')
-int bz_decompress(bzst_stream *bzst, 
+API_FUNC int bz_decompress(bzst_stream *bzst,
                 Byte *input_buffer, ssize_t offset, 
                 ssize_t max_length,
                 ssize_t bufsize, ssize_t bzs_avail_in_real) {
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
@@ -596,6 +596,7 @@
                 "bin/<lib:bz2support>",
             ],
             "cmakeConfig": {
+                "CMAKE_BUILD_TYPE": "Release",
                 "BZIP2_ROOT": "<path:BZIP2>",
                 "BZIP2_VERSION_MAJOR": "1",
                 "BZIP2_VERSION_MINOR": "0",
@@ -1073,6 +1074,7 @@
                                 "dependency:com.oracle.graal.python.jni/*",
                                 "dependency:com.oracle.graal.python.cext/bin/*",
                                 "dependency:com.oracle.graal.python.hpy.llvm/bin/*",
+                                "dependency:python-libbz2/bin/*",
                             ]
                         },
                     },
