* Refactored conflict checking within packages. Profiling from Dan showed an

  unbelievable amount of strcmp() calls (25 million) due to the list searching.
  This has been reimplemented with a set-intersection scheme, due to the fact
  that file lists are always ordered. - NEEDS TESTING
* Minor clean up, "globalized" the str_cmp helper to match the alpm comparison
  signature, so we can use it elsewhere.

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index fa9f0f6b..fb7e5ee8 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -421,6 +421,10 @@ pmpkg_t *_alpm_pkg_load(char *pkgfile)
 		alpm_list_free(all_files);
 	}
 
+	/* this is IMPORTANT - "checking for conflicts" requires a sorted list, so we
+	 * ensure that here */
+	info->files = alpm_list_msort(info->files, alpm_list_count(info->files), _alpm_str_cmp);
+
 	/* internal */
 	info->origin = PKG_FROM_FILE;
 	info->data = strdup(pkgfile);