Revision: 5479 Author: pebender Date: Mon Sep 14 16:35:51 2009 Log: - Patched squashfs so that it works correctly on multicore machines without forcing the number of processors to 1.
http://code.google.com/p/minimyth/source/detail?r=5479 Added: /trunk/gar-minimyth/script/utils/squashfs/files /trunk/gar-minimyth/script/utils/squashfs/files/squashfs-4.0-multi_core_fix.patch Modified: /trunk/gar-minimyth/script/utils/squashfs/Makefile /trunk/gar-minimyth/script/utils/squashfs/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/utils/squashfs/files/squashfs-4.0-multi_core_fix.patch Mon Sep 14 16:35:51 2009 @@ -0,0 +1,23 @@ +diff -Naur squashfs4.0-old/squashfs-tools/mksquashfs.c squashfs4.0-new/squashfs-tools/mksquashfs.c +--- squashfs4.0-old/squashfs-tools/mksquashfs.c 2009-04-05 14:22:48.000000000 -0700 ++++ squashfs4.0-new/squashfs-tools/mksquashfs.c 2009-09-14 14:25:37.000000000 -0700 +@@ -1733,8 +1733,8 @@ + entry->buffer->block = bytes; + bytes += compressed_size; + fragments_outstanding --; +- pthread_mutex_unlock(&fragment_mutex); + queue_put(to_writer, entry->buffer); ++ pthread_mutex_unlock(&fragment_mutex); + pthread_mutex_lock(&fragment_mutex); + TRACE("fragment_locked writing fragment %d, compressed size %d" + "\n", entry->fragment, compressed_size); +@@ -2426,8 +2426,8 @@ + write_buffer->block = bytes; + bytes += compressed_size; + fragments_outstanding --; +- pthread_mutex_unlock(&fragment_mutex); + queue_put(to_writer, write_buffer); ++ pthread_mutex_unlock(&fragment_mutex); + TRACE("Writing fragment %lld, uncompressed size %d, " + "compressed size %d\n", file_buffer->block, + file_buffer->size, compressed_size); ======================================= --- /trunk/gar-minimyth/script/utils/squashfs/Makefile Mon Sep 14 14:39:51 2009 +++ /trunk/gar-minimyth/script/utils/squashfs/Makefile Mon Sep 14 16:35:51 2009 @@ -3,7 +3,7 @@ CATEGORIES = lib MASTER_SITES = http://easynews.dl.sourceforge.net/sourceforge/$(GARNAME)/ DISTFILES = $(GARNAME)$(GARVERSION).tar.gz -PATCHFILES = +PATCHFILES = $(DISTNAME)-multi_core_fix.patch LICENSE = GPL2 DESCRIPTION = ======================================= --- /trunk/gar-minimyth/script/utils/squashfs/checksums Sat Apr 25 06:22:35 2009 +++ /trunk/gar-minimyth/script/utils/squashfs/checksums Mon Sep 14 16:35:51 2009 @@ -1,1 +1,2 @@ a3c23391da4ebab0ac4a75021ddabf96 download/squashfs4.0.tar.gz +b12e2bd8278bdafc9c51e5b0c28f6214 download/squashfs-4.0-multi_core_fix.patch --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
