Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-parmap for openSUSE:Factory
checked in at 2022-04-06 21:51:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-parmap (Old)
and /work/SRC/openSUSE:Factory/.ocaml-parmap.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-parmap"
Wed Apr 6 21:51:20 2022 rev:11 rq:967064 version:1.2.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-parmap/ocaml-parmap.changes
2021-05-10 15:41:57.756949544 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-parmap.new.1900/ocaml-parmap.changes
2022-04-06 21:51:39.567452105 +0200
@@ -1,0 +2,6 @@
+Mon Apr 4 04:04:04 UTC 2022 - oher...@suse.de
+
+- Update to version 1.2.4
+ fix naked pointers
+
+-------------------------------------------------------------------
Old:
----
ocaml-parmap-1.2.3.tar.xz
New:
----
ocaml-parmap-1.2.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-parmap.spec ++++++
--- /var/tmp/diff_new_pack.Tld4AU/_old 2022-04-06 21:51:40.031446810 +0200
+++ /var/tmp/diff_new_pack.Tld4AU/_new 2022-04-06 21:51:40.035446765 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-parmap
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,17 @@
Name: ocaml-parmap
-Version: 1.2.3
+Version: 1.2.4
Release: 0
%{?ocaml_preserve_bytecode}
Summary: Multicore architecture exploitation for OCaml programs with
minimal modifications
License: LGPL-2.0-only
Group: Development/Languages/OCaml
URL: https://opam.ocaml.org/packages/parmap
-Source0: %{name}-%{version}.tar.xz
+Source0: %name-%version.tar.xz
BuildRequires: ocaml
BuildRequires: ocaml-dune >= 2.7
-BuildRequires: ocaml-rpm-macros >= 20210409
+BuildRequires: ocaml-rpm-macros >= 20220222
BuildRequires: ocamlfind(bigarray)
BuildRequires: ocamlfind(dune.configurator)
BuildRequires: ocamlfind(graphics)
@@ -44,13 +44,13 @@
parameter chunksize.
%package devel
-Summary: Development files for %{name}
+Summary: Development files for %name
Group: Development/Languages/OCaml
-Requires: %{name} = %{version}
+Requires: %name = %version
%description devel
-The %{name}-devel package contains libraries and signature files for
-developing applications that use %{name}.
+The %name-devel package contains libraries and signature files for
+developing applications that use %name.
%prep
@@ -75,8 +75,8 @@
export nProcs=2
%ocaml_dune_test
-%files -f %{name}.files
+%files -f %name.files
-%files devel -f %{name}.files.devel
+%files devel -f %name.files.devel
%changelog
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Tld4AU/_old 2022-04-06 21:51:40.071446354 +0200
+++ /var/tmp/diff_new_pack.Tld4AU/_new 2022-04-06 21:51:40.075446308 +0200
@@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="filename">ocaml-parmap</param>
- <param name="revision">f140dbc8b05aa3d341c70436a1920a06df9a0ed4</param>
+ <param name="revision">289660b0cdc71c0c6e88468ca9fb7ee218f30379</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="url">https://github.com/rdicosmo/parmap.git</param>
++++++ ocaml-parmap-1.2.3.tar.xz -> ocaml-parmap-1.2.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-1.2.3/src/parmap.ml
new/ocaml-parmap-1.2.4/src/parmap.ml
--- old/ocaml-parmap-1.2.3/src/parmap.ml 2021-05-02 19:11:46.000000000
+0200
+++ new/ocaml-parmap-1.2.4/src/parmap.ml 2022-01-02 23:29:28.000000000
+0100
@@ -718,11 +718,11 @@
array: the data in Bigarray is placed at offset 1 w.r.t. a normal array,
so we get a pointer to that zone into arr_out_as_array, and have it typed
as a float array *)
- let barr_out_as_array = Array.unsafe_get (Obj.magic barr_out) 1 in
+ (*let barr_out_as_array = Array.unsafe_get (Obj.magic barr_out) 1 in*)
let compute _ lo hi _ exc_handler =
try
for i=lo to hi do
- Array.unsafe_set barr_out_as_array i (f i (Array.unsafe_get al i))
+ Bigarray.Array1.unsafe_set barr_out i (f i (Array.unsafe_get al i))
done
with e -> exc_handler e lo
in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-1.2.3/src/setcore_stubs.c
new/ocaml-parmap-1.2.4/src/setcore_stubs.c
--- old/ocaml-parmap-1.2.3/src/setcore_stubs.c 2021-05-02 19:11:46.000000000
+0200
+++ new/ocaml-parmap-1.2.4/src/setcore_stubs.c 2022-01-02 23:29:28.000000000
+0100
@@ -12,14 +12,26 @@
#include <unistd.h>
#include <errno.h>
#include <caml/mlvalues.h>
+#ifdef _WIN32
+#include <windows.h>
+#endif
+static int get_numcores() {
+#ifdef _WIN32
+ SYSTEM_INFO sysinfo;
+ GetSystemInfo(&sysinfo);
+ return sysinfo.dwNumberOfProcessors;
+#else
+ return sysconf( _SC_NPROCESSORS_ONLN );
+#endif
+}
CAMLprim value numcores(value unit) {
- int numcores = sysconf( _SC_NPROCESSORS_ONLN );
+ int numcores = get_numcores();
return Val_int(numcores);
}
CAMLprim value setcore(value which) {
- int numcores = sysconf( _SC_NPROCESSORS_ONLN );
+ int numcores = get_numcores();
int w = Int_val(which) % numcores; // stay in the space of existing cores
#if HAVE_DECL_SCHED_SETAFFINITY
cpu_set_t cpus;
