From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id DC3F43858D28; Wed, 18 Jan 2023 19:35:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DC3F43858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674070509; bh=hGC7EeL2K3M739mflxKh+VYRqHS12UJVME7dllYUBTo=; h=From:To:Subject:Date:From; b=AUq8JWwooJDaMypdiKaFcAkv1WUE6D/YdGFWn6dh+C+ZjjtwZ956oHUCSV7i/jPgF KW47XQiHjveio7Ish4nCU163imaR+Yc4JyiMhH8Dr8uMOZDprAzx5Q376bKGDefuN3 V3vPyOmH7aXRMRbHBTJ2+Qzp83X+Y/3L9cOQKh9k= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_4-branch] Cygwin: open_shared: always bump next_address X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/cygwin-3_4-branch X-Git-Oldrev: cbc513cf3d32b59aa63bfdd08ae4f121309b78be X-Git-Newrev: 0aa1c038196d04d0dfc8dc0f0f30e247e0c1e1e3 Message-Id: <20230118193509.DC3F43858D28@sourceware.org> Date: Wed, 18 Jan 2023 19:35:09 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D0aa1c038196= d04d0dfc8dc0f0f30e247e0c1e1e3 commit 0aa1c038196d04d0dfc8dc0f0f30e247e0c1e1e3 Author: Corinna Vinschen AuthorDate: Wed Jan 18 19:59:48 2023 +0100 Commit: Corinna Vinschen CommitDate: Wed Jan 18 20:17:23 2023 +0100 Cygwin: open_shared: always bump next_address =20 The new loop in open_shared has a subtil performance problem. Next_address is bumped only if mapping at this address failed. Every subsequent call to open_shared has a high probability having to call MapViewOfFileEx twice, because next_address is still set to the address of the last successful mapping. =20 Avoid this by bumping next_address every time. =20 While at it, fix a comment. =20 Conflict: Missing backport of 31302b267b86 ("Cygwin: drop fixed address= es for standard shared regions") Fixes: dc0fe7742b8c ("Cygwin: open_shared: try harder allocating a shar= ed region") Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/mm/shared.cc | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/winsup/cygwin/mm/shared.cc b/winsup/cygwin/mm/shared.cc index d23cc8e0e510..2ea3a4336351 100644 --- a/winsup/cygwin/mm/shared.cc +++ b/winsup/cygwin/mm/shared.cc @@ -184,25 +184,21 @@ open_shared (const WCHAR *name, int n, HANDLE& shared= _h, DWORD size, { /* Locate shared regions in the area between SHARED_REGIONS_ADDRESS_= LOW and SHARED_REGIONS_ADDRESS_HIGH, retrying until we have a slot. - Don't use MapViewOfFile3 (loader deadlock during fork. */ + Don't use MapViewOfFile3 (STATUS_DLL_INIT_FAILED during fork). */ bool loop =3D false; =20 - addr =3D (void *) next_address; do { + addr =3D (void *) next_address; shared =3D MapViewOfFileEx (shared_h, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0, addr); - if (!shared) + next_address +=3D wincap.allocation_granularity (); + if (next_address >=3D SHARED_REGIONS_ADDRESS_HIGH) { - next_address +=3D wincap.allocation_granularity (); - if (next_address >=3D SHARED_REGIONS_ADDRESS_HIGH) - { - if (loop) - break; - next_address =3D SHARED_REGIONS_ADDRESS_LOW; - loop =3D true; - } - addr =3D (void *) next_address; + if (!shared && loop) + break; + next_address =3D SHARED_REGIONS_ADDRESS_LOW; + loop =3D true; } } while (!shared);