ncurses 5.6 - patch 20080816

[ncurses.git] / ncurses / tinfo / lib_data.c

diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c
index 21b854b92b6f840cc56df61c9d7df4cacca7ad68..7e77ec014bb59862235c68ed1015e31f0ad9cf3f 100644 (file)
--- a/ncurses/tinfo/lib_data.c
+++ b/ncurses/tinfo/lib_data.c
@@ -41,7 +41,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_data.c,v 1.39 2008/01/13 01:21:59 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.51 2008/08/16 23:13:52 tom Exp $")

 
 /*
  * OS/2's native linker complains if we don't initialize public data when
 
 /*
  * OS/2's native linker complains if we don't initialize public data when


@@ -109,7 +109,7 @@ NCURSES_EXPORT_VAR(SCREEN *) SP = NULL; /* Some linkers require initialized data
 #define CHARS_0s { '\0' }
 
 #define TGETENT_0 { 0L, FALSE, NULL, NULL, NULL }
 #define CHARS_0s { '\0' }
 
 #define TGETENT_0 { 0L, FALSE, NULL, NULL, NULL }

-#define TGETENT_0s { TGETENT_0, TGETENT_0, TGETENT_0, TGETENT_0 } 
+#define TGETENT_0s { TGETENT_0, TGETENT_0, TGETENT_0, TGETENT_0 }

 
 NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
     0,                         /* have_sigwinch */
 
 NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
     0,                         /* have_sigwinch */


@@ -140,6 +140,8 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
     0,                         /* tgetent_index */
     0,                         /* tgetent_sequence */
 
     0,                         /* tgetent_index */
     0,                         /* tgetent_sequence */
 

+    0,                         /* _nc_windowlist */
+

 #if USE_HOME_TERMINFO
     NULL,                      /* home_terminfo */
 #endif
 #if USE_HOME_TERMINFO
     NULL,                      /* home_terminfo */
 #endif


@@ -166,26 +168,20 @@ NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
     NULL,                      /* tracedmp_buf */
     0,                         /* tracedmp_used */
 
     NULL,                      /* tracedmp_buf */
     0,                         /* tracedmp_used */
 

-    CHARS_0s,                  /* tracemse_buf */
-

     NULL,                      /* tracetry_buf */
     0,                         /* tracetry_used */
 
     NULL,                      /* tracetry_buf */
     0,                         /* tracetry_used */
 

-#ifndef USE_TERMLIB

     { CHARS_0s, CHARS_0s },    /* traceatr_color_buf */
     0,                         /* traceatr_color_sel */
     -1,                                /* traceatr_color_last */
     { CHARS_0s, CHARS_0s },    /* traceatr_color_buf */
     0,                         /* traceatr_color_sel */
     -1,                                /* traceatr_color_last */

-#endif /* USE_TERMLIB */

 
 #endif /* TRACE */
 #ifdef USE_PTHREADS
 
 #endif /* TRACE */
 #ifdef USE_PTHREADS

-    PTHREAD_MUTEX_INITIALIZER, /* mutex_set_SP */
-    PTHREAD_MUTEX_INITIALIZER, /* mutex_use_screen */
-    PTHREAD_MUTEX_INITIALIZER, /* mutex_use_window */
-    PTHREAD_MUTEX_INITIALIZER, /* mutex_windowlist */
+    PTHREAD_MUTEX_INITIALIZER, /* mutex_curses */

     PTHREAD_MUTEX_INITIALIZER, /* mutex_tst_tracef */
     PTHREAD_MUTEX_INITIALIZER, /* mutex_tracef */
     0,                         /* nested_tracef */
     PTHREAD_MUTEX_INITIALIZER, /* mutex_tst_tracef */
     PTHREAD_MUTEX_INITIALIZER, /* mutex_tracef */
     0,                         /* nested_tracef */

+    0,                         /* use_pthreads */

 #endif
 };
 
 #endif
 };
 


@@ -222,10 +218,14 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = {
        NUM_VARS_0s,            /* static_vars */
     },
     NULL,                      /* saved_tty */
        NUM_VARS_0s,            /* static_vars */
     },
     NULL,                      /* saved_tty */

+#if NCURSES_NO_PADDING
+    FALSE,                     /* flag to set if padding disabled  */
+#endif

 #if BROKEN_LINKER || USE_REENTRANT
     NULL,                      /* real_acs_map */
     0,                         /* LINES */
     0,                         /* COLS */
 #if BROKEN_LINKER || USE_REENTRANT
     NULL,                      /* real_acs_map */
     0,                         /* LINES */
     0,                         /* COLS */

