From 34ad6d212d7db9011f756da4e656ab2b472aa2db Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Mon, 18 Dec 2023 20:38:11 +0100 Subject: [PATCH] first attempt --- .github/workflows/bsd.yml | 76 ++++++++++++++++---------------- .github/workflows/build.yml | 12 ++--- psutil/arch/windows/proc_utils.c | 6 +-- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml index 3af8d2371c..335c7fcb93 100644 --- a/.github/workflows/bsd.yml +++ b/.github/workflows/bsd.yml @@ -27,41 +27,41 @@ jobs: make install make test make test-memleaks - openbsd: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - name: Run tests - uses: vmactions/openbsd-vm@v1 - with: - usesh: true - prepare: | - set -e - pkg_add gcc python3 - run: | - set -e - make install-pip - python3 -m pip install --user setuptools - make install - make test - make test-memleaks - netbsd: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - name: Run tests - uses: vmactions/netbsd-vm@v1 - with: - usesh: true - prepare: | - set -e - /usr/sbin/pkg_add -v pkgin - pkgin update - pkgin -y install python311-* py311-setuptools-* gcc12-* - run: | - set -e - make install-pip PYTHON=python3.11 - python3.11 -m pip install --user setuptools - make install PYTHON=python3.11 - make test PYTHON=python3.11 - make test-memleaks PYTHON=python3.11 + # openbsd: + # runs-on: ubuntu-22.04 + # steps: + # - uses: actions/checkout@v4 + # - name: Run tests + # uses: vmactions/openbsd-vm@v1 + # with: + # usesh: true + # prepare: | + # set -e + # pkg_add gcc python3 + # run: | + # set -e + # make install-pip + # python3 -m pip install --user setuptools + # make install + # make test + # make test-memleaks + # netbsd: + # runs-on: ubuntu-22.04 + # steps: + # - uses: actions/checkout@v4 + # - name: Run tests + # uses: vmactions/netbsd-vm@v1 + # with: + # usesh: true + # prepare: | + # set -e + # /usr/sbin/pkg_add -v pkgin + # pkgin update + # pkgin -y install python311-* py311-setuptools-* gcc12-* + # run: | + # set -e + # make install-pip PYTHON=python3.11 + # python3.11 -m pip install --user setuptools + # make install PYTHON=python3.11 + # make test PYTHON=python3.11 + # make test-memleaks PYTHON=python3.11 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f600b9d16f..3844265173 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,14 +25,14 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-latest - archs: "x86_64 i686" - - os: macos-12 - archs: "x86_64 arm64" + # - os: ubuntu-latest + # archs: "x86_64 i686" + # - os: macos-12 + # archs: "x86_64 arm64" - os: windows-2019 archs: "AMD64" - - os: windows-2019 - archs: "x86" + # - os: windows-2019 + # archs: "x86" steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v4 diff --git a/psutil/arch/windows/proc_utils.c b/psutil/arch/windows/proc_utils.c index dac1129c0f..ebf4ee3fc4 100644 --- a/psutil/arch/windows/proc_utils.c +++ b/psutil/arch/windows/proc_utils.c @@ -113,9 +113,9 @@ psutil_check_phandle(HANDLE hProcess, DWORD pid, int check_exit_code) { if (GetExitCodeProcess(hProcess, &exitCode)) { // XXX - maybe STILL_ACTIVE is not fully reliable as per: // http://stackoverflow.com/questions/1591342/#comment47830782_1591379 - if (exitCode == STILL_ACTIVE) { - return hProcess; - } + // if (exitCode == STILL_ACTIVE) { + // return hProcess; + // } if (psutil_pid_in_pids(pid) == 1) { return hProcess; }