… | |
… | |
427 | } |
427 | } |
428 | } |
428 | } |
429 | }; |
429 | }; |
430 | |
430 | |
431 | sub get_slot($;$$) { |
431 | sub get_slot($;$$) { |
|
|
432 | return if tick_inhibit; |
|
|
433 | |
432 | my ($time, $pri, $name) = @_; |
434 | my ($time, $pri, $name) = @_; |
433 | |
435 | |
434 | $time = $TICK * .6 if $time > $TICK * .6; |
436 | $time = $TICK * .6 if $time > $TICK * .6; |
435 | my $sig = new Coro::Signal; |
437 | my $sig = new Coro::Signal; |
436 | |
438 | |
… | |
… | |
1473 | |
1475 | |
1474 | return if $pl->{deny_save}; |
1476 | return if $pl->{deny_save}; |
1475 | |
1477 | |
1476 | aio_mkdir playerdir $pl, 0770; |
1478 | aio_mkdir playerdir $pl, 0770; |
1477 | $pl->{last_save} = $cf::RUNTIME; |
1479 | $pl->{last_save} = $cf::RUNTIME; |
|
|
1480 | |
|
|
1481 | cf::get_slot 0.01; |
1478 | |
1482 | |
1479 | $pl->save_pl ($path); |
1483 | $pl->save_pl ($path); |
1480 | cf::cede_to_tick; |
1484 | cf::cede_to_tick; |
1481 | } |
1485 | } |
1482 | |
1486 | |
… | |
… | |
2113 | } |
2117 | } |
2114 | |
2118 | |
2115 | $self->{last_save} = $cf::RUNTIME; |
2119 | $self->{last_save} = $cf::RUNTIME; |
2116 | $self->last_access ($cf::RUNTIME); |
2120 | $self->last_access ($cf::RUNTIME); |
2117 | |
2121 | |
2118 | $self->in_memory (cf::MAP_IN_MEMORY); |
2122 | $self->in_memory (cf::MAP_ACTIVE); |
2119 | } |
2123 | } |
2120 | |
2124 | |
2121 | $self->post_load; |
2125 | $self->post_load; |
2122 | } |
2126 | } |
2123 | |
2127 | |
… | |
… | |
2181 | my ($path, $origin, $load) = @_; |
2185 | my ($path, $origin, $load) = @_; |
2182 | |
2186 | |
2183 | $path = normalise $path, $origin && $origin->{path}; |
2187 | $path = normalise $path, $origin && $origin->{path}; |
2184 | |
2188 | |
2185 | if (my $map = $cf::MAP{$path}) { |
2189 | if (my $map = $cf::MAP{$path}) { |
2186 | return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; |
2190 | return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; |
2187 | } |
2191 | } |
2188 | |
2192 | |
2189 | $MAP_PREFETCH{$path} |= $load; |
2193 | $MAP_PREFETCH{$path} |= $load; |
2190 | |
2194 | |
2191 | $MAP_PREFETCHER ||= cf::async { |
2195 | $MAP_PREFETCHER ||= cf::async { |
… | |
… | |
2228 | cf::async { |
2232 | cf::async { |
2229 | $Coro::current->{desc} = "map player save"; |
2233 | $Coro::current->{desc} = "map player save"; |
2230 | $_->contr->save for $self->players; |
2234 | $_->contr->save for $self->players; |
2231 | }; |
2235 | }; |
2232 | |
2236 | |
|
|
2237 | cf::get_slot 0.02; |
|
|
2238 | |
2233 | if ($uniq) { |
2239 | if ($uniq) { |
2234 | $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); |
2240 | $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); |
2235 | $self->_save_objects ($uniq, cf::IO_UNIQUES); |
2241 | $self->_save_objects ($uniq, cf::IO_UNIQUES); |
2236 | } else { |
2242 | } else { |
2237 | $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); |
2243 | $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); |
… | |
… | |
2245 | $self->save; |
2251 | $self->save; |
2246 | |
2252 | |
2247 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2253 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2248 | |
2254 | |
2249 | return if $self->players; |
2255 | return if $self->players; |
2250 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2256 | return if $self->in_memory != cf::MAP_ACTIVE; |
2251 | return if $self->{deny_save}; |
2257 | return if $self->{deny_save}; |
2252 | |
2258 | |
2253 | $self->in_memory (cf::MAP_SWAPPED); |
2259 | $self->in_memory (cf::MAP_SWAPPED); |
2254 | |
2260 | |
2255 | $self->deactivate; |
2261 | $self->deactivate; |