+    0,                         /* cur_term */

 #ifdef TRACE
     0L,                                /* _outchars */
     NULL,                      /* _tputs_trace */
 #ifdef TRACE
     0L,                                /* _outchars */
     NULL,                      /* _tputs_trace */


@@ -236,21 +236,97 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = {
 
 /******************************************************************************/
 #ifdef USE_PTHREADS
 
 /******************************************************************************/
 #ifdef USE_PTHREADS

+static void
+init_global_mutexes(void)
+{
+    static bool initialized = FALSE;
+
+    if (!initialized) {
+       initialized = TRUE;
+       _nc_mutex_init(&_nc_globals.mutex_curses);
+       _nc_mutex_init(&_nc_globals.mutex_tst_tracef);
+       _nc_mutex_init(&_nc_globals.mutex_tracef);
+    }
+}
+
+NCURSES_EXPORT(void)
+_nc_init_pthreads(void)
+{
+    if (_nc_use_pthreads)
+       return;
+# if USE_WEAK_SYMBOLS
+    if ((pthread_mutex_init) == 0)
+       return;
+    if ((pthread_mutex_lock) == 0)
+       return;
+    if ((pthread_mutex_unlock) == 0)
+       return;
+    if ((pthread_mutex_trylock) == 0)
+       return;
+    if ((pthread_mutexattr_settype) == 0)
+       return;
+# endif
+    _nc_use_pthreads = 1;
+    init_global_mutexes();
+}
+
+/*
+ * Use recursive mutexes if we have them - they're part of Unix98.
+ * For the cases where we do not, _nc_mutex_trylock() is used to avoid a
+ * deadlock, at the expense of memory leaks and unexpected failures that
+ * may not be handled by typical clients.
+ *
+ * FIXME - need configure check for PTHREAD_MUTEX_RECURSIVE, define it to
+ * PTHREAD_MUTEX_NORMAL if not supported.
+ */
+NCURSES_EXPORT(void)
+_nc_mutex_init(pthread_mutex_t * obj)
+{
+    pthread_mutexattr_t recattr;
+
+    if (_nc_use_pthreads == 0)
+       return;
+    memset(&recattr, 0, sizeof(recattr));
+    pthread_mutexattr_settype(&recattr, PTHREAD_MUTEX_RECURSIVE);
+    pthread_mutex_init(obj, &recattr);
+}
+

 NCURSES_EXPORT(int)
 NCURSES_EXPORT(int)

-_nc_mutex_lock(pthread_mutex_t *obj)
+_nc_mutex_lock(pthread_mutex_t * obj)

 {
 {

+    if (_nc_use_pthreads == 0)
+       return 0;

     return pthread_mutex_lock(obj);
 }
 
 NCURSES_EXPORT(int)
     return pthread_mutex_lock(obj);
 }
 
 NCURSES_EXPORT(int)

-_nc_mutex_trylock(pthread_mutex_t *obj)
+_nc_mutex_trylock(pthread_mutex_t * obj)

 {
 {

+    if (_nc_use_pthreads == 0)
+       return 0;

     return pthread_mutex_trylock(obj);
 }
 
 NCURSES_EXPORT(int)
     return pthread_mutex_trylock(obj);
 }
 
 NCURSES_EXPORT(int)

-_nc_mutex_unlock(pthread_mutex_t *obj)
+_nc_mutex_unlock(pthread_mutex_t * obj)

 {
 {

+    if (_nc_use_pthreads == 0)
+       return 0;

     return pthread_mutex_unlock(obj);
 }
     return pthread_mutex_unlock(obj);
 }

+
+#if USE_WEAK_SYMBOLS
+/*
+ * NB: sigprocmask(2) is global but pthread_sigmask(3p)
+ * only for the calling thread.
+ */
+NCURSES_EXPORT(int)
+_nc_sigprocmask(int how, const sigset_t * newmask, sigset_t * oldmask)
+{
+    if ((pthread_sigmask))
+       return pthread_sigmask(how, newmask, oldmask);
+    else
+       return sigprocmask(how, newmask, oldmask);
+}
+#endif

 #endif /* USE_PTHREADS */
 #endif /* USE_PTHREADS */