Changeset b3bdb68 in mainline

Timestamp:

2011-03-11T08:09:51Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0c8562c, 6105fc0, 67f54965, df949c5

Parents:

b05e2fe (diff), c1a5d8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Files:

• dist/Makefile (modified) (2 diffs)
• uspace/lib/block/libblock.c (modified) (2 diffs)

dist/Makefile

@@ -43 +43 @@
 
 SUFFIX = $(suffix $(IMGFILE))
-DISTFILE = HelenOS-$(RELEASE)-$(PLATFORM)-$(MACHINE)-$(PROCESSOR)$(SUFFIX)
+
+ifdef PROFILE
+        DISTFILE = Helenos-$(shell echo $(PROFILE) | tr '/' '-')$(SUFFIX)
+else
+        DISTFILE = HelenOS-$(RELEASE)-$(PLATFORM)-$(MACHINE)-$(PROCESSOR)$(SUFFIX)
+endif
 
 .PHONY: all clean dist distfile
@@ -53 +58 @@
         cp $< $@
 
+$(IMGFILE):
+        $(MAKE) -C ..
+
 dist:
         for profile in $(PROFILES); do \

uspace/lib/block/libblock.c

@@ -411 +411 @@
         l = hash_table_find(&cache->block_hash, &key);
         if (l) {
+found:
                 /*
                  * We found the block in the cache.
@@ -493 +494 @@
                                         fibril_mutex_unlock(&b->lock);
                                         goto retry;
+                                }
+                                l = hash_table_find(&cache->block_hash, &key);
+                                if (l) {
+                                        /*
+                                         * Someone else must have already
+                                         * instantiated the block while we were
+                                         * not holding the cache lock.
+                                         * Leave the recycled block on the
+                                         * freelist and continue as if we
+                                         * found the block of interest during
+                                         * the first try.
+                                         */
+                                        fibril_mutex_unlock(&b->lock);
+                                        goto found;
                                 }