[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.338 by root, Tue Aug 21 01:07:47 2007 UTC vs.
Revision 1.339 by root, Fri Aug 24 00:26:10 2007 UTC

 }
 sub do_load_sync {
    my ($map) = @_;
+   cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
+      if $Coro::current != $Coro::main;
    cf::sync_job { $map->load };
 }
 our %MAP_PREFETCH;
 our $MAP_PREFETCHER = undef;
 sub find_async {
-   my ($path, $origin) = @_;
+   my ($path, $origin, $load) = @_;
    $path = normalise $path, $origin && $origin->{path};
    if (my $map = $cf::MAP{$path}) {
       return $map if $map->in_memory == cf::MAP_IN_MEMORY;
    }
-   undef $MAP_PREFETCH{$path};
+   $MAP_PREFETCH{$path} |= $load;
    $MAP_PREFETCHER ||= cf::async {
       while (%MAP_PREFETCH) {
-         for my $path (keys %MAP_PREFETCH) {
+         while (my ($k, $v) = each %MAP_PREFETCH) {
-            if (my $map = find $path) {
+            if (my $map = find $k) {
-               $map->load;
+               $map->load if $v;
             }
-            delete $MAP_PREFETCH{$path};
+            delete $MAP_PREFETCH{$k};
          }
       }
       undef $MAP_PREFETCHER;
    };
    $MAP_PREFETCHER->prio (6);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines