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.455 by root, Sat Sep 27 08:17:40 2008 UTC vs.
Revision 1.473 by root, Fri Jun 26 16:32:10 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
… …
1170 $decname, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1171 1152
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1154 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1156 if ($cf::USE_FSYNC) {
1157 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1158 aio_fsync $fh;
1159 }
1176 aio_close $fh; 1160 aio_close $fh;
1177 1161
1178 if (@$objs) { 1162 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1164 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1167 if ($cf::USE_FSYNC) {
1168 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1169 aio_fsync $fh;
1170 }
1184 aio_close $fh; 1171 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1173 }
1187 } else { 1174 } else {
1188 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
1189 } 1176 }
1190 1177
1191 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1179
1180 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1182 } else {
1193 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
1194 } 1184 }
1195 } else { 1185 } else {
1196 aio_unlink $filename; 1186 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
1198 } 1188 }
… …
1289 my ($name, $cb) = @_; 1279 my ($name, $cb) = @_;
1290 1280
1291 $EXTICMD{$name} = $cb; 1281 $EXTICMD{$name} = $cb;
1292} 1282}
1293 1283
1284use File::Glob ();
1285
1294cf::player->attach ( 1286cf::player->attach (
1295 on_command => sub { 1287 on_command => sub {
1296 my ($pl, $name, $params) = @_; 1288 my ($pl, $name, $params) = @_;
1297 1289
1298 my $cb = $COMMAND{$name} 1290 my $cb = $COMMAND{$name}
… …
1329 } 1321 }
1330 1322
1331 cf::override; 1323 cf::override;
1332 }, 1324 },
1333); 1325);
1326
1327# "readahead" all extensions
1328sub cache_extensions {
1329 my $grp = IO::AIO::aio_group;
1330
1331 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1332 for (grep /\.ext$/, @{$_[0]}) {
1333 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1334 }
1335 };
1336
1337 $grp
1338}
1334 1339
1335sub load_extensions { 1340sub load_extensions {
1336 cf::sync_job { 1341 cf::sync_job {
1337 my %todo; 1342 my %todo;
1338 1343
… …
1867 1872
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1870} 1875}
1871 1876
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1877sub decay_objects {
1882 my ($self) = @_; 1878 my ($self) = @_;
1883 1879
1884 return if $self->{deny_reset}; 1880 return if $self->{deny_reset};
1885 1881
… …
1967sub find { 1963sub find {
1968 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1969 1965
1970 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1971 1967
1972 cf::lock_wait "map_data:$path";#d#remove 1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
1974 1970
1975 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 1972 my $map = new_from_path cf::map $path
1980 or return; 1973 or return;
1981 1974
1982 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
1983 1976
… …
2050 2043
2051 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2045 $self->decay_objects;
2053 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
2054 $self->update_buttons; 2047 $self->update_buttons;
2055 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick; 2048 cf::cede_to_tick;
2058 $self->activate; 2049 $self->activate;
2059 } 2050 }
2060 2051
2061 $self->{last_save} = $cf::RUNTIME; 2052 $self->{last_save} = $cf::RUNTIME;
… …
2403 2394
2404our $SAY_CHANNEL = { 2395our $SAY_CHANNEL = {
2405 id => "say", 2396 id => "say",
2406 title => "Map", 2397 title => "Map",
2407 reply => "say ", 2398 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2399 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2400};
2410 2401
2411our $CHAT_CHANNEL = { 2402our $CHAT_CHANNEL = {
2412 id => "chat", 2403 id => "chat",
2413 title => "Chat", 2404 title => "Chat",
… …
2788 id => "infobox", 2779 id => "infobox",
2789 title => "Body Parts", 2780 title => "Body Parts",
2790 reply => undef, 2781 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2782 tooltip => "Shows which body parts you posess and are available",
2792 }, 2783 },
2784 "c/statistics" => {
2785 id => "infobox",
2786 title => "Statistics",
2787 reply => undef,
2788 tooltip => "Shows your primary statistics",
2789 },
2793 "c/skills" => { 2790 "c/skills" => {
2794 id => "infobox", 2791 id => "infobox",
2795 title => "Skills", 2792 title => "Skills",
2796 reply => undef, 2793 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2794 tooltip => "Shows your experience per skill and item power",
2795 },
2796 "c/shopitems" => {
2797 id => "infobox",
2798 title => "Shop Items",
2799 reply => undef,
2800 tooltip => "Shows the items currently for sale in this shop",
2801 },
2802 "c/resistances" => {
2803 id => "infobox",
2804 title => "Resistances",
2805 reply => undef,
2806 tooltip => "Shows your resistances",
2807 },
2808 "c/pets" => {
2809 id => "infobox",
2810 title => "Pets",
2811 reply => undef,
2812 tooltip => "Shows information abotu your pets/a specific pet",
2813 },
2814 "c/perceiveself" => {
2815 id => "infobox",
2816 title => "Perceive Self",
2817 reply => undef,
2818 tooltip => "You gained detailed knowledge about yourself",
2798 }, 2819 },
2799 "c/uptime" => { 2820 "c/uptime" => {
2800 id => "infobox", 2821 id => "infobox",
2801 title => "Uptime", 2822 title => "Uptime",
2802 reply => undef, 2823 reply => undef,
… …
2812 id => "party", 2833 id => "party",
2813 title => "Party", 2834 title => "Party",
2814 reply => "gsay ", 2835 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2836 tooltip => "Messages and chat related to your party",
2816 }, 2837 },
2838 "c/death" => {
2839 id => "death",
2840 title => "Death",
2841 reply => undef,
2842 tooltip => "Reason for and more info about your most recent death",
2843 },
2844 "c/say" => $SAY_CHANNEL,
2845 "c/chat" => $CHAT_CHANNEL,
2817); 2846);
2818 2847
2819sub cf::client::send_msg { 2848sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2849 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2850
… …
2826 2855
2827 # check predefined channels, for the benefit of C 2856 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 2857 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 2858 $channel = $CHANNEL{$channel};
2830 2859
2831 $self->ext_msg (channel_info => $channel) 2860 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 2861 $channel = $channel->{id};
2835 2862
2836 } elsif (ref $channel) { 2863 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 2867 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 2868 }
2843 2869
2844 $channel = $channel->{id}; 2870 $channel = $channel->{id};
2845 } 2871 }
2846 2872
2847 return unless @extra || length $msg; 2873 return unless @extra || length $msg;
2848 2874
2849 if ($self->can_msg) {
2850 # default colour, mask it out 2875 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 2877 if $color & cf::NDI_DEF;
2853 2878
2854 my $pkt = "msg " 2879 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 2880 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 2882 );
2858 2883
2859 # try lzf for large packets 2884 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt 2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf}; 2886 if 1024 <= length $pkt and $self->{can_lzf};
2862 2887
2863 # split very large packets 2888 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) { 2889 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag"; 2891 $pkt = "frag";
2867 } 2892 }
2868 2893
2869 $self->send_packet ($pkt); 2894 $self->send_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 2895}
2896 2896
2897=item $client->ext_msg ($type, @msg) 2897=item $client->ext_msg ($type, @msg)
2898 2898
2899Sends an ext event to the client. 2899Sends an ext event to the client.
… …
3074The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3075 3075
3076 cf::object 3076 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3077 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3078 insert remove name archname title slaying race decrease split
3079 value
3079 3080
3080 cf::object::player 3081 cf::object::player
3081 player 3082 player
3082 3083
3083 cf::player 3084 cf::player
… …
3089=cut 3090=cut
3090 3091
3091for ( 3092for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3093 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3094 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3095 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
3098) { 3099) {
3099 no strict 'refs'; 3100 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3118 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
3119 3120
3120 my $qcode = $code; 3121 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
3123 3126
3124 local $_; 3127 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
3126 3129
3127 my $eval = 3130 my $eval =
… …
3409 3412
3410 cf::init_experience; 3413 cf::init_experience;
3411 cf::init_anim; 3414 cf::init_anim;
3412 cf::init_attackmess; 3415 cf::init_attackmess;
3413 cf::init_dynamic; 3416 cf::init_dynamic;
3414 cf::init_block;
3415 3417
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3419
3418 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
… …
3555} 3557}
3556 3558
3557sub emergency_save() { 3559sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3560 my $freeze_guard = cf::freeze_mainloop;
3559 3561
3560 warn "enter emergency perl save\n"; 3562 warn "emergency_perl_save: enter\n";
3561 3563
3562 cf::sync_job { 3564 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569
3563 # use a peculiar iteration method to avoid tripping on perl 3570 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3571 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3572 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3573 warn "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3574 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3575 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3576 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3578 $pl->save;
3572 } 3579 }
3573 warn "end emergency player save\n"; 3580 warn "emergency_perl_save: end player save\n";
3574 3581
3575 warn "begin emergency map save\n"; 3582 warn "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3583 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3584 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3585 $map->valid or next;
3579 $map->save; 3586 $map->save;
3580 } 3587 }
3581 warn "end emergency map save\n"; 3588 warn "emergency_perl_save: end map save\n";
3582 3589
3583 warn "begin emergency database checkpoint\n"; 3590 warn "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3591 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3592 warn "emergency_perl_save: end database checkpoint\n";
3586 3593
3587 warn "begin write uuid\n"; 3594 warn "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3595 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3596 warn "emergency_perl_save: end write uuid\n";
3590 }; 3597 };
3591 3598
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
3592 warn "leave emergency perl save\n"; 3604 warn "emergency_perl_save: leave\n";
3593} 3605}
3594 3606
3595sub post_cleanup { 3607sub post_cleanup {
3596 my ($make_core) = @_; 3608 my ($make_core) = @_;
3597 3609
… …
3634 warn "can only reload from main coroutine"; 3646 warn "can only reload from main coroutine";
3635 return; 3647 return;
3636 } 3648 }
3637 3649
3638 return if $RELOAD++; 3650 return if $RELOAD++;
3651
3652 my $t1 = EV::time;
3639 3653
3640 while ($RELOAD) { 3654 while ($RELOAD) {
3641 warn "reloading..."; 3655 warn "reloading...";
3642 3656
3643 warn "entering sync_job"; 3657 warn "entering sync_job";
… …
3704 clear_package "safe::$_" 3718 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 3720
3707 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 3724
3711 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
3712 # and global variables created in xs 3726 # and global variables created in xs
3713 #clear_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
3714 3728
… …
3722 cf::reload_config; 3736 cf::reload_config;
3723 3737
3724 warn "loading extensions"; 3738 warn "loading extensions";
3725 cf::load_extensions; 3739 cf::load_extensions;
3726 3740
3741 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 3742 warn "reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 3743 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 3744 warn "reattaching attachments to maps";
3730 reattach $_ for values %MAP; 3745 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 3746 warn "reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 3747 reattach $_ for values %PLAYER;
3748 }
3733 3749
3734 warn "running post_load"; 3750 warn "running post_init jobs";
3735 (pop @POST_INIT)->(1) while @POST_INIT; 3751 (pop @POST_INIT)->(1) while @POST_INIT;
3736 3752
3737 warn "leaving sync_job"; 3753 warn "leaving sync_job";
3738 3754
3739 1 3755 1
… …
3743 }; 3759 };
3744 3760
3745 warn "reloaded"; 3761 warn "reloaded";
3746 --$RELOAD; 3762 --$RELOAD;
3747 } 3763 }
3764
3765 $t1 = EV::time - $t1;
3766 warn "reload completed in ${t1}s\n";
3748}; 3767};
3749 3768
3750our $RELOAD_WATCHER; # used only during reload 3769our $RELOAD_WATCHER; # used only during reload
3751 3770
3752sub reload_perl() { 3771sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 3772 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 3773 # coro crashes during coro_state_free->destroy here.
3755 3774
3775 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions;
3777
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 3779 do_reload_perl;
3758 undef $RELOAD_WATCHER; 3780 undef $RELOAD_WATCHER;
3781 };
3759 }; 3782 };
3760} 3783}
3761 3784
3762register_command "reload" => sub { 3785register_command "reload" => sub {
3763 my ($who, $arg) = @_; 3786 my ($who, $arg) = @_;
… …
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3923 } 3946 }
3924} 3947}
3925 3948
3926# load additional modules 3949# load additional modules
3927use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3928 3951
3929END { cf::emergency_save } 3952END { cf::emergency_save }
3930 3953
39311 39541
3932 3955

Diff Legend

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