sreadahead

 === modified file 'debian/changelog'
 --- debian/changelog	2009-09-15 02:39:28 +0000
 +++ debian/changelog	2009-09-20 17:35:00 +0000
@@ -1,3 +1,10 @@
++sreadahead (1.0-4) karmic; urgency=low
++
++  * Replace custom bubble sort with qsort(), to avoid using 100% CPU
++    for a long time after boot.  (LP: #421116)
++
++ -- Anders Kaseorg <andersk@mit.edu>  Sun, 20 Sep 2009 13:31:45 -0400
++
  sreadahead (1.0-3) karmic; urgency=low
    FFE LP: #427356.
 === modified file 'sreadahead.c'
 --- sreadahead.c	2009-07-20 16:28:56 +0000
 +++ sreadahead.c	2009-09-20 17:35:00 +0000
@@ -187,26 +187,21 @@
  	return NULL;
+ }
++static int compare_ras_by_name(const void *memb1, const void *memb2)
++{
++	struct ra_struct *const *ra1 = memb1, *const *ra2 = memb2;
++	int c = strcmp((*ra1)->filename, (*ra2)->filename);
++
++	if (c != 0)
++		return c;
++
++	/* Leave equal filenames in the original order. */
++	return (*ra1)->number - (*ra2)->number;
++}
++
  static void sort_ra_by_name(void)
+ {
--	int delta = 1;
--
--	while (delta > 0) {
--		int i;
--		delta = 0;
--		for (i = 0; i < racount - 1; i++) {
--			int c;
--
--			c = strcmp(ra[i]->filename, ra[i+1]->filename);
--			if (c > 0) {
--				struct ra_struct *tmp;
--				tmp = ra[i];
--				ra[i] = ra[i+1];
--				ra[i+1] = tmp;
--				delta++;
--			}
--		}
--	}
++	qsort(ra, racount, sizeof(*ra), compare_ras_by_name);
+ }
  static void remove_dupes(void)

Merge lp://qastaging/~andersk/sreadahead/qsort into lp://qastaging/~ubuntu-core-dev/sreadahead/ubuntu