ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.446 by root, Tue Sep 16 16:03:02 2008 UTC vs.
Revision 1.460 by root, Mon Dec 15 17:04:53 2008 UTC

… …
32use Opcode; 32use Opcode;
33use Safe; 33use Safe;
34use Safe::Hole; 34use Safe::Hole;
35use Storable (); 35use Storable ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
… …
63 65
64# configure various modules to our taste 66# configure various modules to our taste
65# 67#
66$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71 76
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 78
74our %COMMAND = (); 79our %COMMAND = ();
75our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 83our %EXTCMD = ();
79our %EXTICMD = (); 84our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
82 87
83our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 89our @EVENT;
85 90
86our $CONFDIR = confdir; 91our $CONFDIR = confdir;
87our $DATADIR = datadir; 92our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
… …
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 132our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
129 134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
138
130binmode STDOUT; 139binmode STDOUT;
131binmode STDERR; 140binmode STDERR;
132 141
133# read virtual server time, if available 142# read virtual server time, if available
134unless ($RUNTIME || !-e $RUNTIMEFILE) { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
… …
302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303 312
304sub encode_json($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
306 315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
329
307=item cf::lock_wait $string 330=item cf::lock_wait $string
308 331
309Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
310 333
311=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
312 335
313Wait until the given lock is available and then acquires it and returns 336Wait until the given lock is available and then acquires it and returns
314a Coro::guard object. If the guard object gets destroyed (goes out of scope, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
316returned. 339returned.
317 340
318Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro. 342deadlocked coro.
… …
325 348
326Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
327 350
328=cut 351=cut
329 352
330our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 354
333sub lock_wait($) { 355sub lock_wait($) {
334 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 357}
347 358
348sub lock_acquire($) { 359sub lock_acquire($) {
349 my ($key) = @_; 360 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 361}
363 362
364sub lock_active($) { 363sub lock_active($) {
365 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 365}
369 366
370sub freeze_mainloop { 367sub freeze_mainloop {
371 tick_inhibit_inc; 368 tick_inhibit_inc;
372 369
373 Coro::guard \&tick_inhibit_dec; 370 &Guard::guard (\&tick_inhibit_dec);
374} 371}
375 372
376=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
377 374
378Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
… …
730 727
731############################################################################# 728#############################################################################
732 729
733=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
734 731
735Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
736attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
738 735
739In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
740C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
790=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
791 788
792Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
794 791
795Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
796that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
797 794
798These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
799 796
800=over 4 797=over 4
… …
1167 } else { 1164 } else {
1168 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1169 } 1166 }
1170 1167
1171 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1172 } else {
1173 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1174 } 1174 }
1175 } else { 1175 } else {
1176 aio_unlink $filename; 1176 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1178 } 1178 }
… …
1269 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1270 1270
1271 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1272} 1272}
1273 1273
1274use File::Glob ();
1275
1274cf::player->attach ( 1276cf::player->attach (
1275 on_command => sub { 1277 on_command => sub {
1276 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1277 1279
1278 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
… …
1309 } 1311 }
1310 1312
1311 cf::override; 1313 cf::override;
1312 }, 1314 },
1313); 1315);
1316
1317# "readahead" all extensions
1318sub 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}
1314 1329
1315sub load_extensions { 1330sub load_extensions {
1316 cf::sync_job { 1331 cf::sync_job {
1317 my %todo; 1332 my %todo;
1318 1333
… …
1388 1403
1389=back 1404=back
1390 1405
1391=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1392 1407
1393Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1394 1409
1395=cut 1410=cut
1396 1411
1397package cf::player; 1412package cf::player;
1398 1413
… …
1441 1456
1442sub exists($) { 1457sub exists($) {
1443 my ($login) = @_; 1458 my ($login) = @_;
1444 1459
1445 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1447} 1462}
1448 1463
1449sub find($) { 1464sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1466 my $login = $_[0];
… …
1622 } 1637 }
1623 1638
1624 \@paths 1639 \@paths
1625} 1640}
1626 1641
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1643
1629Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1630 1645
1631=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1632 1647
1633Sends an ext reply to the player. 1648Sends an ext reply to the player.
1634 1649
… …
1947sub find { 1962sub find {
1948 my ($path, $origin) = @_; 1963 my ($path, $origin) = @_;
1949 1964
1950 $path = normalise $path, $origin && $origin->path; 1965 $path = normalise $path, $origin && $origin->path;
1951 1966
1952 cf::lock_wait "map_data:$path";#d#remove 1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 1968 my $guard2 = cf::lock_acquire "map_find:$path";
1954 1969
1955 $cf::MAP{$path} || do { 1970 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 1971 my $map = new_from_path cf::map $path
1960 or return; 1972 or return;
1961 1973
1962 $map->{last_save} = $cf::RUNTIME; 1974 $map->{last_save} = $cf::RUNTIME;
1963 1975
… …
2692 $self->contr->savebed ($map, $x, $y) 2704 $self->contr->savebed ($map, $x, $y)
2693 if $exit->flag (cf::FLAG_DAMNED); 2705 if $exit->flag (cf::FLAG_DAMNED);
2694 2706
2695 1 2707 1
2696 }) { 2708 }) {
2697 $self->message ("Something went wrong deep within the crossfire server. " 2709 $self->message ("Something went wrong deep within the deliantra server. "
2698 . "I'll try to bring you back to the map you were before. " 2710 . "I'll try to bring you back to the map you were before. "
2699 . "Please report this to the dungeon master!", 2711 . "Please report this to the dungeon master!",
2700 cf::NDI_UNIQUE | cf::NDI_RED); 2712 cf::NDI_UNIQUE | cf::NDI_RED);
2701 2713
2702 warn "ERROR in enter_exit: $@"; 2714 warn "ERROR in enter_exit: $@";
… …
2768 id => "infobox", 2780 id => "infobox",
2769 title => "Body Parts", 2781 title => "Body Parts",
2770 reply => undef, 2782 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 2783 tooltip => "Shows which body parts you posess and are available",
2772 }, 2784 },
2785 "c/skills" => {
2786 id => "infobox",
2787 title => "Skills",
2788 reply => undef,
2789 tooltip => "Shows your experience per skill and item power",
2790 },
2773 "c/uptime" => { 2791 "c/uptime" => {
2774 id => "infobox", 2792 id => "infobox",
2775 title => "Uptime", 2793 title => "Uptime",
2776 reply => undef, 2794 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 2795 tooltip => "How long the server has been running since last restart",
… …
2791); 2809);
2792 2810
2793sub cf::client::send_msg { 2811sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 2812 my ($self, $channel, $msg, $color, @extra) = @_;
2795 2813
2796 $msg = $self->pl->expand_cfpod ($msg); 2814 $msg = $self->pl->expand_cfpod ($msg)
2815 unless $color & cf::NDI_VERBATIM;
2797 2816
2798 $color &= cf::NDI_CLIENT_MASK; # just in case... 2817 $color &= cf::NDI_CLIENT_MASK; # just in case...
2799 2818
2800 # check predefined channels, for the benefit of C 2819 # check predefined channels, for the benefit of C
2801 if ($CHANNEL{$channel}) { 2820 if ($CHANNEL{$channel}) {
… …
3330 reload_treasures; 3349 reload_treasures;
3331 3350
3332 warn "finished reloading resource files\n"; 3351 warn "finished reloading resource files\n";
3333} 3352}
3334 3353
3335sub init {
3336 my $guard = freeze_mainloop;
3337
3338 evthread_start IO::AIO::poll_fileno;
3339
3340 reload_resources;
3341}
3342
3343sub reload_config { 3354sub reload_config {
3344 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
3345 or return; 3356 or return;
3346 3357
3347 local $/; 3358 local $/;
… …
3379 seek $fh, 0, 0; 3390 seek $fh, 0, 0;
3380 print $fh $$; 3391 print $fh $$;
3381} 3392}
3382 3393
3383sub main { 3394sub main {
3384 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
3385 3409
3386 # we must not ever block the main coroutine 3410 # we must not ever block the main coroutine
3387 local $Coro::idle = sub { 3411 local $Coro::idle = sub {
3388 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#
3389 (async { 3413 (async {
3390 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3414 $Coro::current->{desc} = "IDLE BUG HANDLER";
3391 EV::loop EV::LOOP_ONESHOT; 3415 EV::loop EV::LOOP_ONESHOT;
3392 })->prio (Coro::PRIO_MAX); 3416 })->prio (Coro::PRIO_MAX);
3393 }; 3417 };
3394 3418
3395 { 3419 evthread_start IO::AIO::poll_fileno;
3396 my $guard = freeze_mainloop; 3420
3421 cf::sync_job {
3422 reload_resources;
3397 reload_config; 3423 reload_config;
3398 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
3399 load_extensions; 3437 load_extensions;
3400 3438
3401 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 }
3403
3404 utime time, time, $RUNTIMEFILE; 3439 utime time, time, $RUNTIMEFILE;
3405 3440
3406 # no (long-running) fork's whatsoever before this point(!) 3441 # no (long-running) fork's whatsoever before this point(!)
3407 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 };
3408 3446
3409 EV::loop; 3447 EV::loop;
3410} 3448}
3411 3449
3412############################################################################# 3450#############################################################################
… …
3470 my $uuid = "$LOCALDIR/uuid"; 3508 my $uuid = "$LOCALDIR/uuid";
3471 3509
3472 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3473 or return; 3511 or return;
3474 3512
3475 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;
3476 $uuid_skip = 0; 3521 $uuid_skip = 0;
3477 3522
3478 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3479 and return; 3524 and return;
3480 3525
… …
3502} 3547}
3503 3548
3504sub emergency_save() { 3549sub emergency_save() {
3505 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3506 3551
3507 warn "enter emergency perl save\n"; 3552 warn "emergency_perl_save: enter\n";
3508 3553
3509 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
3510 # use a peculiar iteration method to avoid tripping on perl 3560 # use a peculiar iteration method to avoid tripping on perl
3511 # refcount bugs in for. also avoids problems with players 3561 # refcount bugs in for. also avoids problems with players
3512 # and maps saved/destroyed asynchronously. 3562 # and maps saved/destroyed asynchronously.
3513 warn "begin emergency player save\n"; 3563 warn "emergency_perl_save: begin player save\n";
3514 for my $login (keys %cf::PLAYER) { 3564 for my $login (keys %cf::PLAYER) {
3515 my $pl = $cf::PLAYER{$login} or next; 3565 my $pl = $cf::PLAYER{$login} or next;
3516 $pl->valid or next; 3566 $pl->valid or next;
3517 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3518 $pl->save; 3568 $pl->save;
3519 } 3569 }
3520 warn "end emergency player save\n"; 3570 warn "emergency_perl_save: end player save\n";
3521 3571
3522 warn "begin emergency map save\n"; 3572 warn "emergency_perl_save: begin map save\n";
3523 for my $path (keys %cf::MAP) { 3573 for my $path (keys %cf::MAP) {
3524 my $map = $cf::MAP{$path} or next; 3574 my $map = $cf::MAP{$path} or next;
3525 $map->valid or next; 3575 $map->valid or next;
3526 $map->save; 3576 $map->save;
3527 } 3577 }
3528 warn "end emergency map save\n"; 3578 warn "emergency_perl_save: end map save\n";
3529 3579
3530 warn "begin emergency database checkpoint\n"; 3580 warn "emergency_perl_save: begin database checkpoint\n";
3531 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3532 warn "end emergency database checkpoint\n"; 3582 warn "emergency_perl_save: end database checkpoint\n";
3533 3583
3534 warn "begin write uuid\n"; 3584 warn "emergency_perl_save: begin write uuid\n";
3535 write_uuid_sync 1; 3585 write_uuid_sync 1;
3536 warn "end write uuid\n"; 3586 warn "emergency_perl_save: end write uuid\n";
3537 }; 3587 };
3538 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
3539 warn "leave emergency perl save\n"; 3594 warn "emergency_perl_save: leave\n";
3540} 3595}
3541 3596
3542sub post_cleanup { 3597sub post_cleanup {
3543 my ($make_core) = @_; 3598 my ($make_core) = @_;
3544 3599
… …
3570 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3571 for my $name (keys %$leaf_symtab) { 3626 for my $name (keys %$leaf_symtab) {
3572 _gv_clear *{"$pkg$name"}; 3627 _gv_clear *{"$pkg$name"};
3573# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3574 } 3629 }
3575 warn "cleared package #$pkg\n";#d# 3630 warn "cleared package $pkg\n";#d#
3576} 3631}
3577
3578our $RELOAD; # how many times to reload
3579 3632
3580sub do_reload_perl() { 3633sub do_reload_perl() {
3581 # can/must only be called in main 3634 # can/must only be called in main
3582 if ($Coro::current != $Coro::main) { 3635 if ($Coro::current != $Coro::main) {
3583 warn "can only reload from main coroutine"; 3636 warn "can only reload from main coroutine";
3584 return; 3637 return;
3585 } 3638 }
3586 3639
3587 return if $RELOAD++; 3640 return if $RELOAD++;
3641
3642 my $t1 = EV::time;
3588 3643
3589 while ($RELOAD) { 3644 while ($RELOAD) {
3590 warn "reloading..."; 3645 warn "reloading...";
3591 3646
3592 warn "entering sync_job"; 3647 warn "entering sync_job";
… …
3671 cf::reload_config; 3726 cf::reload_config;
3672 3727
3673 warn "loading extensions"; 3728 warn "loading extensions";
3674 cf::load_extensions; 3729 cf::load_extensions;
3675 3730
3731 if ($REATTACH_ON_RELOAD) {
3676 warn "reattaching attachments to objects/players"; 3732 warn "reattaching attachments to objects/players";
3677 _global_reattach; # objects, sockets 3733 _global_reattach; # objects, sockets
3678 warn "reattaching attachments to maps"; 3734 warn "reattaching attachments to maps";
3679 reattach $_ for values %MAP; 3735 reattach $_ for values %MAP;
3680 warn "reattaching attachments to players"; 3736 warn "reattaching attachments to players";
3681 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;
3682 3742
3683 warn "leaving sync_job"; 3743 warn "leaving sync_job";
3684 3744
3685 1 3745 1
3686 } or do { 3746 } or do {
… …
3689 }; 3749 };
3690 3750
3691 warn "reloaded"; 3751 warn "reloaded";
3692 --$RELOAD; 3752 --$RELOAD;
3693 } 3753 }
3754
3755 $t1 = EV::time - $t1;
3756 warn "reload completed in ${t1}s\n";
3694}; 3757};
3695 3758
3696our $RELOAD_WATCHER; # used only during reload 3759our $RELOAD_WATCHER; # used only during reload
3697 3760
3698sub reload_perl() { 3761sub reload_perl() {
3699 # doing reload synchronously and two reloads happen back-to-back, 3762 # doing reload synchronously and two reloads happen back-to-back,
3700 # coro crashes during coro_state_free->destroy here. 3763 # coro crashes during coro_state_free->destroy here.
3701 3764
3765 $RELOAD_WATCHER ||= cf::async {
3766 Coro::AIO::aio_wait cache_extensions;
3767
3702 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3703 do_reload_perl; 3769 do_reload_perl;
3704 undef $RELOAD_WATCHER; 3770 undef $RELOAD_WATCHER;
3771 };
3705 }; 3772 };
3706} 3773}
3707 3774
3708register_command "reload" => sub { 3775register_command "reload" => sub {
3709 my ($who, $arg) = @_; 3776 my ($who, $arg) = @_;

Diff Legend

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