From owner-svn-src-head@FreeBSD.ORG  Wed Dec  5 20:50:40 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E4B17784;
 Wed,  5 Dec 2012 20:50:40 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C90888FC12;
 Wed,  5 Dec 2012 20:50:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB5KoesW033131;
 Wed, 5 Dec 2012 20:50:40 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB5KoebD033130;
 Wed, 5 Dec 2012 20:50:40 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201212052050.qB5KoebD033130@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 5 Dec 2012 20:50:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243907 - head/sbin/devd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Dec 2012 20:50:41 -0000

Author: dim
Date: Wed Dec  5 20:50:40 2012
New Revision: 243907
URL: http://svnweb.freebsd.org/changeset/base/243907

Log:
  Fix an old bug in devd, where it uses std::sort() to sort the various
  lists it reads from its configuration files on the priority field.
  
  Because some items in the lists have the same priority, and std::sort()
  is not stable, the exact order in which the items are enumerated does
  not have to correspond to the order they appear in the configuration
  files.
  
  Apparently this was never noticed with libstdc++, but with libc++ it
  could cause the "uhid" entry from /etc/devd/usb.conf to be used instead
  of the "ums" entry (which is earlier in the file).  This caused the
  problem described in the PR: the USB mouse module was never loaded, and
  the other actions (such as starting moused) were not executed.
  
  To fix the problem, make devd use std:stable_sort() instead.
  
  Reported by:	Jan Beich <jbeich@tormail.org>
  PR:		bin/172958
  MFC after:	2 weeks

Modified:
  head/sbin/devd/devd.cc

Modified: head/sbin/devd/devd.cc
==============================================================================
--- head/sbin/devd/devd.cc	Wed Dec  5 20:28:44 2012	(r243906)
+++ head/sbin/devd/devd.cc	Wed Dec  5 20:50:40 2012	(r243907)
@@ -445,7 +445,7 @@ public:
 void
 config::sort_vector(vector<event_proc *> &v)
 {
-	sort(v.begin(), v.end(), epv_greater());
+	stable_sort(v.begin(), v.end(), epv_greater());
 }
 
 void