kc3-lang/gnulib/lib/mbtowc-lock.h

• Show log

  Commit

• Hash : cf73cf0f
  Author :
  Date : 2020-01-03T11:41:49
  

  mbrtowc: Ensure the mbtowc_lock is unique.
  
  * lib/mbtowc-lock.c: New file, based on lib/setlocale-lock.c.
  * lib/mbtowc-lock.h: New file, extracted from lib/mbrtowc.c and
  lib/setlocale_null.c.
  * lib/mbrtowc.c: Include headers needed for mbtowc-lock.h. Don't include
  glthread/lock.h. Include mbtowc-lock.h.
  (mbtowc_lock): Remove declaration.
  (mbrtowc): Use mbtowc_with_lock.
  * m4/mbrtowc.m4 (gl_FUNC_MBRTOWC): Require gl_PTHREADLIB. Check for
  threads.h. Set LIB_MBRTOWC.
  (gl_PREREQ_MBTOWC_LOCK): New macro.
  * modules/mbrtowc (Files): Add lib/mbtowc-lock.h, lib/mbtowc-lock.c,
  lib/windows-initguard.h, m4/threadlib.m4, m4/visibility.m4.
  (Depends-on): Remove lock.
  (configure.ac): Arrange to compile mbtowc-lock.c.
  (Link): Mention $(LIB_MBRTOWC) instead of $(LIBTHREAD).
  * modules/acl (Link): Likewise.
  * modules/argmatch (Link): Likewise.
  * modules/backup-rename (Link): Likewise.
  * modules/backupfile (Link): Likewise.
  * modules/closein (Link): Likewise.
  * modules/closeout (Link): Likewise.
  * modules/copy-file (Link): Likewise.
  * modules/csharpcomp (Link): Likewise.
  * modules/csharpexec (Link): Likewise.
  * modules/dfa (Link): Likewise.
  * modules/exclude (Link): Likewise.
  * modules/fnmatch (Link): Likewise.
  * modules/fnmatch-gnu (Link): Likewise.
  * modules/fnmatch-posix (Link): Likewise.
  * modules/glob (Link): Likewise.
  * modules/human (Link): Likewise.
  * modules/javacomp (Link): Likewise.
  * modules/javaexec (Link): Likewise.
  * modules/javaversion (Link): Likewise.
  * modules/mbfile (Link): Likewise.
  * modules/mbiter (Link): Likewise.
  * modules/mbmemcasecmp (Link): Likewise.
  * modules/mbmemcasecoll (Link): Likewise.
  * modules/mbrlen (Link): Likewise.
  * modules/mbscasecmp (Link): Likewise.
  * modules/mbscasestr (Link): Likewise.
  * modules/mbschr (Link): Likewise.
  * modules/mbscspn (Link): Likewise.
  * modules/mbsinit (Link): Likewise.
  * modules/mbslen (Link): Likewise.
  * modules/mbsncasecmp (Link): Likewise.
  * modules/mbsnlen (Link): Likewise.
  * modules/mbsnrtowcs (Link): Likewise.
  * modules/mbspbrk (Link): Likewise.
  * modules/mbspcasecmp (Link): Likewise.
  * modules/mbsrchr (Link): Likewise.
  * modules/mbsrtowcs (Link): Likewise.
  * modules/mbssep (Link): Likewise.
  * modules/mbsspn (Link): Likewise.
  * modules/mbsstr (Link): Likewise.
  * modules/mbstok_r (Link): Likewise.
  * modules/mbswidth (Link): Likewise.
  * modules/mbuiter (Link): Likewise.
  * modules/mkdir-p (Link): Likewise.
  * modules/propername (Link): Likewise.
  * modules/quote (Link): Likewise.
  * modules/quotearg (Link): Likewise.
  * modules/quotearg-simple (Link): Likewise.
  * modules/regex-quote (Link): Likewise.
  * modules/rpmatch (Link): Likewise.
  * modules/sh-quote (Link): Likewise.
  * modules/system-quote (Link): Likewise.
  * modules/trim (Link): Likewise.
  * modules/unistdio/ulc-asnprintf (Link): Likewise.
  * modules/unistdio/ulc-fprintf (Link): Likewise.
  * modules/unistdio/ulc-vasnprintf (Link): Likewise.
  * modules/unistdio/ulc-vasprintf (Link): Likewise.
  * modules/unistdio/ulc-vfprintf (Link): Likewise.
  * modules/unistdio/ulc-vsnprintf (Link): Likewise.
  * modules/unistdio/ulc-vsprintf (Link): Likewise.
  * modules/xfreopen (Link): Likewise.
  * modules/xmemcoll (Link): Likewise.
  * modules/yesno (Link): Likewise.
  * modules/regex (Link): Add $(LIB_MBRTOWC).
  * modules/acl-tests (Makefile.am): Link the programs with $(LIB_MBRTOWC)
  instead of $(LIBTHREAD).
  * modules/argmatch-tests (Makefile.am): Likewise.
  * modules/closein-tests (Makefile.am): Likewise.
  * modules/copy-file-tests (Makefile.am): Likewise.
  * modules/dfa-tests (Makefile.am): Likewise.
  * modules/fnmatch-tests (Makefile.am): Likewise.
  * modules/glob-tests (Makefile.am): Likewise.
  * modules/mbmemcasecmp-tests (Makefile.am): Likewise.
  * modules/mbmemcasecoll-tests (Makefile.am): Likewise.
  * modules/mbrtowc-tests (Makefile.am): Likewise.
  * modules/mbscasecmp-tests (Makefile.am): Likewise.
  * modules/mbscasestr-tests (Makefile.am): Likewise.
  * modules/mbschr-tests (Makefile.am): Likewise.
  * modules/mbscspn-tests (Makefile.am): Likewise.
  * modules/mbsinit-tests (Makefile.am): Likewise.
  * modules/mbsncasecmp-tests (Makefile.am): Likewise.
  * modules/mbsnrtowcs-tests (Makefile.am): Likewise.
  * modules/mbspbrk-tests (Makefile.am): Likewise.
  * modules/mbspcasecmp-tests (Makefile.am): Likewise.
  * modules/mbsrchr-tests (Makefile.am): Likewise.
  * modules/mbsrtowcs-tests (Makefile.am): Likewise.
  * modules/mbsspn-tests (Makefile.am): Likewise.
  * modules/mbsstr-tests (Makefile.am): Likewise.
  * modules/quotearg-simple-tests (Makefile.am): Likewise.
  * modules/quotearg-tests (Makefile.am): Likewise.
  * modules/readtokens-tests (Makefile.am): Likewise.
  * modules/sh-quote-tests (Makefile.am): Likewise.
  * modules/system-quote-tests (Makefile.am): Likewise.
  * modules/unistdio/ulc-asnprintf-tests (Makefile.am): Likewise.
  * modules/unistdio/ulc-vasnprintf-tests (Makefile.am): Likewise.
  * modules/unistdio/ulc-vasprintf-tests (Makefile.am): Likewise.
  * modules/unistdio/ulc-vsnprintf-tests (Makefile.am): Likewise.
  * modules/unistdio/ulc-vsprintf-tests (Makefile.am): Likewise.
  * modules/yesno-tests (Makefile.am): Likewise.
  * modules/exclude-tests (Makefile.am): Link the programs with
  $(LIB_MBRTOWC).
  * modules/regex-tests (Makefile.am): Likewise.
  * modules/regex-quote-tests (Makefile.am): Likewise.
  

