… | |
… | |
32 | use Opcode; |
32 | use Opcode; |
33 | use Safe; |
33 | use Safe; |
34 | use Safe::Hole; |
34 | use Safe::Hole; |
35 | use Storable (); |
35 | use Storable (); |
36 | |
36 | |
|
|
37 | use Guard (); |
37 | use Coro (); |
38 | use Coro (); |
38 | use Coro::State; |
39 | use Coro::State; |
39 | use Coro::Handle; |
40 | use Coro::Handle; |
40 | use Coro::EV; |
41 | use Coro::EV; |
41 | use Coro::AnyEvent; |
42 | use Coro::AnyEvent; |
42 | use Coro::Timer; |
43 | use Coro::Timer; |
43 | use Coro::Signal; |
44 | use Coro::Signal; |
44 | use Coro::Semaphore; |
45 | use Coro::Semaphore; |
|
|
46 | use Coro::SemaphoreSet; |
45 | use Coro::AnyEvent; |
47 | use Coro::AnyEvent; |
46 | use Coro::AIO; |
48 | use Coro::AIO; |
47 | use Coro::BDB 1.6; |
49 | use Coro::BDB 1.6; |
48 | use Coro::Storable; |
50 | use Coro::Storable; |
49 | use Coro::Util (); |
51 | use Coro::Util (); |
… | |
… | |
81 | our %EXTCMD = (); |
83 | our %EXTCMD = (); |
82 | our %EXTICMD = (); |
84 | our %EXTICMD = (); |
83 | our %EXT_CORO = (); # coroutines bound to extensions |
85 | our %EXT_CORO = (); # coroutines bound to extensions |
84 | our %EXT_MAP = (); # pluggable maps |
86 | our %EXT_MAP = (); # pluggable maps |
85 | |
87 | |
86 | our $RELOAD; # number of reloads so far |
88 | our $RELOAD; # number of reloads so far, non-zero while in reload |
87 | our @EVENT; |
89 | our @EVENT; |
88 | |
90 | |
89 | our $CONFDIR = confdir; |
91 | our $CONFDIR = confdir; |
90 | our $DATADIR = datadir; |
92 | our $DATADIR = datadir; |
91 | our $LIBDIR = "$DATADIR/ext"; |
93 | our $LIBDIR = "$DATADIR/ext"; |
… | |
… | |
128 | our $LOAD; # a number between 0 (idle) and 1 (too many objects) |
130 | our $LOAD; # a number between 0 (idle) and 1 (too many objects) |
129 | our $LOADAVG; # same thing, but with alpha-smoothing |
131 | our $LOADAVG; # same thing, but with alpha-smoothing |
130 | our $JITTER; # average jitter |
132 | our $JITTER; # average jitter |
131 | our $TICK_START; # for load detecting purposes |
133 | our $TICK_START; # for load detecting purposes |
132 | |
134 | |
|
|
135 | our @POST_INIT; |
|
|
136 | |
|
|
137 | our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) |
|
|
138 | |
133 | binmode STDOUT; |
139 | binmode STDOUT; |
134 | binmode STDERR; |
140 | binmode STDERR; |
135 | |
141 | |
136 | # read virtual server time, if available |
142 | # read virtual server time, if available |
137 | unless ($RUNTIME || !-e $RUNTIMEFILE) { |
143 | unless ($RUNTIME || !-e $RUNTIMEFILE) { |
… | |
… | |
305 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
311 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
306 | |
312 | |
307 | sub encode_json($) { $json_coder->encode ($_[0]) } |
313 | sub encode_json($) { $json_coder->encode ($_[0]) } |
308 | sub decode_json($) { $json_coder->decode ($_[0]) } |
314 | sub decode_json($) { $json_coder->decode ($_[0]) } |
309 | |
315 | |
|
|
316 | =item cf::post_init { BLOCK } |
|
|
317 | |
|
|
318 | Execute the given codeblock, I<after> all extensions have been (re-)loaded, |
|
|
319 | but I<before> the server starts ticking again. |
|
|
320 | |
|
|
321 | The cdoeblock will have a single boolean argument to indicate whether this |
|
|
322 | is a reload or not. |
|
|
323 | |
|
|
324 | =cut |
|
|
325 | |
|
|
326 | sub post_init(&) { |
|
|
327 | push @POST_INIT, shift; |
|
|
328 | } |
|
|
329 | |
310 | =item cf::lock_wait $string |
330 | =item cf::lock_wait $string |
311 | |
331 | |
312 | Wait until the given lock is available. See cf::lock_acquire. |
332 | Wait until the given lock is available. See cf::lock_acquire. |
313 | |
333 | |
314 | =item my $lock = cf::lock_acquire $string |
334 | =item my $lock = cf::lock_acquire $string |
315 | |
335 | |
316 | Wait until the given lock is available and then acquires it and returns |
336 | Wait until the given lock is available and then acquires it and returns |
317 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
337 | a L<Guard> object. If the guard object gets destroyed (goes out of scope, |
318 | for example when the coroutine gets canceled), the lock is automatically |
338 | for example when the coroutine gets canceled), the lock is automatically |
319 | returned. |
339 | returned. |
320 | |
340 | |
321 | Locks are *not* recursive, locking from the same coro twice results in a |
341 | Locks are *not* recursive, locking from the same coro twice results in a |
322 | deadlocked coro. |
342 | deadlocked coro. |
… | |
… | |
328 | |
348 | |
329 | Return true if the lock is currently active, i.e. somebody has locked it. |
349 | Return true if the lock is currently active, i.e. somebody has locked it. |
330 | |
350 | |
331 | =cut |
351 | =cut |
332 | |
352 | |
333 | our %LOCK; |
353 | our $LOCKS = new Coro::SemaphoreSet; |
334 | our %LOCKER;#d# |
|
|
335 | |
354 | |
336 | sub lock_wait($) { |
355 | sub lock_wait($) { |
337 | my ($key) = @_; |
356 | $LOCKS->wait ($_[0]); |
338 | |
|
|
339 | if ($LOCKER{$key} == $Coro::current) {#d# |
|
|
340 | Carp::cluck "lock_wait($key) for already-acquired lock";#d# |
|
|
341 | return;#d# |
|
|
342 | }#d# |
|
|
343 | |
|
|
344 | # wait for lock, if any |
|
|
345 | while ($LOCK{$key}) { |
|
|
346 | push @{ $LOCK{$key} }, $Coro::current; |
|
|
347 | Coro::schedule; |
|
|
348 | } |
|
|
349 | } |
357 | } |
350 | |
358 | |
351 | sub lock_acquire($) { |
359 | sub lock_acquire($) { |
352 | my ($key) = @_; |
360 | $LOCKS->guard ($_[0]) |
353 | |
|
|
354 | # wait, to be sure we are not locked |
|
|
355 | lock_wait $key; |
|
|
356 | |
|
|
357 | $LOCK{$key} = []; |
|
|
358 | $LOCKER{$key} = $Coro::current;#d# |
|
|
359 | |
|
|
360 | Coro::guard { |
|
|
361 | delete $LOCKER{$key};#d# |
|
|
362 | # wake up all waiters, to be on the safe side |
|
|
363 | $_->ready for @{ delete $LOCK{$key} }; |
|
|
364 | } |
|
|
365 | } |
361 | } |
366 | |
362 | |
367 | sub lock_active($) { |
363 | sub lock_active($) { |
368 | my ($key) = @_; |
364 | $LOCKS->count ($_[0]) < 1 |
369 | |
|
|
370 | ! ! $LOCK{$key} |
|
|
371 | } |
365 | } |
372 | |
366 | |
373 | sub freeze_mainloop { |
367 | sub freeze_mainloop { |
374 | tick_inhibit_inc; |
368 | tick_inhibit_inc; |
375 | |
369 | |
376 | Coro::guard \&tick_inhibit_dec; |
370 | &Guard::guard (\&tick_inhibit_dec); |
377 | } |
371 | } |
378 | |
372 | |
379 | =item cf::periodic $interval, $cb |
373 | =item cf::periodic $interval, $cb |
380 | |
374 | |
381 | Like EV::periodic, but randomly selects a starting point so that the actions |
375 | Like EV::periodic, but randomly selects a starting point so that the actions |
… | |
… | |
1170 | } else { |
1164 | } else { |
1171 | aio_unlink "$filename.pst"; |
1165 | aio_unlink "$filename.pst"; |
1172 | } |
1166 | } |
1173 | |
1167 | |
1174 | aio_rename "$filename~", $filename; |
1168 | aio_rename "$filename~", $filename; |
|
|
1169 | |
|
|
1170 | $filename =~ s%/[^/]+$%%; |
|
|
1171 | aio_pathsync $filename if $cf::USE_FSYNC; |
1175 | } else { |
1172 | } else { |
1176 | warn "FATAL: $filename~: $!\n"; |
1173 | warn "unable to save objects: $filename~: $!\n"; |
1177 | } |
1174 | } |
1178 | } else { |
1175 | } else { |
1179 | aio_unlink $filename; |
1176 | aio_unlink $filename; |
1180 | aio_unlink "$filename.pst"; |
1177 | aio_unlink "$filename.pst"; |
1181 | } |
1178 | } |
… | |
… | |
1272 | my ($name, $cb) = @_; |
1269 | my ($name, $cb) = @_; |
1273 | |
1270 | |
1274 | $EXTICMD{$name} = $cb; |
1271 | $EXTICMD{$name} = $cb; |
1275 | } |
1272 | } |
1276 | |
1273 | |
|
|
1274 | use File::Glob (); |
|
|
1275 | |
1277 | cf::player->attach ( |
1276 | cf::player->attach ( |
1278 | on_command => sub { |
1277 | on_command => sub { |
1279 | my ($pl, $name, $params) = @_; |
1278 | my ($pl, $name, $params) = @_; |
1280 | |
1279 | |
1281 | my $cb = $COMMAND{$name} |
1280 | my $cb = $COMMAND{$name} |
… | |
… | |
1312 | } |
1311 | } |
1313 | |
1312 | |
1314 | cf::override; |
1313 | cf::override; |
1315 | }, |
1314 | }, |
1316 | ); |
1315 | ); |
|
|
1316 | |
|
|
1317 | # "readahead" all extensions |
|
|
1318 | sub cache_extensions { |
|
|
1319 | my $grp = IO::AIO::aio_group; |
|
|
1320 | |
|
|
1321 | add $grp IO::AIO::aio_readdir $LIBDIR, sub { |
|
|
1322 | for (grep /\.ext$/, @{$_[0]}) { |
|
|
1323 | add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; |
|
|
1324 | } |
|
|
1325 | }; |
|
|
1326 | |
|
|
1327 | $grp |
|
|
1328 | } |
1317 | |
1329 | |
1318 | sub load_extensions { |
1330 | sub load_extensions { |
1319 | cf::sync_job { |
1331 | cf::sync_job { |
1320 | my %todo; |
1332 | my %todo; |
1321 | |
1333 | |
… | |
… | |
1444 | |
1456 | |
1445 | sub exists($) { |
1457 | sub exists($) { |
1446 | my ($login) = @_; |
1458 | my ($login) = @_; |
1447 | |
1459 | |
1448 | $cf::PLAYER{$login} |
1460 | $cf::PLAYER{$login} |
1449 | or cf::sync_job { !aio_stat path $login } |
1461 | or !aio_stat path $login |
1450 | } |
1462 | } |
1451 | |
1463 | |
1452 | sub find($) { |
1464 | sub find($) { |
1453 | return $cf::PLAYER{$_[0]} || do { |
1465 | return $cf::PLAYER{$_[0]} || do { |
1454 | my $login = $_[0]; |
1466 | my $login = $_[0]; |
… | |
… | |
1950 | sub find { |
1962 | sub find { |
1951 | my ($path, $origin) = @_; |
1963 | my ($path, $origin) = @_; |
1952 | |
1964 | |
1953 | $path = normalise $path, $origin && $origin->path; |
1965 | $path = normalise $path, $origin && $origin->path; |
1954 | |
1966 | |
1955 | cf::lock_wait "map_data:$path";#d#remove |
1967 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
1956 | cf::lock_wait "map_find:$path"; |
1968 | my $guard2 = cf::lock_acquire "map_find:$path"; |
1957 | |
1969 | |
1958 | $cf::MAP{$path} || do { |
1970 | $cf::MAP{$path} || do { |
1959 | my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it |
|
|
1960 | my $guard2 = cf::lock_acquire "map_find:$path"; |
|
|
1961 | |
|
|
1962 | my $map = new_from_path cf::map $path |
1971 | my $map = new_from_path cf::map $path |
1963 | or return; |
1972 | or return; |
1964 | |
1973 | |
1965 | $map->{last_save} = $cf::RUNTIME; |
1974 | $map->{last_save} = $cf::RUNTIME; |
1966 | |
1975 | |
… | |
… | |
3340 | reload_treasures; |
3349 | reload_treasures; |
3341 | |
3350 | |
3342 | warn "finished reloading resource files\n"; |
3351 | warn "finished reloading resource files\n"; |
3343 | } |
3352 | } |
3344 | |
3353 | |
3345 | sub init { |
|
|
3346 | my $guard = freeze_mainloop; |
|
|
3347 | |
|
|
3348 | evthread_start IO::AIO::poll_fileno; |
|
|
3349 | |
|
|
3350 | reload_resources; |
|
|
3351 | } |
|
|
3352 | |
|
|
3353 | sub reload_config { |
3354 | sub reload_config { |
3354 | open my $fh, "<:utf8", "$CONFDIR/config" |
3355 | open my $fh, "<:utf8", "$CONFDIR/config" |
3355 | or return; |
3356 | or return; |
3356 | |
3357 | |
3357 | local $/; |
3358 | local $/; |
… | |
… | |
3389 | seek $fh, 0, 0; |
3390 | seek $fh, 0, 0; |
3390 | print $fh $$; |
3391 | print $fh $$; |
3391 | } |
3392 | } |
3392 | |
3393 | |
3393 | sub main { |
3394 | sub main { |
3394 | atomic; |
3395 | cf::init_globals; # initialise logging |
|
|
3396 | |
|
|
3397 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
|
|
3398 | LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
|
|
3399 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
|
|
3400 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
|
|
3401 | |
|
|
3402 | cf::init_experience; |
|
|
3403 | cf::init_anim; |
|
|
3404 | cf::init_attackmess; |
|
|
3405 | cf::init_dynamic; |
|
|
3406 | cf::init_block; |
|
|
3407 | |
|
|
3408 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3395 | |
3409 | |
3396 | # we must not ever block the main coroutine |
3410 | # we must not ever block the main coroutine |
3397 | local $Coro::idle = sub { |
3411 | local $Coro::idle = sub { |
3398 | Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# |
3412 | Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# |
3399 | (async { |
3413 | (async { |
3400 | $Coro::current->{desc} = "IDLE BUG HANDLER"; |
3414 | $Coro::current->{desc} = "IDLE BUG HANDLER"; |
3401 | EV::loop EV::LOOP_ONESHOT; |
3415 | EV::loop EV::LOOP_ONESHOT; |
3402 | })->prio (Coro::PRIO_MAX); |
3416 | })->prio (Coro::PRIO_MAX); |
3403 | }; |
3417 | }; |
3404 | |
3418 | |
3405 | { |
3419 | evthread_start IO::AIO::poll_fileno; |
3406 | my $guard = freeze_mainloop; |
3420 | |
|
|
3421 | cf::sync_job { |
|
|
3422 | reload_resources; |
3407 | reload_config; |
3423 | reload_config; |
3408 | db_init; |
3424 | db_init; |
|
|
3425 | |
|
|
3426 | cf::load_settings; |
|
|
3427 | cf::load_materials; |
|
|
3428 | cf::init_uuid; |
|
|
3429 | cf::init_signals; |
|
|
3430 | cf::init_commands; |
|
|
3431 | cf::init_skills; |
|
|
3432 | |
|
|
3433 | cf::init_beforeplay; |
|
|
3434 | |
|
|
3435 | atomic; |
|
|
3436 | |
3409 | load_extensions; |
3437 | load_extensions; |
3410 | |
3438 | |
3411 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
|
|
3412 | } |
|
|
3413 | |
|
|
3414 | utime time, time, $RUNTIMEFILE; |
3439 | utime time, time, $RUNTIMEFILE; |
3415 | |
3440 | |
3416 | # no (long-running) fork's whatsoever before this point(!) |
3441 | # no (long-running) fork's whatsoever before this point(!) |
3417 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3442 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
|
|
3443 | |
|
|
3444 | (pop @POST_INIT)->(0) while @POST_INIT; |
|
|
3445 | }; |
3418 | |
3446 | |
3419 | EV::loop; |
3447 | EV::loop; |
3420 | } |
3448 | } |
3421 | |
3449 | |
3422 | ############################################################################# |
3450 | ############################################################################# |
… | |
… | |
3480 | my $uuid = "$LOCALDIR/uuid"; |
3508 | my $uuid = "$LOCALDIR/uuid"; |
3481 | |
3509 | |
3482 | my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 |
3510 | my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 |
3483 | or return; |
3511 | or return; |
3484 | |
3512 | |
3485 | my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; |
3513 | my $value = uuid_seq uuid_cur; |
|
|
3514 | |
|
|
3515 | unless ($value) { |
|
|
3516 | warn "cowardly refusing to write zero uuid value!\n"; |
|
|
3517 | return; |
|
|
3518 | } |
|
|
3519 | |
|
|
3520 | my $value = uuid_str $value + $uuid_skip; |
3486 | $uuid_skip = 0; |
3521 | $uuid_skip = 0; |
3487 | |
3522 | |
3488 | (aio_write $fh, 0, (length $value), $value, 0) <= 0 |
3523 | (aio_write $fh, 0, (length $value), $value, 0) <= 0 |
3489 | and return; |
3524 | and return; |
3490 | |
3525 | |
… | |
… | |
3512 | } |
3547 | } |
3513 | |
3548 | |
3514 | sub emergency_save() { |
3549 | sub emergency_save() { |
3515 | my $freeze_guard = cf::freeze_mainloop; |
3550 | my $freeze_guard = cf::freeze_mainloop; |
3516 | |
3551 | |
3517 | warn "enter emergency perl save\n"; |
3552 | warn "emergency_perl_save: enter\n"; |
3518 | |
3553 | |
3519 | cf::sync_job { |
3554 | cf::sync_job { |
|
|
3555 | # this is a trade-off: we want to be very quick here, so |
|
|
3556 | # save all maps without fsync, and later call a global sync |
|
|
3557 | # (which in turn might be very very slow) |
|
|
3558 | local $USE_FSYNC = 0; |
|
|
3559 | |
3520 | # use a peculiar iteration method to avoid tripping on perl |
3560 | # use a peculiar iteration method to avoid tripping on perl |
3521 | # refcount bugs in for. also avoids problems with players |
3561 | # refcount bugs in for. also avoids problems with players |
3522 | # and maps saved/destroyed asynchronously. |
3562 | # and maps saved/destroyed asynchronously. |
3523 | warn "begin emergency player save\n"; |
3563 | warn "emergency_perl_save: begin player save\n"; |
3524 | for my $login (keys %cf::PLAYER) { |
3564 | for my $login (keys %cf::PLAYER) { |
3525 | my $pl = $cf::PLAYER{$login} or next; |
3565 | my $pl = $cf::PLAYER{$login} or next; |
3526 | $pl->valid or next; |
3566 | $pl->valid or next; |
3527 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3567 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3528 | $pl->save; |
3568 | $pl->save; |
3529 | } |
3569 | } |
3530 | warn "end emergency player save\n"; |
3570 | warn "emergency_perl_save: end player save\n"; |
3531 | |
3571 | |
3532 | warn "begin emergency map save\n"; |
3572 | warn "emergency_perl_save: begin map save\n"; |
3533 | for my $path (keys %cf::MAP) { |
3573 | for my $path (keys %cf::MAP) { |
3534 | my $map = $cf::MAP{$path} or next; |
3574 | my $map = $cf::MAP{$path} or next; |
3535 | $map->valid or next; |
3575 | $map->valid or next; |
3536 | $map->save; |
3576 | $map->save; |
3537 | } |
3577 | } |
3538 | warn "end emergency map save\n"; |
3578 | warn "emergency_perl_save: end map save\n"; |
3539 | |
3579 | |
3540 | warn "begin emergency database checkpoint\n"; |
3580 | warn "emergency_perl_save: begin database checkpoint\n"; |
3541 | BDB::db_env_txn_checkpoint $DB_ENV; |
3581 | BDB::db_env_txn_checkpoint $DB_ENV; |
3542 | warn "end emergency database checkpoint\n"; |
3582 | warn "emergency_perl_save: end database checkpoint\n"; |
3543 | |
3583 | |
3544 | warn "begin write uuid\n"; |
3584 | warn "emergency_perl_save: begin write uuid\n"; |
3545 | write_uuid_sync 1; |
3585 | write_uuid_sync 1; |
3546 | warn "end write uuid\n"; |
3586 | warn "emergency_perl_save: end write uuid\n"; |
3547 | }; |
3587 | }; |
3548 | |
3588 | |
|
|
3589 | warn "emergency_perl_save: starting sync()\n"; |
|
|
3590 | IO::AIO::aio_sync sub { |
|
|
3591 | warn "emergency_perl_save: finished sync()\n"; |
|
|
3592 | }; |
|
|
3593 | |
3549 | warn "leave emergency perl save\n"; |
3594 | warn "emergency_perl_save: leave\n"; |
3550 | } |
3595 | } |
3551 | |
3596 | |
3552 | sub post_cleanup { |
3597 | sub post_cleanup { |
3553 | my ($make_core) = @_; |
3598 | my ($make_core) = @_; |
3554 | |
3599 | |
… | |
… | |
3580 | my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; |
3625 | my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; |
3581 | for my $name (keys %$leaf_symtab) { |
3626 | for my $name (keys %$leaf_symtab) { |
3582 | _gv_clear *{"$pkg$name"}; |
3627 | _gv_clear *{"$pkg$name"}; |
3583 | # use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; |
3628 | # use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; |
3584 | } |
3629 | } |
3585 | warn "cleared package #$pkg\n";#d# |
3630 | warn "cleared package $pkg\n";#d# |
3586 | } |
3631 | } |
3587 | |
|
|
3588 | our $RELOAD; # how many times to reload |
|
|
3589 | |
3632 | |
3590 | sub do_reload_perl() { |
3633 | sub do_reload_perl() { |
3591 | # can/must only be called in main |
3634 | # can/must only be called in main |
3592 | if ($Coro::current != $Coro::main) { |
3635 | if ($Coro::current != $Coro::main) { |
3593 | warn "can only reload from main coroutine"; |
3636 | warn "can only reload from main coroutine"; |
3594 | return; |
3637 | return; |
3595 | } |
3638 | } |
3596 | |
3639 | |
3597 | return if $RELOAD++; |
3640 | return if $RELOAD++; |
|
|
3641 | |
|
|
3642 | my $t1 = EV::time; |
3598 | |
3643 | |
3599 | while ($RELOAD) { |
3644 | while ($RELOAD) { |
3600 | warn "reloading..."; |
3645 | warn "reloading..."; |
3601 | |
3646 | |
3602 | warn "entering sync_job"; |
3647 | warn "entering sync_job"; |
… | |
… | |
3681 | cf::reload_config; |
3726 | cf::reload_config; |
3682 | |
3727 | |
3683 | warn "loading extensions"; |
3728 | warn "loading extensions"; |
3684 | cf::load_extensions; |
3729 | cf::load_extensions; |
3685 | |
3730 | |
|
|
3731 | if ($REATTACH_ON_RELOAD) { |
3686 | warn "reattaching attachments to objects/players"; |
3732 | warn "reattaching attachments to objects/players"; |
3687 | _global_reattach; # objects, sockets |
3733 | _global_reattach; # objects, sockets |
3688 | warn "reattaching attachments to maps"; |
3734 | warn "reattaching attachments to maps"; |
3689 | reattach $_ for values %MAP; |
3735 | reattach $_ for values %MAP; |
3690 | warn "reattaching attachments to players"; |
3736 | warn "reattaching attachments to players"; |
3691 | reattach $_ for values %PLAYER; |
3737 | reattach $_ for values %PLAYER; |
|
|
3738 | } |
|
|
3739 | |
|
|
3740 | warn "running post_init jobs"; |
|
|
3741 | (pop @POST_INIT)->(1) while @POST_INIT; |
3692 | |
3742 | |
3693 | warn "leaving sync_job"; |
3743 | warn "leaving sync_job"; |
3694 | |
3744 | |
3695 | 1 |
3745 | 1 |
3696 | } or do { |
3746 | } or do { |
… | |
… | |
3699 | }; |
3749 | }; |
3700 | |
3750 | |
3701 | warn "reloaded"; |
3751 | warn "reloaded"; |
3702 | --$RELOAD; |
3752 | --$RELOAD; |
3703 | } |
3753 | } |
|
|
3754 | |
|
|
3755 | $t1 = EV::time - $t1; |
|
|
3756 | warn "reload completed in ${t1}s\n"; |
3704 | }; |
3757 | }; |
3705 | |
3758 | |
3706 | our $RELOAD_WATCHER; # used only during reload |
3759 | our $RELOAD_WATCHER; # used only during reload |
3707 | |
3760 | |
3708 | sub reload_perl() { |
3761 | sub reload_perl() { |
3709 | # doing reload synchronously and two reloads happen back-to-back, |
3762 | # doing reload synchronously and two reloads happen back-to-back, |
3710 | # coro crashes during coro_state_free->destroy here. |
3763 | # coro crashes during coro_state_free->destroy here. |
3711 | |
3764 | |
|
|
3765 | $RELOAD_WATCHER ||= cf::async { |
|
|
3766 | Coro::AIO::aio_wait cache_extensions; |
|
|
3767 | |
3712 | $RELOAD_WATCHER ||= EV::timer 0, 0, sub { |
3768 | $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { |
3713 | do_reload_perl; |
3769 | do_reload_perl; |
3714 | undef $RELOAD_WATCHER; |
3770 | undef $RELOAD_WATCHER; |
|
|
3771 | }; |
3715 | }; |
3772 | }; |
3716 | } |
3773 | } |
3717 | |
3774 | |
3718 | register_command "reload" => sub { |
3775 | register_command "reload" => sub { |
3719 | my ($who, $arg) = @_; |
3776 | my ($who, $arg) = @_; |