public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: "Marc Poulhiès" <poulhies@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Ronan Desplanques <desplanques@adacore.com>
Subject: [COMMITTED 16/30] ada: Fix usage of SetThreadAffinityMask
Date: Mon, 10 Jun 2024 11:07:32 +0200	[thread overview]
Message-ID: <20240610090747.1557638-16-poulhies@adacore.com> (raw)
In-Reply-To: <20240610090747.1557638-1-poulhies@adacore.com>

From: Ronan Desplanques <desplanques@adacore.com>

This patches fixes the signature of the binding to SetThreadAffinityMask
in the run-time library. It also fixes the error checking after calls
to SetThreadAffinityMask. The previous code behaved as if
SetThreadAffinityMask returned 1 on success, but it in fact returns a
pointer value on success and 0 on failure.

gcc/ada/

	* libgnarl/s-taprop__mingw.adb (Set_Task_Affinity): Fix usage of
	SetThreadAffinityMask.
	* libgnat/s-winext.ads (SetThreadAffinityMask): Fix binding
	signature.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/libgnarl/s-taprop__mingw.adb | 6 +++---
 gcc/ada/libgnat/s-winext.ads         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcc/ada/libgnarl/s-taprop__mingw.adb b/gcc/ada/libgnarl/s-taprop__mingw.adb
index 38e281cb721..f77d71970b8 100644
--- a/gcc/ada/libgnarl/s-taprop__mingw.adb
+++ b/gcc/ada/libgnarl/s-taprop__mingw.adb
@@ -1340,7 +1340,7 @@ package body System.Task_Primitives.Operations is
       then
          declare
             CPU_Set : DWORD := 0;
-
+            Mask_Result : DWORD_PTR;
          begin
             for Proc in T.Common.Domain'Range loop
                if T.Common.Domain (Proc) then
@@ -1352,8 +1352,8 @@ package body System.Task_Primitives.Operations is
                end if;
             end loop;
 
-            Result := SetThreadAffinityMask (T.Common.LL.Thread, CPU_Set);
-            pragma Assert (Result = 1);
+            Mask_Result := SetThreadAffinityMask (T.Common.LL.Thread, CPU_Set);
+            pragma Assert (Mask_Result /= 0);
          end;
       end if;
    end Set_Task_Affinity;
diff --git a/gcc/ada/libgnat/s-winext.ads b/gcc/ada/libgnat/s-winext.ads
index 3f14fc04e60..b402a5615c9 100644
--- a/gcc/ada/libgnat/s-winext.ads
+++ b/gcc/ada/libgnat/s-winext.ads
@@ -55,7 +55,7 @@ package System.Win32.Ext is
 
    function SetThreadAffinityMask
      (hThread              : HANDLE;
-      dwThreadAffinityMask : DWORD) return DWORD;
+      dwThreadAffinityMask : DWORD) return DWORD_PTR;
    pragma Import (Stdcall, SetThreadAffinityMask, "SetThreadAffinityMask");
 
    --------------
-- 
2.45.1


  parent reply	other threads:[~2024-06-10  9:08 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-10  9:07 [COMMITTED 01/30] ada: Refactor checks for Refined_Global in generic instances Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 02/30] ada: Refactor checks for Refined_Depends " Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 03/30] ada: Remove unnecessary guard against empty list Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 04/30] ada: Fix handling of aspects CPU and Interrupt_Priority Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 05/30] ada: Cleanup building of error messages for class-wide contracts Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 06/30] ada: Refactor common code for dynamic and static class-wide preconditions Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 07/30] ada: Add switch to disable expansion of assertions in CodePeer mode Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 08/30] ada: Enable inlining for subprograms with multiple return statements Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 09/30] ada: Simplify check for type without stream operations Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 10/30] ada: Skip processing of NUL character for attribute Type_Key Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 11/30] ada: Adjust comments and doc about the new use of restriction No_Streams Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 12/30] ada: Cleanup repeated code in expansion of stream attributes Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 13/30] ada: Fix incorrect lower bound presumption in gnatlink Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 14/30] ada: Remove incorrect assertion in run-time Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 15/30] ada: Fix usage of SetThreadIdealProcessor Marc Poulhiès
2024-06-10  9:07 ` Marc Poulhiès [this message]
2024-06-10  9:07 ` [COMMITTED 17/30] ada: Remove streaming facilities from generics for formal containers Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 18/30] ada: Tune code related to potentially unevaluated expressions Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 19/30] ada: Fix references to Ada RM in comments Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 20/30] ada: Further refine 'Super attribute Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 21/30] ada: Unreferenced warning on abstract subprogram Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 22/30] ada: Crash checking accessibility level on private type Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 23/30] ada: Iterator filter ignored on formal loop Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 24/30] ada: Missing style check for extra parentheses in operators Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 25/30] ada: Resolve compilation issues with container aggregates in draft ACATS B tests Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 26/30] ada: For freezing, treat an extension or delta aggregate like a regular aggregate Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 27/30] ada: Minor code adjustment to "not Present" test Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 28/30] ada: Derived type with convention C must override convention C_Pass_By_Copy Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 29/30] ada: Storage_Error in indirect call to function returning limited type Marc Poulhiès
2024-06-10  9:07 ` [COMMITTED 30/30] ada: Add support for No_Implicit_Conditionals to nonbinary modular types Marc Poulhiès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240610090747.1557638-16-poulhies@adacore.com \
    --to=poulhies@adacore.com \
    --cc=desplanques@adacore.com \
    --cc=gcc-patches@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).