From owner-svn-src-stable-9@FreeBSD.ORG  Sun Sep 30 13:32:49 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 67E95106566B;
	Sun, 30 Sep 2012 13:32:49 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 530628FC08;
	Sun, 30 Sep 2012 13:32:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8UDWnNw038512;
	Sun, 30 Sep 2012 13:32:49 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8UDWn7R038510;
	Sun, 30 Sep 2012 13:32:49 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201209301332.q8UDWn7R038510@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 30 Sep 2012 13:32:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r241071 - stable/9/sys/kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Sep 2012 13:32:49 -0000

Author: kib
Date: Sun Sep 30 13:32:48 2012
New Revision: 241071
URL: http://svn.freebsd.org/changeset/base/241071

Log:
  MFC r240813:
  Do not skip two elements of the tid_buffer when reusing the buffer
  slot. This eventually results in exhaustion of the tid space, causing
  new threads get tid -1 as identifier.
  
  MFC r240951:
  Make the updates of the tid ring buffer' head and tail pointers
  explicit by moving them into separate statements from the buffer
  element accesses.

Modified:
  stable/9/sys/kern/kern_thread.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/kern_thread.c
==============================================================================
--- stable/9/sys/kern/kern_thread.c	Sun Sep 30 13:17:33 2012	(r241070)
+++ stable/9/sys/kern/kern_thread.c	Sun Sep 30 13:32:48 2012	(r241071)
@@ -102,8 +102,8 @@ tid_alloc(void)
 		mtx_unlock(&tid_lock);
 		return (-1);
 	}
-	tid = tid_buffer[tid_head++];
-	tid_head %= TID_BUFFER_SIZE;
+	tid = tid_buffer[tid_head];
+	tid_head = (tid_head + 1) % TID_BUFFER_SIZE;
 	mtx_unlock(&tid_lock);
 	return (tid);
 }
@@ -115,11 +115,11 @@ tid_free(lwpid_t tid)
 
 	mtx_lock(&tid_lock);
 	if ((tid_tail + 1) % TID_BUFFER_SIZE == tid_head) {
-		tmp_tid = tid_buffer[tid_head++];
+		tmp_tid = tid_buffer[tid_head];
 		tid_head = (tid_head + 1) % TID_BUFFER_SIZE;
 	}
-	tid_buffer[tid_tail++] = tid;
-	tid_tail %= TID_BUFFER_SIZE;
+	tid_buffer[tid_tail] = tid;
+	tid_tail = (tid_tail + 1) % TID_BUFFER_SIZE;
 	mtx_unlock(&tid_lock);
 	if (tmp_tid != -1)
 		free_unr(tid_unrhdr, tmp_tid);