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.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.470 by root, Sun Apr 26 19:42:45 2009 UTC

… …
21 21
22package cf; 22package cf;
23 23
24use 5.10.0; 24use 5.10.0;
25use utf8; 25use utf8;
26use strict "vars", "subs"; 26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
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 ();
… …
103our %RESOURCE; 105our %RESOURCE;
104 106
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 109our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
109 111
110our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 115our $DB_ENV;
114 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
115our %CFG; 119our %CFG;
116 120
117our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 122our $RUNTIME;
119our $NOW; 123our $NOW;
… …
129our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 134our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
132 136
133our @POST_INIT; 137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
134 140
135binmode STDOUT; 141binmode STDOUT;
136binmode STDERR; 142binmode STDERR;
137 143
138# read virtual server time, if available 144# read virtual server time, if available
139unless ($RUNTIME || !-e $RUNTIMEFILE) { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
140 open my $fh, "<", $RUNTIMEFILE 146 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
143} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
144 152
145mkdir $_ 153mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 155
148our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
… …
328Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
329 337
330=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
331 339
332Wait until the given lock is available and then acquires it and returns 340Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
335returned. 343returned.
336 344
337Locks are *not* recursive, locking from the same coro twice results in a 345Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 346deadlocked coro.
… …
344 352
345Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
346 354
347=cut 355=cut
348 356
349our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 358
352sub lock_wait($) { 359sub lock_wait($) {
353 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 361}
367 362
368sub lock_acquire($) { 363sub lock_acquire($) {
369 my ($key) = @_; 364 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 365}
383 366
384sub lock_active($) { 367sub lock_active($) {
385 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 369}
389 370
390sub freeze_mainloop { 371sub freeze_mainloop {
391 tick_inhibit_inc; 372 tick_inhibit_inc;
392 373
393 Coro::guard \&tick_inhibit_dec; 374 &Guard::guard (\&tick_inhibit_dec);
394} 375}
395 376
396=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
397 378
398Like EV::periodic, but randomly selects a starting point so that the actions 379Like EV::periodic, but randomly selects a starting point so that the actions
… …
1189 } 1170 }
1190 1171
1191 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1192 1173
1193 $filename =~ s%/[^/]+$%%; 1174 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename; 1175 aio_pathsync $filename if $cf::USE_FSYNC;
1195 } else { 1176 } else {
1196 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1197 } 1178 }
1198 } else { 1179 } else {
1199 aio_unlink $filename; 1180 aio_unlink $filename;
1200 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1201 } 1182 }
… …
1292 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1293 1274
1294 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1295} 1276}
1296 1277
1278use File::Glob ();
1279
1297cf::player->attach ( 1280cf::player->attach (
1298 on_command => sub { 1281 on_command => sub {
1299 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1300 1283
1301 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
… …
1332 } 1315 }
1333 1316
1334 cf::override; 1317 cf::override;
1335 }, 1318 },
1336); 1319);
1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1337 1333
1338sub load_extensions { 1334sub load_extensions {
1339 cf::sync_job { 1335 cf::sync_job {
1340 my %todo; 1336 my %todo;
1341 1337
… …
1870 1866
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1873} 1869}
1874 1870
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882}
1883
1884sub decay_objects { 1871sub decay_objects {
1885 my ($self) = @_; 1872 my ($self) = @_;
1886 1873
1887 return if $self->{deny_reset}; 1874 return if $self->{deny_reset};
1888 1875
… …
1970sub find { 1957sub find {
1971 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1972 1959
1973 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1974 1961
1975 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1977 1964
1978 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1982 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
1983 or return; 1967 or return;
1984 1968
1985 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1986 1970
… …
2053 2037
2054 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2039 $self->decay_objects;
2056 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2057 $self->update_buttons; 2041 $self->update_buttons;
2058 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick; 2042 cf::cede_to_tick;
2061 $self->activate; 2043 $self->activate;
2062 } 2044 }
2063 2045
2064 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
… …
2406 2388
2407our $SAY_CHANNEL = { 2389our $SAY_CHANNEL = {
2408 id => "say", 2390 id => "say",
2409 title => "Map", 2391 title => "Map",
2410 reply => "say ", 2392 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2412}; 2394};
2413 2395
2414our $CHAT_CHANNEL = { 2396our $CHAT_CHANNEL = {
2415 id => "chat", 2397 id => "chat",
2416 title => "Chat", 2398 title => "Chat",
… …
2791 id => "infobox", 2773 id => "infobox",
2792 title => "Body Parts", 2774 title => "Body Parts",
2793 reply => undef, 2775 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2795 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2796 "c/skills" => { 2784 "c/skills" => {
2797 id => "infobox", 2785 id => "infobox",
2798 title => "Skills", 2786 title => "Skills",
2799 reply => undef, 2787 reply => undef,
2800 tooltip => "Shows your experience per skill and item power", 2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/shopitems" => {
2791 id => "infobox",
2792 title => "Shop Items",
2793 reply => undef,
2794 tooltip => "Shows the items currently for sale in this shop",
2795 },
2796 "c/resistances" => {
2797 id => "infobox",
2798 title => "Resistances",
2799 reply => undef,
2800 tooltip => "Shows your resistances",
2801 },
2802 "c/pets" => {
2803 id => "infobox",
2804 title => "Pets",
2805 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet",
2801 }, 2807 },
2802 "c/uptime" => { 2808 "c/uptime" => {
2803 id => "infobox", 2809 id => "infobox",
2804 title => "Uptime", 2810 title => "Uptime",
2805 reply => undef, 2811 reply => undef,
… …
2815 id => "party", 2821 id => "party",
2816 title => "Party", 2822 title => "Party",
2817 reply => "gsay ", 2823 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 2824 tooltip => "Messages and chat related to your party",
2819 }, 2825 },
2826 "c/death" => {
2827 id => "death",
2828 title => "Death",
2829 reply => undef,
2830 tooltip => "Reason for and more info about your most recent death",
2831 },
2832 "c/say" => $SAY_CHANNEL,
2833 "c/chat" => $CHAT_CHANNEL,
2820); 2834);
2821 2835
2822sub cf::client::send_msg { 2836sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 2837 my ($self, $channel, $msg, $color, @extra) = @_;
2824 2838
… …
2829 2843
2830 # check predefined channels, for the benefit of C 2844 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 2845 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 2846 $channel = $CHANNEL{$channel};
2833 2847
2834 $self->ext_msg (channel_info => $channel) 2848 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 2849 $channel = $channel->{id};
2838 2850
2839 } elsif (ref $channel) { 2851 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 2852 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 2853 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 2854 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 2855 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 2856 }
2846 2857
2847 $channel = $channel->{id}; 2858 $channel = $channel->{id};
2848 } 2859 }
2849 2860
2850 return unless @extra || length $msg; 2861 return unless @extra || length $msg;
2851 2862
2852 if ($self->can_msg) {
2853 # default colour, mask it out 2863 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 2865 if $color & cf::NDI_DEF;
2856 2866
2857 my $pkt = "msg " 2867 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 2868 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2869 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 2870 );
2861 2871
2862 # try lzf for large packets 2872 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt 2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf}; 2874 if 1024 <= length $pkt and $self->{can_lzf};
2865 2875
2866 # split very large packets 2876 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) { 2877 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2878 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag"; 2879 $pkt = "frag";
2870 } 2880 }
2871 2881
2872 $self->send_packet ($pkt); 2882 $self->send_packet ($pkt);
2873 } else {
2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2892 } else {
2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2894 $self->send_packet ("drawinfo $color $msg")
2895 }
2896 }
2897 }
2898} 2883}
2899 2884
2900=item $client->ext_msg ($type, @msg) 2885=item $client->ext_msg ($type, @msg)
2901 2886
2902Sends an ext event to the client. 2887Sends an ext event to the client.
… …
3077The following functions and methods are available within a safe environment: 3062The following functions and methods are available within a safe environment:
3078 3063
3079 cf::object 3064 cf::object
3080 contr pay_amount pay_player map x y force_find force_add destroy 3065 contr pay_amount pay_player map x y force_find force_add destroy
3081 insert remove name archname title slaying race decrease split 3066 insert remove name archname title slaying race decrease split
3067 value
3082 3068
3083 cf::object::player 3069 cf::object::player
3084 player 3070 player
3085 3071
3086 cf::player 3072 cf::player
… …
3092=cut 3078=cut
3093 3079
3094for ( 3080for (
3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3081 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3096 insert remove inv nrof name archname title slaying race 3082 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3083 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3084 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3085 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3086 ["cf::map" => qw(trigger)],
3101) { 3087) {
3102 no strict 'refs'; 3088 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3089 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3090 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3121 my ($code, %vars) = @_; 3107 my ($code, %vars) = @_;
3122 3108
3123 my $qcode = $code; 3109 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3110 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3111 $qcode =~ s/\n/\\n/g;
3112
3113 %vars = (_dummy => 0) unless %vars;
3126 3114
3127 local $_; 3115 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars; 3116 local @safe::cf::_safe_eval_args = values %vars;
3129 3117
3130 my $eval = 3118 my $eval =
… …
3412 3400
3413 cf::init_experience; 3401 cf::init_experience;
3414 cf::init_anim; 3402 cf::init_anim;
3415 cf::init_attackmess; 3403 cf::init_attackmess;
3416 cf::init_dynamic; 3404 cf::init_dynamic;
3417 cf::init_block;
3418 3405
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3406 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420 3407
3421 # we must not ever block the main coroutine 3408 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3409 local $Coro::idle = sub {
… …
3558} 3545}
3559 3546
3560sub emergency_save() { 3547sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3548 my $freeze_guard = cf::freeze_mainloop;
3562 3549
3563 warn "enter emergency perl save\n"; 3550 warn "emergency_perl_save: enter\n";
3564 3551
3565 cf::sync_job { 3552 cf::sync_job {
3553 # this is a trade-off: we want to be very quick here, so
3554 # save all maps without fsync, and later call a global sync
3555 # (which in turn might be very very slow)
3556 local $USE_FSYNC = 0;
3557
3566 # use a peculiar iteration method to avoid tripping on perl 3558 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3559 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3560 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3561 warn "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3562 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3563 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3564 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3565 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3566 $pl->save;
3575 } 3567 }
3576 warn "end emergency player save\n"; 3568 warn "emergency_perl_save: end player save\n";
3577 3569
3578 warn "begin emergency map save\n"; 3570 warn "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3571 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3572 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3573 $map->valid or next;
3582 $map->save; 3574 $map->save;
3583 } 3575 }
3584 warn "end emergency map save\n"; 3576 warn "emergency_perl_save: end map save\n";
3585 3577
3586 warn "begin emergency database checkpoint\n"; 3578 warn "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3579 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3580 warn "emergency_perl_save: end database checkpoint\n";
3589 3581
3590 warn "begin write uuid\n"; 3582 warn "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3583 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3584 warn "emergency_perl_save: end write uuid\n";
3593 }; 3585 };
3594 3586
3587 warn "emergency_perl_save: starting sync()\n";
3588 IO::AIO::aio_sync sub {
3589 warn "emergency_perl_save: finished sync()\n";
3590 };
3591
3595 warn "leave emergency perl save\n"; 3592 warn "emergency_perl_save: leave\n";
3596} 3593}
3597 3594
3598sub post_cleanup { 3595sub post_cleanup {
3599 my ($make_core) = @_; 3596 my ($make_core) = @_;
3600 3597
… …
3637 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3638 return; 3635 return;
3639 } 3636 }
3640 3637
3641 return if $RELOAD++; 3638 return if $RELOAD++;
3639
3640 my $t1 = EV::time;
3642 3641
3643 while ($RELOAD) { 3642 while ($RELOAD) {
3644 warn "reloading..."; 3643 warn "reloading...";
3645 3644
3646 warn "entering sync_job"; 3645 warn "entering sync_job";
… …
3707 clear_package "safe::$_" 3706 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3707 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 3708
3710 warn "unloading cf.pm \"a bit\""; 3709 warn "unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 3710 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 3711 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 3712
3714 # don't, removes xs symbols, too, 3713 # don't, removes xs symbols, too,
3715 # and global variables created in xs 3714 # and global variables created in xs
3716 #clear_package __PACKAGE__; 3715 #clear_package __PACKAGE__;
3717 3716
… …
3725 cf::reload_config; 3724 cf::reload_config;
3726 3725
3727 warn "loading extensions"; 3726 warn "loading extensions";
3728 cf::load_extensions; 3727 cf::load_extensions;
3729 3728
3729 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3733 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3736 }
3736 3737
3737 warn "running post_load"; 3738 warn "running post_init jobs";
3738 (pop @POST_INIT)->(1) while @POST_INIT; 3739 (pop @POST_INIT)->(1) while @POST_INIT;
3739 3740
3740 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3741 3742
3742 1 3743 1
… …
3746 }; 3747 };
3747 3748
3748 warn "reloaded"; 3749 warn "reloaded";
3749 --$RELOAD; 3750 --$RELOAD;
3750 } 3751 }
3752
3753 $t1 = EV::time - $t1;
3754 warn "reload completed in ${t1}s\n";
3751}; 3755};
3752 3756
3753our $RELOAD_WATCHER; # used only during reload 3757our $RELOAD_WATCHER; # used only during reload
3754 3758
3755sub reload_perl() { 3759sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 3760 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 3761 # coro crashes during coro_state_free->destroy here.
3758 3762
3763 $RELOAD_WATCHER ||= cf::async {
3764 Coro::AIO::aio_wait cache_extensions;
3765
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3766 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 3767 do_reload_perl;
3761 undef $RELOAD_WATCHER; 3768 undef $RELOAD_WATCHER;
3769 };
3762 }; 3770 };
3763} 3771}
3764 3772
3765register_command "reload" => sub { 3773register_command "reload" => sub {
3766 my ($who, $arg) = @_; 3774 my ($who, $arg) = @_;
… …
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 3933 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 3934 }
3927} 3935}
3928 3936
3929# load additional modules 3937# load additional modules
3930use cf::pod; 3938require "cf/$_.pm" for @EXTRA_MODULES;
3931 3939
3932END { cf::emergency_save } 3940END { cf::emergency_save }
3933 3941
39341 39421
3935 3943

Diff Legend

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