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.454 by root, Thu Sep 25 12:14:32 2008 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 2009 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
… …
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5; 58use Digest::MD5;
55use Fcntl; 59use Fcntl;
56use YAML (); 60use YAML::XS ();
57use IO::AIO (); 61use IO::AIO ();
58use Time::HiRes; 62use Time::HiRes;
59use Compress::LZF; 63use Compress::LZF;
60use Digest::MD5 (); 64use Digest::MD5 ();
61 65
… …
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 74
71# make sure c-lzf reinitialises itself 75# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
78
79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 81
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 83
77our %COMMAND = (); 84our %COMMAND = ();
78our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
… …
83our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
85 92
86our $RELOAD; # number of reloads so far, non-zero while in reload 93our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
88 97
89our $CONFDIR = confdir; 98our $CONFDIR = confdir;
90our $DATADIR = datadir; 99our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
… …
103our %RESOURCE; 112our %RESOURCE;
104 113
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 116our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
109 118
110our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 122our $DB_ENV;
114 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
115our %CFG; 126our %CFG;
116 127
117our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 129our $RUNTIME;
119our $NOW; 130our $NOW;
… …
129our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 141our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
132 143
133our @POST_INIT; 144our @POST_INIT;
145
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
134 148
135binmode STDOUT; 149binmode STDOUT;
136binmode STDERR; 150binmode STDERR;
137 151
138# read virtual server time, if available 152# read virtual server time, if available
… …
140 open my $fh, "<", $RUNTIMEFILE 154 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
143} 157}
144 158
159eval "sub TICK() { $TICK } 1" or die;
160
145mkdir $_ 161mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 163
148our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
149 165
150sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
151 178
152############################################################################# 179#############################################################################
153 180
154=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
155 182
… …
202returns directly I<after> the tick processing (and consequently, can only wake one process 229returns directly I<after> the tick processing (and consequently, can only wake one process
203per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
204 231
205=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
206 233
207This array contains the results of the last C<invoke ()> call. When 234This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 236that call.
210 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
211=back 244=back
212 245
213=cut 246=cut
214 247
215BEGIN { 248$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 249 my $msg = join "", @_;
218 250
219 $msg .= "\n" 251 $msg .= "\n"
220 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
221 253
222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223 255
224 LOG llevError, $msg; 256 LOG llevError, $msg;
225 }; 257};
226}
227 258
228$Coro::State::DIEHOOK = sub { 259$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
230 263
231 if ($Coro::current == $Coro::main) {#d# 264 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 266 return;#d#
234 }#d# 267 }#d#
235 268
236 # kill coroutine otherwise 269 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 270 Coro::terminate
239}; 271};
240
241$SIG{__DIE__} = sub { }; #d#?
242 272
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
260)) { 290)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 292}
263 293
264$EV::DIED = sub { 294$EV::DIED = sub {
265 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
266}; 296};
267 297
268############################################################################# 298#############################################################################
269 299
270=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
… …
328Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
329 359
330=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
331 361
332Wait until the given lock is available and then acquires it and returns 362Wait 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, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
335returned. 365returned.
336 366
337Locks are *not* recursive, locking from the same coro twice results in a 367Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 368deadlocked coro.
… …
344 374
345Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
346 376
347=cut 377=cut
348 378
349our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 380
352sub lock_wait($) { 381sub lock_wait($) {
353 my ($key) = @_; 382 $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} 383}
367 384
368sub lock_acquire($) { 385sub lock_acquire($) {
369 my ($key) = @_; 386 $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} 387}
383 388
384sub lock_active($) { 389sub lock_active($) {
385 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 391}
389 392
390sub freeze_mainloop { 393sub freeze_mainloop {
391 tick_inhibit_inc; 394 tick_inhibit_inc;
392 395
393 Coro::guard \&tick_inhibit_dec; 396 &Guard::guard (\&tick_inhibit_dec);
394} 397}
395 398
396=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
397 400
398Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
… …
1170 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1171 1174
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1176 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 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;
1180 aio_fsync $fh;
1181 }
1176 aio_close $fh; 1182 aio_close $fh;
1177 1183
1178 if (@$objs) { 1184 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1186 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 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;
1191 aio_fsync $fh;
1192 }
1184 aio_close $fh; 1193 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1195 }
1187 } else { 1196 } else {
1188 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1189 } 1198 }
1190 1199
1191 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1204 } else {
1193 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1194 } 1206 }
1195 } else { 1207 } else {
1196 aio_unlink $filename; 1208 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1198 } 1210 }
… …
1289 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1290 1302
1291 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1292} 1304}
1293 1305
1306use File::Glob ();
1307
1294cf::player->attach ( 1308cf::player->attach (
1295 on_command => sub { 1309 on_command => sub {
1296 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1297 1311
1298 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
… …
1329 } 1343 }
1330 1344
1331 cf::override; 1345 cf::override;
1332 }, 1346 },
1333); 1347);
1348
1349# "readahead" all extensions
1350sub cache_extensions {
1351 my $grp = IO::AIO::aio_group;
1352
1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1354 for (grep /\.ext$/, @{$_[0]}) {
1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1356 }
1357 };
1358
1359 $grp
1360}
1334 1361
1335sub load_extensions { 1362sub load_extensions {
1336 cf::sync_job { 1363 cf::sync_job {
1337 my %todo; 1364 my %todo;
1338 1365
… …
1867 1894
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1870} 1897}
1871 1898
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 { 1899sub decay_objects {
1882 my ($self) = @_; 1900 my ($self) = @_;
1883 1901
1884 return if $self->{deny_reset}; 1902 return if $self->{deny_reset};
1885 1903
… …
1967sub find { 1985sub find {
1968 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
1969 1987
1970 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
1971 1989
1972 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
1974 1992
1975 $cf::MAP{$path} || do { 1993 $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 1994 my $map = new_from_path cf::map $path
1980 or return; 1995 or return;
1981 1996
1982 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
1983 1998
… …
2051 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2067 $self->decay_objects;
2053 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2054 $self->update_buttons; 2069 $self->update_buttons;
2055 cf::cede_to_tick; 2070 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2071 $self->activate;
2059 } 2072 }
2060 2073
2061 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
… …
2228 2241
2229 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230 2243
2231 return if $self->players; 2244 return if $self->players;
2232 2245
2233 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2234 2247
2235 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2236 2249
2237 # need to save uniques path 2250 # need to save uniques path
2238 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
… …
2329 : normalise $_ 2342 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2344 ]
2332} 2345}
2333 2346
2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2378
2334=back 2379=back
2335 2380
2336=head3 cf::object 2381=head3 cf::object
2337 2382
2338=cut 2383=cut
… …
2403 2448
2404our $SAY_CHANNEL = { 2449our $SAY_CHANNEL = {
2405 id => "say", 2450 id => "say",
2406 title => "Map", 2451 title => "Map",
2407 reply => "say ", 2452 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2454};
2410 2455
2411our $CHAT_CHANNEL = { 2456our $CHAT_CHANNEL = {
2412 id => "chat", 2457 id => "chat",
2413 title => "Chat", 2458 title => "Chat",
… …
2533 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2535 2580
2536 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2539 2584
2540 $map->load; 2585 $map->load;
2541 $map->load_neighbours; 2586 $map->load_neighbours;
2542 2587
2543 return unless $self->contr->active; 2588 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2589
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2549} 2595}
2550 2596
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2552 2598
2553Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
… …
2741 2787
2742 utf8::encode $text; 2788 utf8::encode $text;
2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2744} 2790}
2745 2791
2792=item $client->send_big_packet ($pkt)
2793
2794Like C<send_packet>, but tries to compress large packets, and fragments
2795them as required.
2796
2797=cut
2798
2799our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2800
2801sub cf::client::send_big_packet {
2802 my ($self, $pkt) = @_;
2803
2804 # try lzf for large packets
2805 $pkt = "lzf " . Compress::LZF::compress $pkt
2806 if 1024 <= length $pkt and $self->{can_lzf};
2807
2808 # split very large packets
2809 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2810 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2811 $pkt = "frag";
2812 }
2813
2814 $self->send_packet ($pkt);
2815}
2816
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2818
2748Send a drawinfo or msg packet to the client, formatting the msg for the 2819Send a drawinfo or msg packet to the client, formatting the msg for the
2749client if neccessary. C<$type> should be a string identifying the type of 2820client if neccessary. C<$type> should be a string identifying the type of
2750the message, with C<log> being the default. If C<$color> is negative, suppress 2821the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2752 2823
2753=cut 2824=cut
2754 2825
2755# non-persistent channels (usually the info channel) 2826# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2757 "c/identify" => { 2834 "c/identify" => {
2758 id => "infobox", 2835 id => "infobox",
2759 title => "Identify", 2836 title => "Identify",
2760 reply => undef, 2837 reply => undef,
2761 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
… …
2763 "c/examine" => { 2840 "c/examine" => {
2764 id => "infobox", 2841 id => "infobox",
2765 title => "Examine", 2842 title => "Examine",
2766 reply => undef, 2843 reply => undef,
2767 tooltip => "Signs and other items you examined", 2844 tooltip => "Signs and other items you examined",
2845 },
2846 "c/shopinfo" => {
2847 id => "infobox",
2848 title => "Shop Info",
2849 reply => undef,
2850 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 2851 },
2769 "c/book" => { 2852 "c/book" => {
2770 id => "infobox", 2853 id => "infobox",
2771 title => "Book", 2854 title => "Book",
2772 reply => undef, 2855 reply => undef,
… …
2788 id => "infobox", 2871 id => "infobox",
2789 title => "Body Parts", 2872 title => "Body Parts",
2790 reply => undef, 2873 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2874 tooltip => "Shows which body parts you posess and are available",
2792 }, 2875 },
2876 "c/statistics" => {
2877 id => "infobox",
2878 title => "Statistics",
2879 reply => undef,
2880 tooltip => "Shows your primary statistics",
2881 },
2793 "c/skills" => { 2882 "c/skills" => {
2794 id => "infobox", 2883 id => "infobox",
2795 title => "Skills", 2884 title => "Skills",
2796 reply => undef, 2885 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2886 tooltip => "Shows your experience per skill and item power",
2887 },
2888 "c/shopitems" => {
2889 id => "infobox",
2890 title => "Shop Items",
2891 reply => undef,
2892 tooltip => "Shows the items currently for sale in this shop",
2893 },
2894 "c/resistances" => {
2895 id => "infobox",
2896 title => "Resistances",
2897 reply => undef,
2898 tooltip => "Shows your resistances",
2899 },
2900 "c/pets" => {
2901 id => "infobox",
2902 title => "Pets",
2903 reply => undef,
2904 tooltip => "Shows information abotu your pets/a specific pet",
2905 },
2906 "c/perceiveself" => {
2907 id => "infobox",
2908 title => "Perceive Self",
2909 reply => undef,
2910 tooltip => "You gained detailed knowledge about yourself",
2798 }, 2911 },
2799 "c/uptime" => { 2912 "c/uptime" => {
2800 id => "infobox", 2913 id => "infobox",
2801 title => "Uptime", 2914 title => "Uptime",
2802 reply => undef, 2915 reply => undef,
… …
2812 id => "party", 2925 id => "party",
2813 title => "Party", 2926 title => "Party",
2814 reply => "gsay ", 2927 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2928 tooltip => "Messages and chat related to your party",
2816 }, 2929 },
2930 "c/death" => {
2931 id => "death",
2932 title => "Death",
2933 reply => undef,
2934 tooltip => "Reason for and more info about your most recent death",
2935 },
2936 "c/say" => $SAY_CHANNEL,
2937 "c/chat" => $CHAT_CHANNEL,
2817); 2938);
2818 2939
2819sub cf::client::send_msg { 2940sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2942
… …
2826 2947
2827 # check predefined channels, for the benefit of C 2948 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 2949 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 2950 $channel = $CHANNEL{$channel};
2830 2951
2831 $self->ext_msg (channel_info => $channel) 2952 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 2953 $channel = $channel->{id};
2835 2954
2836 } elsif (ref $channel) { 2955 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 2956 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 2957 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 2958 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 2959 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 2960 }
2843 2961
2844 $channel = $channel->{id}; 2962 $channel = $channel->{id};
2845 } 2963 }
2846 2964
2847 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2848 2966
2849 if ($self->can_msg) {
2850 # default colour, mask it out 2967 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 2969 if $color & cf::NDI_DEF;
2853 2970
2854 my $pkt = "msg " 2971 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 2972 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 2974 );
2858 2975
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 2976 $self->send_big_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} 2977}
2896 2978
2897=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2898 2980
2899Sends an ext event to the client. 2981Sends an ext event to the client.
… …
2902 2984
2903sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2905 2987
2906 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 2993 }
2912} 2994}
2913 2995
2914=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2915 2997
… …
2919 3001
2920sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2922 3004
2923 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3008 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3011 }
2930} 3012}
2931 3013
2932=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2933 3015
… …
3074The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
3075 3157
3076 cf::object 3158 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3159 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3160 insert remove name archname title slaying race decrease split
3161 value
3079 3162
3080 cf::object::player 3163 cf::object::player
3081 player 3164 player
3082 3165
3083 cf::player 3166 cf::player
… …
3089=cut 3172=cut
3090 3173
3091for ( 3174for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3175 ["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 3176 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3177 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
3098) { 3181) {
3099 no strict 'refs'; 3182 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3118 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
3119 3202
3120 my $qcode = $code; 3203 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
3123 3208
3124 local $_; 3209 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
3126 3211
3127 my $eval = 3212 my $eval =
… …
3358 3443
3359 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3360} 3445}
3361 3446
3362sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3364 or return; 3451 or return;
3365 3452
3366 local $/; 3453 local $/;
3367 *CFG = YAML::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3368 3455
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3370 3457
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3376 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3377 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3378 }; 3465 };
3379 warn $@ if $@; 3466 warn $@ if $@;
3380 } 3467 }
3468
3469 warn "finished reloading resource files\n";
3381} 3470}
3382 3471
3383sub pidfile() { 3472sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!"; 3474 or die "$PIDFILE: $!";
… …
3397 3486
3398 seek $fh, 0, 0; 3487 seek $fh, 0, 0;
3399 print $fh $$; 3488 print $fh $$;
3400} 3489}
3401 3490
3491sub main_loop {
3492 warn "EV::loop starting\n";
3493 if (1) {
3494 EV::loop;
3495 }
3496 warn "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP;
3498}
3499
3402sub main { 3500sub main {
3403 cf::init_globals; # initialise logging 3501 cf::init_globals; # initialise logging
3404 3502
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3409 3507
3410 cf::init_experience; 3508 cf::init_experience;
3411 cf::init_anim; 3509 cf::init_anim;
3412 cf::init_attackmess; 3510 cf::init_attackmess;
3413 cf::init_dynamic; 3511 cf::init_dynamic;
3414 cf::init_block;
3415 3512
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3514
3418 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
… …
3445 load_extensions; 3542 load_extensions;
3446 3543
3447 utime time, time, $RUNTIMEFILE; 3544 utime time, time, $RUNTIMEFILE;
3448 3545
3449 # no (long-running) fork's whatsoever before this point(!) 3546 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3549
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3550 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3551 };
3454 3552
3455 EV::loop; 3553 main_loop;
3456} 3554}
3457 3555
3458############################################################################# 3556#############################################################################
3459# initialisation and cleanup 3557# initialisation and cleanup
3460 3558
… …
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3616 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3617 or return;
3520 3618
3521 my $value = uuid_seq uuid_cur; 3619 my $value = uuid_seq uuid_cur;
3522 3620
3523 if ($value < 1024) { 3621 unless ($value) {
3524 warn "cowardly refusing to write low uuid value ($value)!\n"; 3622 warn "cowardly refusing to write zero uuid value!\n";
3525 return; 3623 return;
3526 } 3624 }
3527 3625
3528 my $value = uuid_str $value + $uuid_skip; 3626 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0; 3627 $uuid_skip = 0;
… …
3555} 3653}
3556 3654
3557sub emergency_save() { 3655sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3656 my $freeze_guard = cf::freeze_mainloop;
3559 3657
3560 warn "enter emergency perl save\n"; 3658 warn "emergency_perl_save: enter\n";
3561 3659
3562 cf::sync_job { 3660 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so
3662 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0;
3665
3563 # use a peculiar iteration method to avoid tripping on perl 3666 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3667 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3668 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3669 warn "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3670 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3671 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3672 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3674 $pl->save;
3572 } 3675 }
3573 warn "end emergency player save\n"; 3676 warn "emergency_perl_save: end player save\n";
3574 3677
3575 warn "begin emergency map save\n"; 3678 warn "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3679 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3680 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3681 $map->valid or next;
3579 $map->save; 3682 $map->save;
3580 } 3683 }
3581 warn "end emergency map save\n"; 3684 warn "emergency_perl_save: end map save\n";
3582 3685
3583 warn "begin emergency database checkpoint\n"; 3686 warn "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3687 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3688 warn "emergency_perl_save: end database checkpoint\n";
3586 3689
3587 warn "begin write uuid\n"; 3690 warn "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3691 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3692 warn "emergency_perl_save: end write uuid\n";
3590 }; 3693 };
3591 3694
3695 warn "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n";
3698 };
3699
3592 warn "leave emergency perl save\n"; 3700 warn "emergency_perl_save: leave\n";
3593} 3701}
3594 3702
3595sub post_cleanup { 3703sub post_cleanup {
3596 my ($make_core) = @_; 3704 my ($make_core) = @_;
3597 3705
… …
3634 warn "can only reload from main coroutine"; 3742 warn "can only reload from main coroutine";
3635 return; 3743 return;
3636 } 3744 }
3637 3745
3638 return if $RELOAD++; 3746 return if $RELOAD++;
3747
3748 my $t1 = EV::time;
3639 3749
3640 while ($RELOAD) { 3750 while ($RELOAD) {
3641 warn "reloading..."; 3751 warn "reloading...";
3642 3752
3643 warn "entering sync_job"; 3753 warn "entering sync_job";
… …
3704 clear_package "safe::$_" 3814 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 3816
3707 warn "unloading cf.pm \"a bit\""; 3817 warn "unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 3818 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 3820
3711 # don't, removes xs symbols, too, 3821 # don't, removes xs symbols, too,
3712 # and global variables created in xs 3822 # and global variables created in xs
3713 #clear_package __PACKAGE__; 3823 #clear_package __PACKAGE__;
3714 3824
3715 warn "unload completed, starting to reload now"; 3825 warn "unload completed, starting to reload now";
3716 3826
3717 warn "reloading cf.pm"; 3827 warn "reloading cf.pm";
3718 require cf; 3828 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3829 cf::_connect_to_perl_1;
3720 3830
3721 warn "loading config and database again"; 3831 warn "loading config and database again";
3722 cf::reload_config; 3832 cf::reload_config;
3723 3833
3724 warn "loading extensions"; 3834 warn "loading extensions";
3725 cf::load_extensions; 3835 cf::load_extensions;
3726 3836
3837 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 3838 warn "reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 3839 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 3840 warn "reattaching attachments to maps";
3730 reattach $_ for values %MAP; 3841 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 3842 warn "reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 3843 reattach $_ for values %PLAYER;
3844 }
3733 3845
3734 warn "running post_load"; 3846 warn "running post_init jobs";
3735 (pop @POST_INIT)->(1) while @POST_INIT; 3847 (pop @POST_INIT)->(1) while @POST_INIT;
3736 3848
3737 warn "leaving sync_job"; 3849 warn "leaving sync_job";
3738 3850
3739 1 3851 1
… …
3743 }; 3855 };
3744 3856
3745 warn "reloaded"; 3857 warn "reloaded";
3746 --$RELOAD; 3858 --$RELOAD;
3747 } 3859 }
3860
3861 $t1 = EV::time - $t1;
3862 warn "reload completed in ${t1}s\n";
3748}; 3863};
3749 3864
3750our $RELOAD_WATCHER; # used only during reload 3865our $RELOAD_WATCHER; # used only during reload
3751 3866
3752sub reload_perl() { 3867sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 3868 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 3869 # coro crashes during coro_state_free->destroy here.
3755 3870
3871 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions;
3873
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 3875 do_reload_perl;
3758 undef $RELOAD_WATCHER; 3876 undef $RELOAD_WATCHER;
3877 };
3759 }; 3878 };
3760} 3879}
3761 3880
3762register_command "reload" => sub { 3881register_command "reload" => sub {
3763 my ($who, $arg) = @_; 3882 my ($who, $arg) = @_;
… …
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 4041 LOG llevInfo, "[ABT] [suppressed]\n";
3923 } 4042 }
3924} 4043}
3925 4044
3926# load additional modules 4045# load additional modules
3927use cf::pod; 4046require "cf/$_.pm" for @EXTRA_MODULES;
4047cf::_connect_to_perl_2;
3928 4048
3929END { cf::emergency_save } 4049END { cf::emergency_save }
3930 4050
39311 40511
3932 4052

Diff Legend

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