From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 20 Sep 2010 22:44:31 +0000 (-0700)
Subject: sort: destroy spin locks portably
X-Git-Tag: v8.6~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9065006ccbe0a94e9536950f389a0cbc3dfb4dda;p=thirdparty%2Fcoreutils.git

sort: destroy spin locks portably

* src/sort.c (sortlines, sort): Use pthread_spin_destroy when a
spin lock is no longer used.  This isn't needed on GNU/Linux or
Solaris, but POSIX says it may free up resources on some platforms.
---

diff --git a/src/sort.c b/src/sort.c
index a8d0c142bf..89f7be32c8 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -3480,6 +3480,8 @@ sortlines (struct line *restrict lines, struct line *restrict dest,
       queue_insert (merge_queue, &node);
       merge_loop (merge_queue, total_lines, tfp, temp_output);
     }
+
+  pthread_spin_destroy (&lock);
 }
 
 /* Scan through FILES[NTEMPS .. NFILES-1] looking for a file that is
@@ -3765,6 +3767,7 @@ sort (char * const *files, size_t nfiles, char const *output_file,
               sortlines (line, line, nthreads, buf.nlines, &node, true,
                          &merge_queue, tfp, temp_output);
               queue_destroy (&merge_queue);
+              pthread_spin_destroy (&lock);
             }
           else
             write_unique (line - 1, tfp, temp_output);