Download

• lib/mbtowc-lock.h

• /* Use the internal lock used by mbrtowc and mbrtoc32.
     Copyright (C) 2019-2020 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
  
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
  
  /* Written by Bruno Haible <bruno@clisp.org>, 2019-2020.  */
  
  /* Use a lock, so that no two threads can invoke mbtowc at the same time.  */
  
  static inline int
  mbtowc_unlocked (wchar_t *pwc, const char *p, size_t m)
  {
    /* Put the hidden internal state of mbtowc into its initial state.
       This is needed at least with glibc, uClibc, and MSVC CRT.
       See <https://sourceware.org/bugzilla/show_bug.cgi?id=9674>.  */
    mbtowc (NULL, NULL, 0);
  
    return mbtowc (pwc, p, m);
  }
  
  /* Prohibit renaming this symbol.  */
  #undef gl_get_mbtowc_lock
  
  #if defined _WIN32 && !defined __CYGWIN__
  
  extern __declspec(dllimport) CRITICAL_SECTION *gl_get_mbtowc_lock (void);
  
  static int
  mbtowc_with_lock (wchar_t *pwc, const char *p, size_t m)
  {
    CRITICAL_SECTION *lock = gl_get_mbtowc_lock ();
    int ret;
  
    EnterCriticalSection (lock);
    ret = mbtowc_unlocked (pwc, p, m);
    LeaveCriticalSection (lock);
  
    return ret;
  }
  
  #elif HAVE_PTHREAD_API /* AIX, IRIX, Cygwin */
  
  extern
  # if defined _WIN32 || defined __CYGWIN__
    __declspec(dllimport)
  # endif
    pthread_mutex_t *gl_get_mbtowc_lock (void);
  
  # if HAVE_WEAK_SYMBOLS /* IRIX */
  
     /* Avoid the need to link with '-lpthread'.  */
  #  pragma weak pthread_mutex_lock
  #  pragma weak pthread_mutex_unlock
  
     /* Determine whether libpthread is in use.  */
  #  pragma weak pthread_mutexattr_gettype
     /* See the comments in lock.h.  */
  #  define pthread_in_use() \
       (pthread_mutexattr_gettype != NULL || c11_threads_in_use ())
  
  # else
  #  define pthread_in_use() 1
  # endif
  
  static int
  mbtowc_with_lock (wchar_t *pwc, const char *p, size_t m)
  {
    if (pthread_in_use())
      {
        pthread_mutex_t *lock = gl_get_mbtowc_lock ();
        int ret;
  
        if (pthread_mutex_lock (lock))
          abort ();
        ret = mbtowc_unlocked (pwc, p, m);
        if (pthread_mutex_unlock (lock))
          abort ();
  
        return ret;
      }
    else
      return mbtowc_unlocked (pwc, p, m);
  }
  
  #elif HAVE_THREADS_H
  
  extern mtx_t *gl_get_mbtowc_lock (void);
  
  static int
  mbtowc_with_lock (wchar_t *pwc, const char *p, size_t m)
  {
    mtx_t *lock = gl_get_mbtowc_lock ();
    int ret;
  
    if (mtx_lock (lock) != thrd_success)
      abort ();
    ret = mbtowc_unlocked (pwc, p, m);
    if (mtx_unlock (lock) != thrd_success)
      abort ();
  
    return ret;
  }
  
  #endif
  

Download