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.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.465 by root, Thu Jan 8 00:54:55 2009 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
… …
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
… …
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];
… …
1847 1862
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1850} 1865}
1851 1866
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 1867sub decay_objects {
1862 my ($self) = @_; 1868 my ($self) = @_;
1863 1869
1864 return if $self->{deny_reset}; 1870 return if $self->{deny_reset};
1865 1871
… …
1947sub find { 1953sub find {
1948 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1949 1955
1950 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1951 1957
1952 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1954 1960
1955 $cf::MAP{$path} || do { 1961 $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 1962 my $map = new_from_path cf::map $path
1960 or return; 1963 or return;
1961 1964
1962 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1963 1966
… …
2030 2033
2031 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2035 $self->decay_objects;
2033 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2034 $self->update_buttons; 2037 $self->update_buttons;
2035 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick; 2038 cf::cede_to_tick;
2038 $self->activate; 2039 $self->activate;
2039 } 2040 }
2040 2041
2041 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
… …
2768 id => "infobox", 2769 id => "infobox",
2769 title => "Body Parts", 2770 title => "Body Parts",
2770 reply => undef, 2771 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 2772 tooltip => "Shows which body parts you posess and are available",
2772 }, 2773 },
2774 "c/statistics" => {
2775 id => "infobox",
2776 title => "Statistics",
2777 reply => undef,
2778 tooltip => "Shows your primary statistics",
2779 },
2780 "c/skills" => {
2781 id => "infobox",
2782 title => "Skills",
2783 reply => undef,
2784 tooltip => "Shows your experience per skill and item power",
2785 },
2786 "c/resistances" => {
2787 id => "infobox",
2788 title => "Resistances",
2789 reply => undef,
2790 tooltip => "Shows your resistances",
2791 },
2792 "c/pets" => {
2793 id => "infobox",
2794 title => "Pets",
2795 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet",
2797 },
2773 "c/uptime" => { 2798 "c/uptime" => {
2774 id => "infobox", 2799 id => "infobox",
2775 title => "Uptime", 2800 title => "Uptime",
2776 reply => undef, 2801 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 2802 tooltip => "How long the server has been running since last restart",
… …
2786 id => "party", 2811 id => "party",
2787 title => "Party", 2812 title => "Party",
2788 reply => "gsay ", 2813 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 2814 tooltip => "Messages and chat related to your party",
2790 }, 2815 },
2816 "c/death" => {
2817 id => "death",
2818 title => "Death",
2819 reply => undef,
2820 tooltip => "Reason for and more info about your most recent death",
2821 },
2822 "c/say" => $SAY_CHANNEL,
2823 "c/chat" => $CHAT_CHANNEL,
2791); 2824);
2792 2825
2793sub cf::client::send_msg { 2826sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 2827 my ($self, $channel, $msg, $color, @extra) = @_;
2795 2828
… …
2800 2833
2801 # check predefined channels, for the benefit of C 2834 # check predefined channels, for the benefit of C
2802 if ($CHANNEL{$channel}) { 2835 if ($CHANNEL{$channel}) {
2803 $channel = $CHANNEL{$channel}; 2836 $channel = $CHANNEL{$channel};
2804 2837
2805 $self->ext_msg (channel_info => $channel) 2838 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807
2808 $channel = $channel->{id}; 2839 $channel = $channel->{id};
2809 2840
2810 } elsif (ref $channel) { 2841 } elsif (ref $channel) {
2811 # send meta info to client, if not yet sent 2842 # send meta info to client, if not yet sent
2812 unless (exists $self->{channel}{$channel->{id}}) { 2843 unless (exists $self->{channel}{$channel->{id}}) {
2813 $self->{channel}{$channel->{id}} = $channel; 2844 $self->{channel}{$channel->{id}} = $channel;
2814 $self->ext_msg (channel_info => $channel) 2845 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816 } 2846 }
2817 2847
2818 $channel = $channel->{id}; 2848 $channel = $channel->{id};
2819 } 2849 }
2820 2850
2821 return unless @extra || length $msg; 2851 return unless @extra || length $msg;
2822 2852
2823 if ($self->can_msg) {
2824 # default colour, mask it out 2853 # default colour, mask it out
2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2827 2856
2828 my $pkt = "msg " 2857 my $pkt = "msg "
2829 . $self->{json_coder}->encode ( 2858 . $self->{json_coder}->encode (
2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 ); 2860 );
2832 2861
2833 # try lzf for large packets 2862 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt 2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf}; 2864 if 1024 <= length $pkt and $self->{can_lzf};
2836 2865
2837 # split very large packets 2866 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) { 2867 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag"; 2869 $pkt = "frag";
2841 } 2870 }
2842 2871
2843 $self->send_packet ($pkt); 2872 $self->send_packet ($pkt);
2844 } else {
2845 if ($color >= 0) {
2846 # replace some tags by gcfclient-compatible ones
2847 for ($msg) {
2848 1 while
2849 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2850 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2851 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2852 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2853 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2854 }
2855
2856 $color &= cf::NDI_COLOR_MASK;
2857
2858 utf8::encode $msg;
2859
2860 if (0 && $msg =~ /\[/) {
2861 # COMMAND/INFO
2862 $self->send_packet ("drawextinfo $color 10 8 $msg")
2863 } else {
2864 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2865 $self->send_packet ("drawinfo $color $msg")
2866 }
2867 }
2868 }
2869} 2873}
2870 2874
2871=item $client->ext_msg ($type, @msg) 2875=item $client->ext_msg ($type, @msg)
2872 2876
2873Sends an ext event to the client. 2877Sends an ext event to the client.
… …
3331 reload_treasures; 3335 reload_treasures;
3332 3336
3333 warn "finished reloading resource files\n"; 3337 warn "finished reloading resource files\n";
3334} 3338}
3335 3339
3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3341 reload_resources;
3342}
3343
3344sub reload_config { 3340sub reload_config {
3345 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
3346 or return; 3342 or return;
3347 3343
3348 local $/; 3344 local $/;
… …
3380 seek $fh, 0, 0; 3376 seek $fh, 0, 0;
3381 print $fh $$; 3377 print $fh $$;
3382} 3378}
3383 3379
3384sub main { 3380sub main {
3385 atomic; 3381 cf::init_globals; # initialise logging
3382
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3386 3394
3387 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
3388 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3390 (async { 3398 (async {
3391 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT; 3400 EV::loop EV::LOOP_ONESHOT;
3393 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3394 }; 3402 };
3395 3403
3396 { 3404 evthread_start IO::AIO::poll_fileno;
3397 my $guard = freeze_mainloop; 3405
3406 cf::sync_job {
3407 reload_resources;
3398 reload_config; 3408 reload_config;
3399 db_init; 3409 db_init;
3410
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid;
3414 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills;
3417
3418 cf::init_beforeplay;
3419
3420 atomic;
3421
3400 load_extensions; 3422 load_extensions;
3401 3423
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE; 3424 utime time, time, $RUNTIMEFILE;
3406 3425
3407 # no (long-running) fork's whatsoever before this point(!) 3426 # no (long-running) fork's whatsoever before this point(!)
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428
3429 (pop @POST_INIT)->(0) while @POST_INIT;
3430 };
3409 3431
3410 EV::loop; 3432 EV::loop;
3411} 3433}
3412 3434
3413############################################################################# 3435#############################################################################
… …
3471 my $uuid = "$LOCALDIR/uuid"; 3493 my $uuid = "$LOCALDIR/uuid";
3472 3494
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3495 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return; 3496 or return;
3475 3497
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3498 my $value = uuid_seq uuid_cur;
3499
3500 unless ($value) {
3501 warn "cowardly refusing to write zero uuid value!\n";
3502 return;
3503 }
3504
3505 my $value = uuid_str $value + $uuid_skip;
3477 $uuid_skip = 0; 3506 $uuid_skip = 0;
3478 3507
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3508 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return; 3509 and return;
3481 3510
… …
3503} 3532}
3504 3533
3505sub emergency_save() { 3534sub emergency_save() {
3506 my $freeze_guard = cf::freeze_mainloop; 3535 my $freeze_guard = cf::freeze_mainloop;
3507 3536
3508 warn "enter emergency perl save\n"; 3537 warn "emergency_perl_save: enter\n";
3509 3538
3510 cf::sync_job { 3539 cf::sync_job {
3540 # this is a trade-off: we want to be very quick here, so
3541 # save all maps without fsync, and later call a global sync
3542 # (which in turn might be very very slow)
3543 local $USE_FSYNC = 0;
3544
3511 # use a peculiar iteration method to avoid tripping on perl 3545 # use a peculiar iteration method to avoid tripping on perl
3512 # refcount bugs in for. also avoids problems with players 3546 # refcount bugs in for. also avoids problems with players
3513 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
3514 warn "begin emergency player save\n"; 3548 warn "emergency_perl_save: begin player save\n";
3515 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
3516 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
3517 $pl->valid or next; 3551 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519 $pl->save; 3553 $pl->save;
3520 } 3554 }
3521 warn "end emergency player save\n"; 3555 warn "emergency_perl_save: end player save\n";
3522 3556
3523 warn "begin emergency map save\n"; 3557 warn "emergency_perl_save: begin map save\n";
3524 for my $path (keys %cf::MAP) { 3558 for my $path (keys %cf::MAP) {
3525 my $map = $cf::MAP{$path} or next; 3559 my $map = $cf::MAP{$path} or next;
3526 $map->valid or next; 3560 $map->valid or next;
3527 $map->save; 3561 $map->save;
3528 } 3562 }
3529 warn "end emergency map save\n"; 3563 warn "emergency_perl_save: end map save\n";
3530 3564
3531 warn "begin emergency database checkpoint\n"; 3565 warn "emergency_perl_save: begin database checkpoint\n";
3532 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3533 warn "end emergency database checkpoint\n"; 3567 warn "emergency_perl_save: end database checkpoint\n";
3534 3568
3535 warn "begin write uuid\n"; 3569 warn "emergency_perl_save: begin write uuid\n";
3536 write_uuid_sync 1; 3570 write_uuid_sync 1;
3537 warn "end write uuid\n"; 3571 warn "emergency_perl_save: end write uuid\n";
3538 }; 3572 };
3539 3573
3574 warn "emergency_perl_save: starting sync()\n";
3575 IO::AIO::aio_sync sub {
3576 warn "emergency_perl_save: finished sync()\n";
3577 };
3578
3540 warn "leave emergency perl save\n"; 3579 warn "emergency_perl_save: leave\n";
3541} 3580}
3542 3581
3543sub post_cleanup { 3582sub post_cleanup {
3544 my ($make_core) = @_; 3583 my ($make_core) = @_;
3545 3584
… …
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) { 3611 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"}; 3612 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 } 3614 }
3576 warn "cleared package #$pkg\n";#d# 3615 warn "cleared package $pkg\n";#d#
3577} 3616}
3578
3579our $RELOAD; # how many times to reload
3580 3617
3581sub do_reload_perl() { 3618sub do_reload_perl() {
3582 # can/must only be called in main 3619 # can/must only be called in main
3583 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3584 warn "can only reload from main coroutine"; 3621 warn "can only reload from main coroutine";
3585 return; 3622 return;
3586 } 3623 }
3587 3624
3588 return if $RELOAD++; 3625 return if $RELOAD++;
3626
3627 my $t1 = EV::time;
3589 3628
3590 while ($RELOAD) { 3629 while ($RELOAD) {
3591 warn "reloading..."; 3630 warn "reloading...";
3592 3631
3593 warn "entering sync_job"; 3632 warn "entering sync_job";
… …
3672 cf::reload_config; 3711 cf::reload_config;
3673 3712
3674 warn "loading extensions"; 3713 warn "loading extensions";
3675 cf::load_extensions; 3714 cf::load_extensions;
3676 3715
3716 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 3717 warn "reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 3718 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 3719 warn "reattaching attachments to maps";
3680 reattach $_ for values %MAP; 3720 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 3721 warn "reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 3722 reattach $_ for values %PLAYER;
3723 }
3724
3725 warn "running post_init jobs";
3726 (pop @POST_INIT)->(1) while @POST_INIT;
3683 3727
3684 warn "leaving sync_job"; 3728 warn "leaving sync_job";
3685 3729
3686 1 3730 1
3687 } or do { 3731 } or do {
… …
3690 }; 3734 };
3691 3735
3692 warn "reloaded"; 3736 warn "reloaded";
3693 --$RELOAD; 3737 --$RELOAD;
3694 } 3738 }
3739
3740 $t1 = EV::time - $t1;
3741 warn "reload completed in ${t1}s\n";
3695}; 3742};
3696 3743
3697our $RELOAD_WATCHER; # used only during reload 3744our $RELOAD_WATCHER; # used only during reload
3698 3745
3699sub reload_perl() { 3746sub reload_perl() {
3700 # doing reload synchronously and two reloads happen back-to-back, 3747 # doing reload synchronously and two reloads happen back-to-back,
3701 # coro crashes during coro_state_free->destroy here. 3748 # coro crashes during coro_state_free->destroy here.
3702 3749
3750 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions;
3752
3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3704 do_reload_perl; 3754 do_reload_perl;
3705 undef $RELOAD_WATCHER; 3755 undef $RELOAD_WATCHER;
3756 };
3706 }; 3757 };
3707} 3758}
3708 3759
3709register_command "reload" => sub { 3760register_command "reload" => sub {
3710 my ($who, $arg) = @_; 3761 my ($who, $arg) = @_;

Diff Legend

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