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.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.463 by root, Sun Dec 28 06:59:27 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 ();
… …
81our %EXTCMD = (); 83our %EXTCMD = ();
82our %EXTICMD = (); 84our %EXTICMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
85 87
86our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 89our @EVENT;
88 90
89our $CONFDIR = confdir; 91our $CONFDIR = confdir;
90our $DATADIR = datadir; 92our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
… …
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 132our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
132 134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
138
133binmode STDOUT; 139binmode STDOUT;
134binmode STDERR; 140binmode STDERR;
135 141
136# read virtual server time, if available 142# read virtual server time, if available
137unless ($RUNTIME || !-e $RUNTIMEFILE) { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
… …
305our $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
306 312
307sub encode_json($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
310=item cf::lock_wait $string 330=item cf::lock_wait $string
311 331
312Wait until the given lock is available. See cf::lock_acquire. 332Wait 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
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
319returned. 339returned.
320 340
321Locks 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
322deadlocked coro. 342deadlocked coro.
… …
328 348
329Return 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.
330 350
331=cut 351=cut
332 352
333our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 354
336sub lock_wait($) { 355sub 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
351sub lock_acquire($) { 359sub 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
367sub lock_active($) { 363sub lock_active($) {
368 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 365}
372 366
373sub freeze_mainloop { 367sub 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
381Like 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
… …
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
1274use File::Glob ();
1275
1277cf::player->attach ( 1276cf::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
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}
1317 1329
1318sub load_extensions { 1330sub load_extensions {
1319 cf::sync_job { 1331 cf::sync_job {
1320 my %todo; 1332 my %todo;
1321 1333
… …
1444 1456
1445sub exists($) { 1457sub 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
1452sub find($) { 1464sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1466 my $login = $_[0];
… …
1850 1862
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1853} 1865}
1854 1866
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 1867sub decay_objects {
1865 my ($self) = @_; 1868 my ($self) = @_;
1866 1869
1867 return if $self->{deny_reset}; 1870 return if $self->{deny_reset};
1868 1871
… …
1950sub find { 1953sub find {
1951 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1952 1955
1953 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1954 1957
1955 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1957 1960
1958 $cf::MAP{$path} || do { 1961 $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 1962 my $map = new_from_path cf::map $path
1963 or return; 1963 or return;
1964 1964
1965 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1966 1966
… …
2033 2033
2034 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2035 $self->decay_objects;
2036 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2037 $self->update_buttons; 2037 $self->update_buttons;
2038 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick; 2038 cf::cede_to_tick;
2041 $self->activate; 2039 $self->activate;
2042 } 2040 }
2043 2041
2044 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
… …
2795 id => "party", 2793 id => "party",
2796 title => "Party", 2794 title => "Party",
2797 reply => "gsay ", 2795 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party", 2796 tooltip => "Messages and chat related to your party",
2799 }, 2797 },
2798 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL,
2800); 2800);
2801 2801
2802sub cf::client::send_msg { 2802sub cf::client::send_msg {
2803 my ($self, $channel, $msg, $color, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2804 2804
… …
2809 2809
2810 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2812 $channel = $CHANNEL{$channel};
2813 2813
2814 $self->ext_msg (channel_info => $channel) 2814 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2815 $channel = $channel->{id};
2818 2816
2819 } elsif (ref $channel) { 2817 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2818 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2819 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2820 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2821 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2822 }
2826 2823
2827 $channel = $channel->{id}; 2824 $channel = $channel->{id};
2828 } 2825 }
2829 2826
2830 return unless @extra || length $msg; 2827 return unless @extra || length $msg;
2831 2828
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2829 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2830 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2831 if $color & cf::NDI_DEF;
2836 2832
2837 my $pkt = "msg " 2833 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 2834 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2835 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 2836 );
2841 2837
2842 # try lzf for large packets 2838 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt 2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf}; 2840 if 1024 <= length $pkt and $self->{can_lzf};
2845 2841
2846 # split very large packets 2842 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) { 2843 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2844 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag"; 2845 $pkt = "frag";
2850 } 2846 }
2851 2847
2852 $self->send_packet ($pkt); 2848 $self->send_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 2849}
2879 2850
2880=item $client->ext_msg ($type, @msg) 2851=item $client->ext_msg ($type, @msg)
2881 2852
2882Sends an ext event to the client. 2853Sends an ext event to the client.
… …
3340 reload_treasures; 3311 reload_treasures;
3341 3312
3342 warn "finished reloading resource files\n"; 3313 warn "finished reloading resource files\n";
3343} 3314}
3344 3315
3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3350 reload_resources;
3351}
3352
3353sub reload_config { 3316sub reload_config {
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3317 open my $fh, "<:utf8", "$CONFDIR/config"
3355 or return; 3318 or return;
3356 3319
3357 local $/; 3320 local $/;
… …
3389 seek $fh, 0, 0; 3352 seek $fh, 0, 0;
3390 print $fh $$; 3353 print $fh $$;
3391} 3354}
3392 3355
3393sub main { 3356sub main {
3394 atomic; 3357 cf::init_globals; # initialise logging
3358
3359 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3360 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3361 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3362 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3363
3364 cf::init_experience;
3365 cf::init_anim;
3366 cf::init_attackmess;
3367 cf::init_dynamic;
3368
3369 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 3370
3396 # we must not ever block the main coroutine 3371 # we must not ever block the main coroutine
3397 local $Coro::idle = sub { 3372 local $Coro::idle = sub {
3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3373 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3399 (async { 3374 (async {
3400 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3375 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT; 3376 EV::loop EV::LOOP_ONESHOT;
3402 })->prio (Coro::PRIO_MAX); 3377 })->prio (Coro::PRIO_MAX);
3403 }; 3378 };
3404 3379
3405 { 3380 evthread_start IO::AIO::poll_fileno;
3406 my $guard = freeze_mainloop; 3381
3382 cf::sync_job {
3383 reload_resources;
3407 reload_config; 3384 reload_config;
3408 db_init; 3385 db_init;
3386
3387 cf::load_settings;
3388 cf::load_materials;
3389 cf::init_uuid;
3390 cf::init_signals;
3391 cf::init_commands;
3392 cf::init_skills;
3393
3394 cf::init_beforeplay;
3395
3396 atomic;
3397
3409 load_extensions; 3398 load_extensions;
3410 3399
3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE; 3400 utime time, time, $RUNTIMEFILE;
3415 3401
3416 # no (long-running) fork's whatsoever before this point(!) 3402 # no (long-running) fork's whatsoever before this point(!)
3417 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3403 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3404
3405 (pop @POST_INIT)->(0) while @POST_INIT;
3406 };
3418 3407
3419 EV::loop; 3408 EV::loop;
3420} 3409}
3421 3410
3422############################################################################# 3411#############################################################################
… …
3480 my $uuid = "$LOCALDIR/uuid"; 3469 my $uuid = "$LOCALDIR/uuid";
3481 3470
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3471 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return; 3472 or return;
3484 3473
3485 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3474 my $value = uuid_seq uuid_cur;
3475
3476 unless ($value) {
3477 warn "cowardly refusing to write zero uuid value!\n";
3478 return;
3479 }
3480
3481 my $value = uuid_str $value + $uuid_skip;
3486 $uuid_skip = 0; 3482 $uuid_skip = 0;
3487 3483
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3484 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return; 3485 and return;
3490 3486
… …
3512} 3508}
3513 3509
3514sub emergency_save() { 3510sub emergency_save() {
3515 my $freeze_guard = cf::freeze_mainloop; 3511 my $freeze_guard = cf::freeze_mainloop;
3516 3512
3517 warn "enter emergency perl save\n"; 3513 warn "emergency_perl_save: enter\n";
3518 3514
3519 cf::sync_job { 3515 cf::sync_job {
3516 # this is a trade-off: we want to be very quick here, so
3517 # save all maps without fsync, and later call a global sync
3518 # (which in turn might be very very slow)
3519 local $USE_FSYNC = 0;
3520
3520 # use a peculiar iteration method to avoid tripping on perl 3521 # use a peculiar iteration method to avoid tripping on perl
3521 # refcount bugs in for. also avoids problems with players 3522 # refcount bugs in for. also avoids problems with players
3522 # and maps saved/destroyed asynchronously. 3523 # and maps saved/destroyed asynchronously.
3523 warn "begin emergency player save\n"; 3524 warn "emergency_perl_save: begin player save\n";
3524 for my $login (keys %cf::PLAYER) { 3525 for my $login (keys %cf::PLAYER) {
3525 my $pl = $cf::PLAYER{$login} or next; 3526 my $pl = $cf::PLAYER{$login} or next;
3526 $pl->valid or next; 3527 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3528 $pl->save; 3529 $pl->save;
3529 } 3530 }
3530 warn "end emergency player save\n"; 3531 warn "emergency_perl_save: end player save\n";
3531 3532
3532 warn "begin emergency map save\n"; 3533 warn "emergency_perl_save: begin map save\n";
3533 for my $path (keys %cf::MAP) { 3534 for my $path (keys %cf::MAP) {
3534 my $map = $cf::MAP{$path} or next; 3535 my $map = $cf::MAP{$path} or next;
3535 $map->valid or next; 3536 $map->valid or next;
3536 $map->save; 3537 $map->save;
3537 } 3538 }
3538 warn "end emergency map save\n"; 3539 warn "emergency_perl_save: end map save\n";
3539 3540
3540 warn "begin emergency database checkpoint\n"; 3541 warn "emergency_perl_save: begin database checkpoint\n";
3541 BDB::db_env_txn_checkpoint $DB_ENV; 3542 BDB::db_env_txn_checkpoint $DB_ENV;
3542 warn "end emergency database checkpoint\n"; 3543 warn "emergency_perl_save: end database checkpoint\n";
3543 3544
3544 warn "begin write uuid\n"; 3545 warn "emergency_perl_save: begin write uuid\n";
3545 write_uuid_sync 1; 3546 write_uuid_sync 1;
3546 warn "end write uuid\n"; 3547 warn "emergency_perl_save: end write uuid\n";
3547 }; 3548 };
3548 3549
3550 warn "emergency_perl_save: starting sync()\n";
3551 IO::AIO::aio_sync sub {
3552 warn "emergency_perl_save: finished sync()\n";
3553 };
3554
3549 warn "leave emergency perl save\n"; 3555 warn "emergency_perl_save: leave\n";
3550} 3556}
3551 3557
3552sub post_cleanup { 3558sub post_cleanup {
3553 my ($make_core) = @_; 3559 my ($make_core) = @_;
3554 3560
… …
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3586 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) { 3587 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"}; 3588 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3589# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 } 3590 }
3585 warn "cleared package #$pkg\n";#d# 3591 warn "cleared package $pkg\n";#d#
3586} 3592}
3587
3588our $RELOAD; # how many times to reload
3589 3593
3590sub do_reload_perl() { 3594sub do_reload_perl() {
3591 # can/must only be called in main 3595 # can/must only be called in main
3592 if ($Coro::current != $Coro::main) { 3596 if ($Coro::current != $Coro::main) {
3593 warn "can only reload from main coroutine"; 3597 warn "can only reload from main coroutine";
3594 return; 3598 return;
3595 } 3599 }
3596 3600
3597 return if $RELOAD++; 3601 return if $RELOAD++;
3602
3603 my $t1 = EV::time;
3598 3604
3599 while ($RELOAD) { 3605 while ($RELOAD) {
3600 warn "reloading..."; 3606 warn "reloading...";
3601 3607
3602 warn "entering sync_job"; 3608 warn "entering sync_job";
… …
3681 cf::reload_config; 3687 cf::reload_config;
3682 3688
3683 warn "loading extensions"; 3689 warn "loading extensions";
3684 cf::load_extensions; 3690 cf::load_extensions;
3685 3691
3692 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3689 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3691 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3699 }
3700
3701 warn "running post_init jobs";
3702 (pop @POST_INIT)->(1) while @POST_INIT;
3692 3703
3693 warn "leaving sync_job"; 3704 warn "leaving sync_job";
3694 3705
3695 1 3706 1
3696 } or do { 3707 } or do {
… …
3699 }; 3710 };
3700 3711
3701 warn "reloaded"; 3712 warn "reloaded";
3702 --$RELOAD; 3713 --$RELOAD;
3703 } 3714 }
3715
3716 $t1 = EV::time - $t1;
3717 warn "reload completed in ${t1}s\n";
3704}; 3718};
3705 3719
3706our $RELOAD_WATCHER; # used only during reload 3720our $RELOAD_WATCHER; # used only during reload
3707 3721
3708sub reload_perl() { 3722sub reload_perl() {
3709 # doing reload synchronously and two reloads happen back-to-back, 3723 # doing reload synchronously and two reloads happen back-to-back,
3710 # coro crashes during coro_state_free->destroy here. 3724 # coro crashes during coro_state_free->destroy here.
3711 3725
3726 $RELOAD_WATCHER ||= cf::async {
3727 Coro::AIO::aio_wait cache_extensions;
3728
3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3729 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3713 do_reload_perl; 3730 do_reload_perl;
3714 undef $RELOAD_WATCHER; 3731 undef $RELOAD_WATCHER;
3732 };
3715 }; 3733 };
3716} 3734}
3717 3735
3718register_command "reload" => sub { 3736register_command "reload" => sub {
3719 my ($who, $arg) = @_; 3737 my ($who, $arg) = @_;

Diff Legend

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