From owner-svn-src-all@FreeBSD.ORG  Wed Dec 19 12:20:05 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 98B5386E;
 Wed, 19 Dec 2012 12:20:05 +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 E54C48FC0A;
 Wed, 19 Dec 2012 12:20:04 +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 qBJCK4El091602;
 Wed, 19 Dec 2012 12:20:04 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJCK49p091601;
 Wed, 19 Dec 2012 12:20:04 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201212191220.qBJCK49p091601@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 19 Dec 2012 12:20:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r244432 - stable/7/sbin/devd
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2012 12:20:05 -0000

Author: dim
Date: Wed Dec 19 12:20:04 2012
New Revision: 244432
URL: http://svnweb.freebsd.org/changeset/base/244432

Log:
  MFC r243907:
  
  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

Modified:
  stable/7/sbin/devd/devd.cc
Directory Properties:
  stable/7/sbin/devd/   (props changed)

Modified: stable/7/sbin/devd/devd.cc
==============================================================================
--- stable/7/sbin/devd/devd.cc	Wed Dec 19 12:19:56 2012	(r244431)
+++ stable/7/sbin/devd/devd.cc	Wed Dec 19 12:20:04 2012	(r244432)
@@ -351,7 +351,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