 @@ -1,14 +1,14 @@
-/*	$NetBSD: pthread_int.h,v 1.99 2020/01/27 20:50:05 ad Exp $	*/
+/*	$NetBSD: pthread_int.h,v 1.100 2020/01/28 13:08:40 ad Exp $	*/
 /*-
  * Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008, 2020
  *     The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nathan J. Williams and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -37,26 +37,27 @@
 /* #define PTHREAD__DEBUG */
 #define ERRORCHECK
 #include "pthread_types.h"
 #include "pthread_queue.h"
 #include "pthread_md.h"
 /* Need to use libc-private names for atomic operations. */
 #include "../../common/lib/libc/atomic/atomic_op_namespace.h"
 #include <sys/atomic.h>
 #include <sys/rbtree.h>
 #include <sys/param.h>
 #include <limits.h>
 #include <lwp.h>
 #include <signal.h>
 #include <stdbool.h>
 #ifdef __GNUC__
 #define	PTHREAD_HIDE	__attribute__ ((visibility("hidden")))
 #else
 #define	PTHREAD_HIDE	/* nothing */
 #endif
 #define	PTHREAD__UNPARK_MAX	128
 @@ -86,71 +87,79 @@ struct pthread_lock_ops {
 	void	(*plo_init)(__cpu_simple_lock_t *);
 	int	(*plo_try)(__cpu_simple_lock_t *);
 	void	(*plo_unlock)(__cpu_simple_lock_t *);
 	void	(*plo_lock)(__cpu_simple_lock_t *);
 };
 struct	__pthread_st {
 	pthread_t	pt_self;	/* Must be first. */
 #if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
 	struct tls_tcb	*pt_tls;	/* Thread Local Storage area */
 #endif
 	unsigned int	pt_magic;	/* Magic number */
 	int		pt_state;	/* running, blocked, etc. */
 	pthread_mutex_t	pt_lock;	/* lock on state */
 	int		pt_flags;	/* see PT_FLAG_* below */
 	int		pt_cancel;	/* Deferred cancellation */
 	int		pt_errno;	/* Thread-specific errno. */
 	stack_t		pt_stack;	/* Our stack */
 	bool		pt_stack_allocated;
 	size_t		pt_guardsize;
 	void		*pt_exitval;	/* Read by pthread_join() */
 	char		*pt_name;	/* Thread's name, set by the app. */
 	int		pt_willpark;	/* About to park */
 	lwpid_t		pt_unpark;	/* Unpark this when parking */
 	struct pthread_lock_ops pt_lockops;/* Cached to avoid PIC overhead */
 	void		*(*pt_func)(void *);/* Function to call at start. */
 	void		*pt_arg;	/* Argument to pass at start. */
 	/* Threads to defer waking, usually until pthread_mutex_unlock(). */
 	lwpid_t		pt_waiters[PTHREAD__UNPARK_MAX];
 	size_t		pt_nwaiters;
 	/* Stack of cancellation cleanup handlers and their arguments */
 	PTQ_HEAD(, pt_clean_t)	pt_cleanup_stack;
 	/* LWP ID and entry on the list of all threads. */
 	lwpid_t		pt_lid;
 	rb_node_t	pt_alltree;
 	PTQ_ENTRY(__pthread_st) pt_allq;
 	PTQ_ENTRY(__pthread_st)	pt_deadq;
 	/*
 	 * rbtree node and entry on the list of all threads.  pt_alltree in
 	 * its own cacheline, so pthread__find() is not needlessly impacted
 	 * by threads going about their normal business.  pt_allq is
 	 * adjusted at the same time as pt_alltree.
 	 */
 	rb_node_t	pt_alltree __aligned(COHERENCY_UNIT);
 	PTQ_ENTRY(__pthread_st) pt_allq;
 	/* Lock on state also gets its own line. */
 	pthread_mutex_t	pt_lock __aligned(COHERENCY_UNIT);
 	/*
 	 * General synchronization data.  We try to align, as threads
 	 * on other CPUs will access this data frequently.
 	 */
-	int		pt_dummy1 __aligned(128);
+	int		pt_dummy1 __aligned(COHERENCY_UNIT);
 	struct lwpctl 	*pt_lwpctl;	/* Kernel/user comms area */
 	volatile int	pt_rwlocked;	/* Handed rwlock successfully */
 	volatile int	pt_signalled;	/* Received pthread_cond_signal() */
 	volatile int	pt_mutexwait;	/* Waiting to acquire mutex */
 	void * volatile pt_mutexnext;	/* Next thread in chain */
 	void * volatile	pt_sleepobj;	/* Object slept on */
 	PTQ_ENTRY(__pthread_st) pt_sleep;
 	void		(*pt_early)(void *);
 	int		pt_dummy2 __aligned(128);
 	/* Thread-specific data.  Large so it sits close to the end. */
-	int		pt_havespecific;
+	int		pt_havespecific __aligned(COHERENCY_UNIT);
 	struct pt_specific {
 		void *pts_value;
 		PTQ_ENTRY(pt_specific) pts_next;
 	} pt_specific[];
 };
 /* Thread states */
 #define PT_STATE_RUNNING	1
 #define PT_STATE_ZOMBIE		5
 #define PT_STATE_DEAD		6
 /* Flag values */