From 36d7a5b25b9713fe4f068e3d5246af074439d8db Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Tue, 12 Oct 2021 15:05:57 -0400 Subject: [PATCH] Update to 4.1.1rc4 --- pmix.spec | 17 +++++++++------ simptest.h | 62 ------------------------------------------------------ sources | 2 +- 3 files changed, 11 insertions(+), 70 deletions(-) delete mode 100644 simptest.h diff --git a/pmix.spec b/pmix.spec index 7461f76..d4e573b 100644 --- a/pmix.spec +++ b/pmix.spec @@ -1,11 +1,12 @@ +%global name_version %{name}-%{version}rc4 + Name: pmix -Version: 4.1.0 -Release: 2%{?dist} +Version: 4.1.1 +Release: 0.1.rc4%{?dist} Summary: Process Management Interface Exascale (PMIx) License: BSD URL: https://pmix.org/ -Source0: https://github.com/pmix/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 -Source1: simptest.h +Source0: https://github.com/pmix/%{name}/releases/download/v%{version}/%{name_version}.tar.bz2 BuildRequires: autoconf BuildRequires: automake @@ -58,14 +59,13 @@ based starters (e.g., mpirun). * pevent - inject an event into the system %prep -%setup -q -n %{name}-%{version} -cp %SOURCE1 test/simple +%setup -q -n %{name_version} # touch lexer sources to recompile them find src -name \*.l -print -exec touch --no-create {} \; %build -%{_builddir}/%{name}-%{version}/autogen.pl +%{_builddir}/%{name_version}/autogen.pl export CFLAGS="%{build_cflags} -Wno-unused-function -Wno-attributes" %configure \ --prefix=%{_prefix} \ @@ -111,6 +111,9 @@ find %{buildroot} -name '*.la' | xargs rm -f %{_bindir}/* %changelog +* Tue Oct 12 2021 Philip Kovacs - 4.1.1-0.1.rc4 +- Update to 4.1.1rc4 + * Mon Oct 11 2021 Philip Kovacs - 4.1.0-2 - Add zlib support diff --git a/simptest.h b/simptest.h deleted file mode 100644 index 6482e17..0000000 --- a/simptest.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2018-2020 Intel, Inc. All rights reserved. - * Copyright (c) 2021 Nanook Consulting. All rights reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - * - */ - -#include -#include -#include -#include -#include - -typedef struct { - pthread_mutex_t mutex; - pthread_cond_t cond; - volatile bool active; - pmix_status_t status; -} mylock_t; - -#define DEBUG_CONSTRUCT_LOCK(l) \ - do { \ - pthread_mutex_init(&(l)->mutex, NULL); \ - pthread_cond_init(&(l)->cond, NULL); \ - (l)->active = true; \ - (l)->status = PMIX_SUCCESS; \ - } while (0) - -#define DEBUG_DESTRUCT_LOCK(l) \ - do { \ - pthread_mutex_destroy(&(l)->mutex); \ - pthread_cond_destroy(&(l)->cond); \ - } while (0) - -#define DEBUG_WAIT_THREAD(lck) \ - do { \ - pthread_mutex_lock(&(lck)->mutex); \ - while ((lck)->active) { \ - pthread_cond_wait(&(lck)->cond, &(lck)->mutex); \ - } \ - pthread_mutex_unlock(&(lck)->mutex); \ - } while (0) - -#define DEBUG_WAKEUP_THREAD(lck) \ - do { \ - pthread_mutex_lock(&(lck)->mutex); \ - (lck)->active = false; \ - pthread_cond_broadcast(&(lck)->cond); \ - pthread_mutex_unlock(&(lck)->mutex); \ - } while (0) - -#define SIMPTEST_THREADSHIFT(r, c) \ - do { \ - pmix_event_assign(&((r)->ev), simptest_evbase, -1, EV_WRITE, (c), (r)); \ - PMIX_POST_OBJECT((r)); \ - pmix_event_active(&((r)->ev), EV_WRITE, 1); \ - } while (0) - diff --git a/sources b/sources index cee988f..21cdcb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pmix-4.1.0.tar.bz2) = d60a9d7f202e5a16ecda243748c60a5ec940a14977779eaacc971728d9b2c2b7a7abaa234d011aad50f344ffa4079522d236897d3d95b356916d71f766586440 +SHA512 (pmix-4.1.1rc4.tar.bz2) = d31ea18c2ebda1146d6b4636c44713e628c6862ec4acb27f450a15bae2fdcae403728262f91f2f9226a0a4d16f811d8bef81559a91a4d5550ffdd2f6ec16f249