… | |
… | |
427 | } |
427 | } |
428 | } |
428 | } |
429 | }; |
429 | }; |
430 | |
430 | |
431 | sub get_slot($;$$) { |
431 | sub get_slot($;$$) { |
|
|
432 | return if tick_inhibit || $Coro::current == $Coro::main; |
|
|
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; |
… | |
… | |
2693 | $rmp->{origin_y} = $exit->y; |
2699 | $rmp->{origin_y} = $exit->y; |
2694 | } |
2700 | } |
2695 | |
2701 | |
2696 | $rmp->{random_seed} ||= $exit->random_seed; |
2702 | $rmp->{random_seed} ||= $exit->random_seed; |
2697 | |
2703 | |
2698 | my $data = cf::encode_json $rmp; |
2704 | my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); |
2699 | my $md5 = Digest::MD5::md5_hex $data; |
2705 | my $md5 = Digest::MD5::md5_hex $data; |
2700 | my $meta = "$RANDOMDIR/$md5.meta"; |
2706 | my $meta = "$RANDOMDIR/$md5.meta"; |
2701 | |
2707 | |
2702 | if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { |
2708 | if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { |
2703 | aio_write $fh, 0, (length $data), $data, 0; |
2709 | aio_write $fh, 0, (length $data), $data, 0; |
… | |
… | |
3306 | while (my ($k, $v) = each %$want) { |
3312 | while (my ($k, $v) = each %$want) { |
3307 | $ns->fx_want ($k, $v); |
3313 | $ns->fx_want ($k, $v); |
3308 | } |
3314 | } |
3309 | }; |
3315 | }; |
3310 | |
3316 | |
|
|
3317 | sub load_resource_file($) { |
|
|
3318 | my $status = load_resource_file_ $_[0]; |
|
|
3319 | get_slot 0.1, 100; |
|
|
3320 | cf::arch::commit_load; |
|
|
3321 | $status |
|
|
3322 | } |
|
|
3323 | |
3311 | sub reload_regions { |
3324 | sub reload_regions { |
3312 | # HACK to clear player env face cache, we need some signal framework |
3325 | # HACK to clear player env face cache, we need some signal framework |
3313 | # for this (global event?) |
3326 | # for this (global event?) |
3314 | %ext::player_env::MUSIC_FACE_CACHE = (); |
3327 | %ext::player_env::MUSIC_FACE_CACHE = (); |
3315 | |
3328 | |
… | |
… | |
3328 | } |
3341 | } |
3329 | |
3342 | |
3330 | sub reload_archetypes { |
3343 | sub reload_archetypes { |
3331 | load_resource_file "$DATADIR/archetypes" |
3344 | load_resource_file "$DATADIR/archetypes" |
3332 | or die "unable to load archetypes\n"; |
3345 | or die "unable to load archetypes\n"; |
3333 | #d# NEED to laod twice to resolve forward references |
|
|
3334 | # this really needs to be done in an extra post-pass |
|
|
3335 | # (which needs to be synchronous, so solve it differently) |
|
|
3336 | load_resource_file "$DATADIR/archetypes" |
|
|
3337 | or die "unable to load archetypes\n"; |
|
|
3338 | } |
3346 | } |
3339 | |
3347 | |
3340 | sub reload_treasures { |
3348 | sub reload_treasures { |
3341 | load_resource_file "$DATADIR/treasures" |
3349 | load_resource_file "$DATADIR/treasures" |
3342 | or die "unable to load treasurelists\n"; |
3350 | or die "unable to load treasurelists\n"; |
3343 | } |
3351 | } |
3344 | |
3352 | |
3345 | sub reload_resources { |
3353 | sub reload_resources { |
3346 | warn "reloading resource files...\n"; |
3354 | warn "reloading resource files...\n"; |
3347 | |
3355 | |
|
|
3356 | reload_facedata; |
|
|
3357 | reload_archetypes; |
3348 | reload_regions; |
3358 | reload_regions; |
3349 | reload_facedata; |
|
|
3350 | #reload_archetypes;#d# |
|
|
3351 | reload_archetypes; |
|
|
3352 | reload_treasures; |
3359 | reload_treasures; |
3353 | |
3360 | |
3354 | warn "finished reloading resource files\n"; |
3361 | warn "finished reloading resource files\n"; |
3355 | } |
3362 | } |
3356 | |
3363 | |
3357 | sub init { |
3364 | sub init { |
|
|
3365 | my $guard = freeze_mainloop; |
|
|
3366 | |
3358 | reload_resources; |
3367 | reload_resources; |
3359 | } |
3368 | } |
3360 | |
3369 | |
3361 | sub reload_config { |
3370 | sub reload_config { |
3362 | open my $fh, "<:utf8", "$CONFDIR/config" |
3371 | open my $fh, "<:utf8", "$CONFDIR/config" |
… | |
… | |
3387 | $Coro::current->{desc} = "IDLE BUG HANDLER"; |
3396 | $Coro::current->{desc} = "IDLE BUG HANDLER"; |
3388 | EV::loop EV::LOOP_ONESHOT; |
3397 | EV::loop EV::LOOP_ONESHOT; |
3389 | })->prio (Coro::PRIO_MAX); |
3398 | })->prio (Coro::PRIO_MAX); |
3390 | }; |
3399 | }; |
3391 | |
3400 | |
|
|
3401 | { |
|
|
3402 | my $guard = freeze_mainloop; |
3392 | reload_config; |
3403 | reload_config; |
3393 | db_init; |
3404 | db_init; |
3394 | load_extensions; |
3405 | load_extensions; |
3395 | |
3406 | |
3396 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3407 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3397 | evthread_start IO::AIO::poll_fileno; |
3408 | evthread_start IO::AIO::poll_fileno; |
|
|
3409 | } |
|
|
3410 | |
3398 | EV::loop; |
3411 | EV::loop; |
3399 | } |
3412 | } |
3400 | |
3413 | |
3401 | ############################################################################# |
3414 | ############################################################################# |
3402 | # initialisation and cleanup |
3415 | # initialisation and cleanup |
… | |
… | |
3684 | |
3697 | |
3685 | our @WAIT_FOR_TICK; |
3698 | our @WAIT_FOR_TICK; |
3686 | our @WAIT_FOR_TICK_BEGIN; |
3699 | our @WAIT_FOR_TICK_BEGIN; |
3687 | |
3700 | |
3688 | sub wait_for_tick { |
3701 | sub wait_for_tick { |
3689 | return if tick_inhibit; |
|
|
3690 | return if $Coro::current == $Coro::main; |
3702 | return if tick_inhibit || $Coro::current == $Coro::main; |
3691 | |
3703 | |
3692 | my $signal = new Coro::Signal; |
3704 | my $signal = new Coro::Signal; |
3693 | push @WAIT_FOR_TICK, $signal; |
3705 | push @WAIT_FOR_TICK, $signal; |
3694 | $signal->wait; |
3706 | $signal->wait; |
3695 | } |
3707 | } |
3696 | |
3708 | |
3697 | sub wait_for_tick_begin { |
3709 | sub wait_for_tick_begin { |
3698 | return if tick_inhibit; |
|
|
3699 | return if $Coro::current == $Coro::main; |
3710 | return if tick_inhibit || $Coro::current == $Coro::main; |
3700 | |
3711 | |
3701 | my $signal = new Coro::Signal; |
3712 | my $signal = new Coro::Signal; |
3702 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3713 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3703 | $signal->wait; |
3714 | $signal->wait; |
3704 | } |
3715 | } |