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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.491 by root, Sat Oct 24 09:18:44 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
14 37
38use Guard ();
15use Coro 3.64 (); 39use Coro ();
16use Coro::State; 40use Coro::State;
17use Coro::Handle; 41use Coro::Handle;
42use Coro::EV;
18use Coro::Event; 43use Coro::AnyEvent;
19use Coro::Timer; 44use Coro::Timer;
20use Coro::Signal; 45use Coro::Signal;
21use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
48use Coro::AnyEvent;
22use Coro::AIO; 49use Coro::AIO;
50use Coro::BDB 1.6;
23use Coro::Storable; 51use Coro::Storable;
24use Coro::Util (); 52use Coro::Util ();
25 53
26use JSON::XS (); 54use JSON::XS 2.01 ();
27use BDB (); 55use BDB ();
28use Data::Dumper; 56use Data::Dumper;
29use Digest::MD5; 57use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
83 117
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 121our $DB_ENV;
89 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
90our %CFG; 125our %CFG;
91 126
92our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 128our $RUNTIME;
129our $NOW;
94 130
95our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
98 134
99# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 137
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
105 147
106binmode STDOUT; 148binmode STDOUT;
107binmode STDERR; 149binmode STDERR;
108 150
109# read virtual server time, if available 151# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
114} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
115 159
116mkdir $_ 160mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 162
119our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
120 164
121sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 177
123############################################################################# 178#############################################################################
124 179
125=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
126 181
162 217
163The raw value load value from the last tick. 218The raw value load value from the last tick.
164 219
165=item %cf::CFG 220=item %cf::CFG
166 221
167Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 223from wherever your confdir points to.
169 224
170=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
171 226
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 230
176=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
177 232
178This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 235that call.
181 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
182=back 243=back
183 244
184=cut 245=cut
185 246
186BEGIN { 247$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 248 my $msg = join "", @_;
189 249
190 $msg .= "\n" 250 $msg .= "\n"
191 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
192 252
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 254
195 LOG llevError, $msg; 255 LOG llevError, $msg;
196 }; 256};
197} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
198 271
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 282for my $pkg (qw(
210 cf::global cf::attachable 283 cf::global cf::attachable
211 cf::object cf::object::player 284 cf::object cf::object::player
212 cf::client cf::player 285 cf::client cf::player
213 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
214 cf::map cf::party cf::region 288 cf::party cf::region
215)) { 289)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 291}
219 292
220$Event::DIED = sub { 293$EV::DIED = sub {
221 warn "error in event callback: @_"; 294 warn "error in event callback: @_";
222}; 295};
223 296
224############################################################################# 297#############################################################################
225 298
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 322 $d
250 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
251} 324}
252 325
253=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
254 327
255Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
256 329
257=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
258 331
259Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
260 333
261=cut 334=cut
262 335
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 337
265sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
267 354
268=item cf::lock_wait $string 355=item cf::lock_wait $string
269 356
270Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
271 358
272=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
273 360
274Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
277returned. 364returned.
278 365
279Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 367deadlocked coro.
286 373
287Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
288 375
289=cut 376=cut
290 377
291our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 379
294sub lock_wait($) { 380sub lock_wait($) {
295 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 382}
308 383
309sub lock_acquire($) { 384sub lock_acquire($) {
310 my ($key) = @_; 385 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 386}
324 387
325sub lock_active($) { 388sub lock_active($) {
326 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 390}
330 391
331sub freeze_mainloop { 392sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
333 394
334 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 396}
336 }; 397
337 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
338 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
339} 411}
340 412
341=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
342 414
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
354our @SLOT_QUEUE; 426our @SLOT_QUEUE;
355our $SLOT_QUEUE; 427our $SLOT_QUEUE;
356 428
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
359 my $signal = new Coro::Signal; 433 my $signal = new Coro::Signal;
360 434
361 while () { 435 while () {
362 next_job: 436 next_job:
363 my $avail = cf::till_tick; 437 my $avail = cf::till_tick;
371 } 445 }
372 } 446 }
373 } 447 }
374 448
375 if (@SLOT_QUEUE) { 449 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 451 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 452 $signal->wait;
379 } else { 453 } else {
380 Coro::schedule; 454 Coro::schedule;
381 } 455 }
382 } 456 }
383}; 457};
384 458
385sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
386 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
387 463
388 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
390 466
404 480
405BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
406 482
407=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
408 484
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 488acceptable.
413 489
414If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
420 496
421sub sync_job(&) { 497sub sync_job(&) {
422 my ($job) = @_; 498 my ($job) = @_;
423 499
424 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 501 my $time = EV::time;
426 502
427 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
429 505
430 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 507
432 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
433 509
434 my $busy = 1; 510 my $busy = 1;
435 my @res; 511 my @res;
436 512
437 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 515 @res = eval { $job->() };
439 warn $@ if $@; 516 warn $@ if $@;
440 undef $busy; 517 undef $busy;
441 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
442 519
443 while ($busy) { 520 while ($busy) {
444 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
445 } 525 }
526 }
446 527
447 $time = Event::time - $time; 528 my $time = EV::time - $time;
448 529
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
453 531
454 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
455 } else { 533 } else {
456 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
457 535
482=item fork_call { }, $args 560=item fork_call { }, $args
483 561
484Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
488 566
489=cut 567=cut
490 568
491sub fork_call(&@) { 569sub fork_call(&@) {
492 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
499 reset_signals; 577 reset_signals;
500 &$cb 578 &$cb
501 }, @args; 579 }, @args;
502 580
503 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
582}
583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
504} 609}
505 610
506=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
507 612
508Returns a single value from the environment database. 613Returns a single value from the environment database.
647 752
648############################################################################# 753#############################################################################
649 754
650=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
651 756
652Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
653attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
655 760
656In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 763Deliantra).
659 764
660=over 4 765=over 4
661 766
662=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
663 768
707=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
708 813
709Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
710given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
711 816
712Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
713that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
714 819
715These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
716 821
717=over 4 822=over 4
945 } 1050 }
946 1051
947 0 1052 0
948} 1053}
949 1054
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1056
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1058
954Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
955 1060
961 1066
962=cut 1067=cut
963 1068
964############################################################################# 1069#############################################################################
965# object support 1070# object support
966#
967 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
968sub _can_merge { 1105sub _can_merge {
969 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
970 1107
971 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1109
975 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
976} 1112}
977 1113
978sub reattach { 1114sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1116 my ($obj) = @_;
981 1117
1118 # no longer needed after getting rid of delete_package?
982 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
983 1120
984 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
985 1122
986 @$registry = (); 1123 @$registry = ();
987 1124
1002cf::attachable->attach ( 1139cf::attachable->attach (
1003 prio => -1000000, 1140 prio => -1000000,
1004 on_instantiate => sub { 1141 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
1006 1143
1007 $data = from_json $data; 1144 $data = decode_json $data;
1008 1145
1009 for (@$data) { 1146 for (@$data) {
1010 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
1011 1148
1012 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
1033 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1034 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1035 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1036 1173
1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1038 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1040 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1041 close $fh; 1181 aio_close $fh;
1042 1182
1043 if (@$objs) { 1183 if (@$objs) {
1044 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1045 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1049 close $fh; 1192 aio_close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1194 }
1052 } else { 1195 } else {
1053 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1054 } 1197 }
1055 1198
1056 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1057 } else { 1203 } else {
1058 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1059 } 1205 }
1060 } else { 1206 } else {
1061 aio_unlink $filename; 1207 aio_unlink $filename;
1062 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1063 } 1209 }
1082 1228
1083 unless (aio_stat "$filename.pst") { 1229 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1230 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1231 or return;
1086 1232
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1233 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs};
1088 } 1235 }
1089 1236
1090 utf8::decode (my $decname = $filename); 1237 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1238 warn sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1239 $decname, length $data, scalar @{$av || []};
1153 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1154 1301
1155 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1156} 1303}
1157 1304
1305use File::Glob ();
1306
1158cf::player->attach ( 1307cf::player->attach (
1159 on_command => sub { 1308 on_command => sub {
1160 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1161 1310
1162 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1194 1343
1195 cf::override; 1344 cf::override;
1196 }, 1345 },
1197); 1346);
1198 1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1360
1199sub load_extensions { 1361sub load_extensions {
1200 cf::sync_job { 1362 cf::sync_job {
1201 my %todo; 1363 my %todo;
1202 1364
1203 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
1222 1384
1223 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1224 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1225 1387
1226 $ext{source} = 1388 $ext{source} =
1227 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1228 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1229 . $source 1391 . $source
1230 . "\n};\n1"; 1392 . "\n};\n1";
1231 1393
1232 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1248 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1250 1412
1251 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1252 warn $msg; 1414 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1254 exit 1;
1255 } 1416 }
1256 1417
1257 warn $msg; 1418 warn $msg;
1258 } 1419 }
1259 1420
1273 1434
1274=back 1435=back
1275 1436
1276=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1277 1438
1278Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1279 1440
1280=cut 1441=cut
1281 1442
1282package cf::player; 1443package cf::player;
1283 1444
1326 1487
1327sub exists($) { 1488sub exists($) {
1328 my ($login) = @_; 1489 my ($login) = @_;
1329 1490
1330 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1331 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1332} 1493}
1333 1494
1334sub find($) { 1495sub find($) {
1335 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1336 my $login = $_[0]; 1497 my $login = $_[0];
1348 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1349 or return; 1510 or return;
1350 1511
1351 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1352 or return; 1513 or return;
1514
1353 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1355 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1356 } 1518 }
1357 } 1519 }
1367 1529
1368 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1369 1531
1370 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1371 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1372 1536
1373 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1374 cf::cede_to_tick; 1538 cf::cede_to_tick;
1375} 1539}
1376 1540
1408 my ($pl) = @_; 1572 my ($pl) = @_;
1409 1573
1410 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1411 1575
1412 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1413 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1414 1578
1415 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1416 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1417 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1418 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1419 1585
1420 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1421 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1460 1626
1461 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1462 my $path = path $login; 1628 my $path = path $login;
1463 1629
1464 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1467 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1468 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 } 1636 }
1470 1637
1501 } 1668 }
1502 1669
1503 \@paths 1670 \@paths
1504} 1671}
1505 1672
1506=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1507 1674
1508Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1509
1510=cut
1511
1512sub expand_cfpod {
1513 ((my $self), (local $_)) = @_;
1514
1515 # escape & and <
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518
1519 # this is buggy, it needs to properly take care of nested <'s
1520
1521 1 while
1522 # replace B<>, I<>, U<> etc.
1523 s/B<([^\>]*)>/<b>$1<\/b>/
1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1527 # replace G<male|female> tags
1528 || s{G<([^>|]*)\|([^>]*)>}{
1529 $self->gender ? $2 : $1
1530 }ge
1531 # replace H<hint text>
1532 || s{H<([^\>]*)>}
1533 {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "")
1537 [$self->{hintmode}]
1538 }ge;
1539
1540 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g;
1542
1543 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines
1548
1549 $_
1550}
1551
1552sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode}
1555}
1556 1676
1557=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1558 1678
1559Sends an ext reply to the player. 1679Sends an ext reply to the player.
1560 1680
1627our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1628our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1629 1749
1630sub generate_random_map { 1750sub generate_random_map {
1631 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1632 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1633 $self->_create_random_map ( 1756 $self->_create_random_map (
1634 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1635 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1636 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 1881
1759# the temporary/swap location 1882# the temporary/swap location
1760sub save_path { 1883sub save_path {
1761 my ($self) = @_; 1884 my ($self) = @_;
1762 1885
1763 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1764 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1765} 1888}
1766 1889
1767# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1768sub uniq_path { 1891sub uniq_path {
1769 my ($self) = @_; 1892 my ($self) = @_;
1770 1893
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1773}
1774
1775# and all this just because we cannot iterate over
1776# all maps in C++...
1777sub change_all_map_light {
1778 my ($change) = @_;
1779
1780 $_->change_map_light ($change)
1781 for grep $_->outdoor, values %cf::MAP;
1782} 1896}
1783 1897
1784sub decay_objects { 1898sub decay_objects {
1785 my ($self) = @_; 1899 my ($self) = @_;
1786 1900
1870sub find { 1984sub find {
1871 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1872 1986
1873 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1874 1988
1875 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1876 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1877 1991
1878 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1881
1882 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1883 or return; 1994 or return;
1884 1995
1885 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1886 1997
1888 or return; 1999 or return;
1889 2000
1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1891 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1892 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
1893 undef $guard1; 2005 undef $guard1;
1894 undef $guard2;
1895 $map->reset; 2006 $map->reset;
1896 return find $path; 2007 return find $path;
1897 } 2008 }
1898 2009
1899 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1926 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block; 2038 $f->skip_block;
1928 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
1929 or return; 2040 or return;
1930 2041
1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1932 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1933 2044
1934 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1935 utf8::encode $uniq; 2046 utf8::encode $uniq;
1936 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
1954 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1955 $self->decay_objects; 2066 $self->decay_objects;
1956 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1957 $self->update_buttons; 2068 $self->update_buttons;
1958 cf::cede_to_tick; 2069 cf::cede_to_tick;
1959 $self->set_darkness_map;
1960 cf::cede_to_tick;
1961 $self->activate; 2070 $self->activate;
1962 } 2071 }
1963 2072
1964 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
1966 2075
1967 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1968 } 2077 }
1969 2078
1970 $self->post_load; 2079 $self->post_load;
1971} 2080}
1972 2081
2030 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2031 2140
2032 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2033 2142
2034 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2036 } 2145 }
2037 2146
2038 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2039 2148
2040 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
2041 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2154 if (my $map = find $k) {
2044 $map->load if $v; 2155 $map->load if $v;
2045 } 2156 }
2071 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2072 2183
2073 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2074 2185
2075 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2077 }; 2189 };
2190
2191 cf::get_slot 0.02;
2078 2192
2079 if ($uniq) { 2193 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2081 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2082 } else { 2196 } else {
2091 $self->save; 2205 $self->save;
2092 2206
2093 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094 2208
2095 return if $self->players; 2209 return if $self->players;
2096 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2097 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2098 2212
2099 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2100 2214
2101 $self->deactivate; 2215 $self->deactivate;
2126 2240
2127 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2128 2242
2129 return if $self->players; 2243 return if $self->players;
2130 2244
2131 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2132 2246
2133 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2134 2248
2135 # need to save uniques path 2249 # need to save uniques path
2136 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2219 2333
2220sub unique_maps() { 2334sub unique_maps() {
2221 [ 2335 [
2222 map { 2336 map {
2223 utf8::decode $_; 2337 utf8::decode $_;
2224 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2225 ? normalise $_ 2341 : normalise $_
2226 : ()
2227 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2228 ] 2343 ]
2229} 2344}
2230 2345
2231package cf; 2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2232 2377
2233=back 2378=back
2234 2379
2235=head3 cf::object 2380=head3 cf::object
2236 2381
2240 2385
2241=over 4 2386=over 4
2242 2387
2243=item $ob->inv_recursive 2388=item $ob->inv_recursive
2244 2389
2245Returns the inventory of the object _and_ their inventories, recursively. 2390Returns the inventory of the object I<and> their inventories, recursively,
2391but I<not> the object itself.
2246 2392
2247=cut 2393=cut
2248 2394
2249sub inv_recursive_; 2395sub inv_recursive_;
2250sub inv_recursive_ { 2396sub inv_recursive_ {
2255 inv_recursive_ inv $_[0] 2401 inv_recursive_ inv $_[0]
2256} 2402}
2257 2403
2258=item $ref = $ob->ref 2404=item $ref = $ob->ref
2259 2405
2260creates and returns a persistent reference to an objetc that can be stored as a string. 2406Creates and returns a persistent reference to an object that can be stored as a string.
2261 2407
2262=item $ob = cf::object::deref ($refstring) 2408=item $ob = cf::object::deref ($refstring)
2263 2409
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2410returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block. 2411even if the object actually exists. May block.
2267=cut 2413=cut
2268 2414
2269sub deref { 2415sub deref {
2270 my ($ref) = @_; 2416 my ($ref) = @_;
2271 2417
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2418 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2419 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2420 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2421 or return;
2279 $pl->ob->uuid eq $uuid 2422 $pl->ob->uuid eq $uuid
2280 or return; 2423 or return;
2300can be C<undef>. Does the right thing when the player is currently in a 2443can be C<undef>. Does the right thing when the player is currently in a
2301dialogue with the given NPC character. 2444dialogue with the given NPC character.
2302 2445
2303=cut 2446=cut
2304 2447
2448our $SAY_CHANNEL = {
2449 id => "say",
2450 title => "Map",
2451 reply => "say ",
2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2453};
2454
2455our $CHAT_CHANNEL = {
2456 id => "chat",
2457 title => "Chat",
2458 reply => "chat ",
2459 tooltip => "Player chat and shouts, global to the server.",
2460};
2461
2305# rough implementation of a future "reply" method that works 2462# rough implementation of a future "reply" method that works
2306# with dialog boxes. 2463# with dialog boxes.
2307#TODO: the first argument must go, split into a $npc->reply_to ( method 2464#TODO: the first argument must go, split into a $npc->reply_to ( method
2308sub cf::object::player::reply($$$;$) { 2465sub cf::object::player::reply($$$;$) {
2309 my ($self, $npc, $msg, $flags) = @_; 2466 my ($self, $npc, $msg, $flags) = @_;
2320 my $dialog = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2322 2479
2323 } else { 2480 } else {
2324 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2325 $self->message ($msg, $flags); 2482 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2326 } 2483 }
2327 } 2484 }
2328} 2485}
2329 2486
2330=item $object->send_msg ($channel, $msg, $color, [extra...]) 2487=item $object->send_msg ($channel, $msg, $color, [extra...])
2355 2512
2356=item $player_object->enter_link 2513=item $player_object->enter_link
2357 2514
2358Freezes the player and moves him/her to a special map (C<{link}>). 2515Freezes the player and moves him/her to a special map (C<{link}>).
2359 2516
2360The player should be reasonably safe there for short amounts of time. You 2517The player should be reasonably safe there for short amounts of time (e.g.
2361I<MUST> call C<leave_link> as soon as possible, though. 2518for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link
2520map.
2362 2521
2363Will never block. 2522Will never block.
2364 2523
2365=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2366 2525
2424 2583
2425 $map->load; 2584 $map->load;
2426 $map->load_neighbours; 2585 $map->load_neighbours;
2427 2586
2428 return unless $self->contr->active; 2587 return unless $self->contr->active;
2429 $self->activate_recursive;
2430 2588
2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2432 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2433} 2594}
2434 2595
2435=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2436 2597
2437Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
2438her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2439that has to return the map if sucecssful, and then unfreezes the player on 2600that has to return the map if sucecssful, and then unfreezes the player on
2440the new (success) or old (failed) map position. In either case, $done will 2601the new (success) or old (failed) map position. In either case, $done will
2441be called at the end of this process. 2602be called at the end of this process.
2442 2603
2604Note that $check will be called with a potentially non-loaded map, so if
2605it needs a loaded map it has to call C<< ->load >>.
2606
2443=cut 2607=cut
2444 2608
2445our $GOTOGEN; 2609our $GOTOGEN;
2446 2610
2447sub cf::object::player::goto { 2611sub cf::object::player::goto {
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2616
2453 $self->enter_link; 2617 $self->enter_link;
2454 2618
2455 (async { 2619 (async {
2620 $Coro::current->{desc} = "player::goto $path $x $y";
2621
2456 # *tag paths override both path and x|y 2622 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2623 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2624 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2625 my $ob = $obs[rand @obs];
2460 2626
2523} 2689}
2524 2690
2525sub prepare_random_map { 2691sub prepare_random_map {
2526 my ($exit) = @_; 2692 my ($exit) = @_;
2527 2693
2528 my $guard = cf::lock_acquire "exit_prepare:$exit";
2529
2530 # all this does is basically replace the /! path by 2694 # all this does is basically replace the /! path by
2531 # a new random map path (?random/...) with a seed 2695 # a new random map path (?random/...) with a seed
2532 # that depends on the exit object 2696 # that depends on the exit object
2533 2697
2534 my $rmp = parse_random_map_params $exit->msg; 2698 my $rmp = parse_random_map_params $exit->msg;
2536 if ($exit->map) { 2700 if ($exit->map) {
2537 $rmp->{region} = $exit->region->name; 2701 $rmp->{region} = $exit->region->name;
2538 $rmp->{origin_map} = $exit->map->path; 2702 $rmp->{origin_map} = $exit->map->path;
2539 $rmp->{origin_x} = $exit->x; 2703 $rmp->{origin_x} = $exit->x;
2540 $rmp->{origin_y} = $exit->y; 2704 $rmp->{origin_y} = $exit->y;
2705
2706 $exit->map->touch;
2541 } 2707 }
2542 2708
2543 $rmp->{random_seed} ||= $exit->random_seed; 2709 $rmp->{random_seed} ||= $exit->random_seed;
2544 2710
2545 my $data = cf::to_json $rmp; 2711 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2712 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2713 my $meta = "$RANDOMDIR/$md5.meta";
2548 2714
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2715 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2716 aio_write $fh, 0, (length $data), $data, 0;
2551 undef $fh; 2717 undef $fh;
2552 aio_rename "$meta~", $meta; 2718 aio_rename "$meta~", $meta;
2553 2719
2720 my $slaying = "?random/$md5";
2721
2722 if ($exit->valid) {
2554 $exit->slaying ("?random/$md5"); 2723 $exit->slaying ("?random/$md5");
2555 $exit->msg (undef); 2724 $exit->msg (undef);
2725 }
2556 } 2726 }
2557} 2727}
2558 2728
2559sub cf::object::player::enter_exit { 2729sub cf::object::player::enter_exit {
2560 my ($self, $exit) = @_; 2730 my ($self, $exit) = @_;
2561 2731
2562 return unless $self->type == cf::PLAYER; 2732 return unless $self->type == cf::PLAYER;
2563 2733
2564 if ($exit->slaying eq "/!") {
2565 #TODO: this should de-fi-ni-te-ly not be a sync-job
2566 # the problem is that $exit might not survive long enough
2567 # so it needs to be done right now, right here
2568 cf::sync_job { prepare_random_map $exit };
2569 }
2570
2571 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2572 my $hp = $exit->stats->hp;
2573 my $sp = $exit->stats->sp;
2574
2575 $self->enter_link; 2734 $self->enter_link;
2576 2735
2577 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED);
2580
2581 (async { 2736 (async {
2582 $self->deactivate_recursive; # just to be sure 2737 $Coro::current->{desc} = "enter_exit";
2738
2583 unless (eval { 2739 unless (eval {
2740 $self->deactivate_recursive; # just to be sure
2741
2742 # random map handling
2743 {
2744 my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746 prepare_random_map $exit
2747 if $exit->slaying eq "/!";
2748 }
2749
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2751 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp;
2753
2584 $self->goto ($slaying, $hp, $sp); 2754 $self->goto ($map, $x, $y);
2585 2755
2756 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y)
2758 if $exit->flag (cf::FLAG_DAMNED);
2759
2586 1; 2760 1
2587 }) { 2761 }) {
2588 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2589 . "I'll try to bring you back to the map you were before. " 2763 . "I'll try to bring you back to the map you were before. "
2590 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2591 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2592 2766
2593 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2795the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2796the message unless the client supports the msg packet.
2623 2797
2624=cut 2798=cut
2625 2799
2800# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2801our %CHANNEL = (
2802 "c/motd" => {
2803 id => "infobox",
2804 title => "MOTD",
2805 reply => undef,
2806 tooltip => "The message of the day",
2807 },
2627 "c/identify" => { 2808 "c/identify" => {
2628 id => "identify", 2809 id => "infobox",
2629 title => "Identify", 2810 title => "Identify",
2630 reply => undef, 2811 reply => undef,
2631 tooltip => "Items recently identified", 2812 tooltip => "Items recently identified",
2632 }, 2813 },
2633 "c/examine" => { 2814 "c/examine" => {
2634 id => "examine", 2815 id => "infobox",
2635 title => "Examine", 2816 title => "Examine",
2636 reply => undef, 2817 reply => undef,
2637 tooltip => "Signs and other items you examined", 2818 tooltip => "Signs and other items you examined",
2638 }, 2819 },
2820 "c/shopinfo" => {
2821 id => "infobox",
2822 title => "Shop Info",
2823 reply => undef,
2824 tooltip => "What your bargaining skill tells you about the shop",
2825 },
2826 "c/book" => {
2827 id => "infobox",
2828 title => "Book",
2829 reply => undef,
2830 tooltip => "The contents of a note or book",
2831 },
2832 "c/lookat" => {
2833 id => "infobox",
2834 title => "Look",
2835 reply => undef,
2836 tooltip => "What you saw there",
2837 },
2838 "c/who" => {
2839 id => "infobox",
2840 title => "Players",
2841 reply => undef,
2842 tooltip => "Shows players who are currently online",
2843 },
2844 "c/body" => {
2845 id => "infobox",
2846 title => "Body Parts",
2847 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available",
2849 },
2850 "c/statistics" => {
2851 id => "infobox",
2852 title => "Statistics",
2853 reply => undef,
2854 tooltip => "Shows your primary statistics",
2855 },
2856 "c/skills" => {
2857 id => "infobox",
2858 title => "Skills",
2859 reply => undef,
2860 tooltip => "Shows your experience per skill and item power",
2861 },
2862 "c/shopitems" => {
2863 id => "infobox",
2864 title => "Shop Items",
2865 reply => undef,
2866 tooltip => "Shows the items currently for sale in this shop",
2867 },
2868 "c/resistances" => {
2869 id => "infobox",
2870 title => "Resistances",
2871 reply => undef,
2872 tooltip => "Shows your resistances",
2873 },
2874 "c/pets" => {
2875 id => "infobox",
2876 title => "Pets",
2877 reply => undef,
2878 tooltip => "Shows information abotu your pets/a specific pet",
2879 },
2880 "c/perceiveself" => {
2881 id => "infobox",
2882 title => "Perceive Self",
2883 reply => undef,
2884 tooltip => "You gained detailed knowledge about yourself",
2885 },
2886 "c/uptime" => {
2887 id => "infobox",
2888 title => "Uptime",
2889 reply => undef,
2890 tooltip => "How long the server has been running since last restart",
2891 },
2892 "c/mapinfo" => {
2893 id => "infobox",
2894 title => "Map Info",
2895 reply => undef,
2896 tooltip => "Information related to the maps",
2897 },
2898 "c/party" => {
2899 id => "party",
2900 title => "Party",
2901 reply => "gsay ",
2902 tooltip => "Messages and chat related to your party",
2903 },
2904 "c/death" => {
2905 id => "death",
2906 title => "Death",
2907 reply => undef,
2908 tooltip => "Reason for and more info about your most recent death",
2909 },
2910 "c/say" => $SAY_CHANNEL,
2911 "c/chat" => $CHAT_CHANNEL,
2639); 2912);
2640 2913
2641sub cf::client::send_msg { 2914sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2915 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2916
2644 $msg = $self->pl->expand_cfpod ($msg); 2917 $msg = $self->pl->expand_cfpod ($msg)
2918 unless $color & cf::NDI_VERBATIM;
2645 2919
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2920 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2921
2648 # check predefined channels, for the benefit of C 2922 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2923 if ($CHANNEL{$channel}) {
2924 $channel = $CHANNEL{$channel};
2650 2925
2926 $self->ext_msg (channel_info => $channel);
2927 $channel = $channel->{id};
2928
2651 if (ref $channel) { 2929 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2930 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2931 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2932 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2933 $self->ext_msg (channel_info => $channel);
2656 if $self->can_msg;
2657 } 2934 }
2658 2935
2659 $channel = $channel->{id}; 2936 $channel = $channel->{id};
2660 } 2937 }
2661 2938
2662 return unless @extra || length $msg; 2939 return unless @extra || length $msg;
2663 2940
2664 if ($self->can_msg) {
2665 # default colour, mask it out 2941 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2942 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF; 2943 if $color & cf::NDI_DEF;
2668 2944
2669 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2945 my $pkt = "msg "
2946 . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2947 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2671 } else { 2948 );
2672 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones
2674 for ($msg) {
2675 1 while
2676 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2677 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2678 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2679 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2680 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2681 }
2682 2949
2683 $color &= cf::NDI_COLOR_MASK; 2950 # try lzf for large packets
2951 $pkt = "lzf " . Compress::LZF::compress $pkt
2952 if 1024 <= length $pkt and $self->{can_lzf};
2684 2953
2685 utf8::encode $msg; 2954 # split very large packets
2686 2955 if (8192 < length $pkt and $self->{can_lzf}) {
2687 if (0 && $msg =~ /\[/) { 2956 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2688 # COMMAND/INFO 2957 $pkt = "frag";
2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2690 } else {
2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2692 $self->send_packet ("drawinfo $color $msg")
2693 }
2694 }
2695 } 2958 }
2959
2960 $self->send_packet ($pkt);
2696} 2961}
2697 2962
2698=item $client->ext_msg ($type, @msg) 2963=item $client->ext_msg ($type, @msg)
2699 2964
2700Sends an ext event to the client. 2965Sends an ext event to the client.
2873=pod 3138=pod
2874 3139
2875The following functions and methods are available within a safe environment: 3140The following functions and methods are available within a safe environment:
2876 3141
2877 cf::object 3142 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3143 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3144 insert remove name archname title slaying race decrease split
3145 value
2880 3146
2881 cf::object::player 3147 cf::object::player
2882 player 3148 player
2883 3149
2884 cf::player 3150 cf::player
2889 3155
2890=cut 3156=cut
2891 3157
2892for ( 3158for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3159 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3160 insert remove inv nrof name archname title slaying race
2895 decrease_ob_nr)], 3161 decrease split destroy change_exp value msg lore send_msg)],
2896 ["cf::object::player" => qw(player)], 3162 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3163 ["cf::player" => qw(peaceful send_msg)],
2898 ["cf::map" => qw(trigger)], 3164 ["cf::map" => qw(trigger)],
2899) { 3165) {
2900 no strict 'refs'; 3166 no strict 'refs';
2901 my ($pkg, @funs) = @$_; 3167 my ($pkg, @funs) = @$_;
2902 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3168 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2919 my ($code, %vars) = @_; 3185 my ($code, %vars) = @_;
2920 3186
2921 my $qcode = $code; 3187 my $qcode = $code;
2922 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3188 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2923 $qcode =~ s/\n/\\n/g; 3189 $qcode =~ s/\n/\\n/g;
3190
3191 %vars = (_dummy => 0) unless %vars;
2924 3192
2925 local $_; 3193 local $_;
2926 local @safe::cf::_safe_eval_args = values %vars; 3194 local @safe::cf::_safe_eval_args = values %vars;
2927 3195
2928 my $eval = 3196 my $eval =
3005 { 3273 {
3006 my $faces = $facedata->{faceinfo}; 3274 my $faces = $facedata->{faceinfo};
3007 3275
3008 while (my ($face, $info) = each %$faces) { 3276 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3277 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3278
3010 cf::face::set_visibility $idx, $info->{visibility}; 3279 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3280 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3281 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3282 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3014 3283
3015 cf::cede_to_tick; 3284 cf::cede_to_tick;
3016 } 3285 }
3017 3286
3018 while (my ($face, $info) = each %$faces) { 3287 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3288 next unless $info->{smooth};
3289
3020 my $idx = cf::face::find $face 3290 my $idx = cf::face::find $face
3021 or next; 3291 or next;
3292
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3293 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3294 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3295 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3296 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3297 warn "smooth face '$info->{smooth}' not found for face '$face'";
3044 { 3315 {
3045 # TODO: for gcfclient pleasure, we should give resources 3316 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index. 3317 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3318 my $res = $facedata->{resource};
3048 3319
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3320 while (my ($name, $info) = each %$res) {
3321 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3322 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data; 3323 my $data;
3054 3324
3055 if ($info->{type} & 1) { 3325 if ($info->{type} & 1) {
3056 # prepend meta info 3326 # prepend meta info
3057 3327
3058 my $meta = $enc->encode ({ 3328 my $meta = $enc->encode ({
3059 name => $name, 3329 name => $name,
3060 %{ $info->{meta} || {} }, 3330 %{ $info->{meta} || {} },
3061 }); 3331 });
3062 3332
3063 $data = pack "(w/a*)*", $meta, $info->{data}; 3333 $data = pack "(w/a*)*", $meta, $info->{data};
3334 } else {
3335 $data = $info->{data};
3336 }
3337
3338 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3339 cf::face::set_type $idx, $info->{type};
3064 } else { 3340 } else {
3065 $data = $info->{data}; 3341 $RESOURCE{$name} = $info;
3066 } 3342 }
3067 3343
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3344 cf::cede_to_tick;
3072 } 3345 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3346 }
3347
3348 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3349
3093 1 3350 1
3094} 3351}
3352
3353cf::global->attach (on_resource_update => sub {
3354 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3355 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3356
3357 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3358 my $sound = $soundconf->{compat}[$_]
3359 or next;
3360
3361 my $face = cf::face::find "sound/$sound->[1]";
3362 cf::sound::set $sound->[0] => $face;
3363 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3364 }
3365
3366 while (my ($k, $v) = each %{$soundconf->{event}}) {
3367 my $face = cf::face::find "sound/$v";
3368 cf::sound::set $k => $face;
3369 }
3370 }
3371});
3095 3372
3096register_exticmd fx_want => sub { 3373register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_; 3374 my ($ns, $want) = @_;
3098 3375
3099 while (my ($k, $v) = each %$want) { 3376 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v); 3377 $ns->fx_want ($k, $v);
3101 } 3378 }
3102}; 3379};
3380
3381sub load_resource_file($) {
3382 my $guard = lock_acquire "load_resource_file";
3383
3384 my $status = load_resource_file_ $_[0];
3385 get_slot 0.1, 100;
3386 cf::arch::commit_load;
3387
3388 $status
3389}
3103 3390
3104sub reload_regions { 3391sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework 3392 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?) 3393 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = (); 3394 %ext::player_env::MUSIC_FACE_CACHE = ();
3121} 3408}
3122 3409
3123sub reload_archetypes { 3410sub reload_archetypes {
3124 load_resource_file "$DATADIR/archetypes" 3411 load_resource_file "$DATADIR/archetypes"
3125 or die "unable to load archetypes\n"; 3412 or die "unable to load archetypes\n";
3126 #d# NEED to laod twice to resolve forward references
3127 # this really needs to be done in an extra post-pass
3128 # (which needs to be synchronous, so solve it differently)
3129 load_resource_file "$DATADIR/archetypes"
3130 or die "unable to load archetypes\n";
3131} 3413}
3132 3414
3133sub reload_treasures { 3415sub reload_treasures {
3134 load_resource_file "$DATADIR/treasures" 3416 load_resource_file "$DATADIR/treasures"
3135 or die "unable to load treasurelists\n"; 3417 or die "unable to load treasurelists\n";
3136} 3418}
3137 3419
3138sub reload_resources { 3420sub reload_resources {
3139 warn "reloading resource files...\n"; 3421 warn "reloading resource files...\n";
3140 3422
3423 reload_facedata;
3424 reload_archetypes;
3141 reload_regions; 3425 reload_regions;
3142 reload_facedata;
3143 #reload_archetypes;#d#
3144 reload_archetypes;
3145 reload_treasures; 3426 reload_treasures;
3146 3427
3147 warn "finished reloading resource files\n"; 3428 warn "finished reloading resource files\n";
3148} 3429}
3149 3430
3150sub init {
3151 reload_resources;
3152}
3153
3154sub reload_config { 3431sub reload_config {
3432 warn "reloading config file...\n";
3433
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3434 open my $fh, "<:utf8", "$CONFDIR/config"
3156 or return; 3435 or return;
3157 3436
3158 local $/; 3437 local $/;
3159 *CFG = YAML::Syck::Load <$fh>; 3438 *CFG = YAML::XS::Load scalar <$fh>;
3160 3439
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3440 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3162 3441
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3442 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3164 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3443 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3168 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3447 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3169 and die "WARNING: m(un)lockall failed: $!\n"; 3448 and die "WARNING: m(un)lockall failed: $!\n";
3170 }; 3449 };
3171 warn $@ if $@; 3450 warn $@ if $@;
3172 } 3451 }
3452
3453 warn "finished reloading resource files\n";
3454}
3455
3456sub pidfile() {
3457 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3458 or die "$PIDFILE: $!";
3459 flock $fh, &Fcntl::LOCK_EX
3460 or die "$PIDFILE: flock: $!";
3461 $fh
3462}
3463
3464# make sure only one server instance is running at any one time
3465sub atomic {
3466 my $fh = pidfile;
3467
3468 my $pid = <$fh>;
3469 kill 9, $pid if $pid > 0;
3470
3471 seek $fh, 0, 0;
3472 print $fh $$;
3473}
3474
3475sub main_loop {
3476 warn "EV::loop starting\n";
3477 if (1) {
3478 EV::loop;
3479 }
3480 warn "EV::loop returned\n";
3481 goto &main_loop unless $REALLY_UNLOOP;
3173} 3482}
3174 3483
3175sub main { 3484sub main {
3485 cf::init_globals; # initialise logging
3486
3487 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3488 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3489 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3490 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3491
3492 cf::init_experience;
3493 cf::init_anim;
3494 cf::init_attackmess;
3495 cf::init_dynamic;
3496
3497 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3498
3176 # we must not ever block the main coroutine 3499 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3500 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3501 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3502 (async {
3180 Event::one_event; 3503 $Coro::current->{desc} = "IDLE BUG HANDLER";
3504 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3505 })->prio (Coro::PRIO_MAX);
3182 }; 3506 };
3183 3507
3508 evthread_start IO::AIO::poll_fileno;
3509
3510 cf::sync_job {
3511 reload_resources;
3184 reload_config; 3512 reload_config;
3185 db_init; 3513 db_init;
3514
3515 cf::load_settings;
3516 cf::load_materials;
3517 cf::init_uuid;
3518 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills;
3521
3522 cf::init_beforeplay;
3523
3524 atomic;
3525
3186 load_extensions; 3526 load_extensions;
3187 3527
3188 $TICK_WATCHER->start; 3528 utime time, time, $RUNTIMEFILE;
3189 Event::loop; 3529
3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533
3534 (pop @POST_INIT)->(0) while @POST_INIT;
3535 };
3536
3537 main_loop;
3190} 3538}
3191 3539
3192############################################################################# 3540#############################################################################
3193# initialisation and cleanup 3541# initialisation and cleanup
3194 3542
3195# install some emergency cleanup handlers 3543# install some emergency cleanup handlers
3196BEGIN { 3544BEGIN {
3545 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3546 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3547 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3548 cf::cleanup "SIG$signal";
3205 },
3206 ); 3549 };
3207 } 3550 }
3208} 3551}
3209 3552
3210sub write_runtime { 3553sub write_runtime_sync {
3211 my $runtime = "$LOCALDIR/runtime";
3212
3213 # first touch the runtime file to show we are still running: 3554 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time. 3555 # the fsync below can take a very very long time.
3215 3556
3216 IO::AIO::aio_utime $runtime, undef, undef; 3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3217 3558
3218 my $guard = cf::lock_acquire "write_runtime"; 3559 my $guard = cf::lock_acquire "write_runtime";
3219 3560
3220 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3221 or return; 3562 or return;
3222 3563
3223 my $value = $cf::RUNTIME + 90 + 10; 3564 my $value = $cf::RUNTIME + 90 + 10;
3224 # 10 is the runtime save interval, for a monotonic clock 3565 # 10 is the runtime save interval, for a monotonic clock
3225 # 60 allows for the watchdog to kill the server. 3566 # 60 allows for the watchdog to kill the server.
3235 aio_utime $fh, undef, undef; 3576 aio_utime $fh, undef, undef;
3236 3577
3237 close $fh 3578 close $fh
3238 or return; 3579 or return;
3239 3580
3240 aio_rename "$runtime~", $runtime 3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3241 and return; 3582 and return;
3242 3583
3243 warn "runtime file written.\n"; 3584 warn "runtime file written.\n";
3244 3585
3245 1 3586 1
3587}
3588
3589our $uuid_lock;
3590our $uuid_skip;
3591
3592sub write_uuid_sync($) {
3593 $uuid_skip ||= $_[0];
3594
3595 return if $uuid_lock;
3596 local $uuid_lock = 1;
3597
3598 my $uuid = "$LOCALDIR/uuid";
3599
3600 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3601 or return;
3602
3603 my $value = uuid_seq uuid_cur;
3604
3605 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n";
3607 return;
3608 }
3609
3610 my $value = uuid_str $value + $uuid_skip;
3611 $uuid_skip = 0;
3612
3613 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3614 and return;
3615
3616 # always fsync - this file is important
3617 aio_fsync $fh
3618 and return;
3619
3620 close $fh
3621 or return;
3622
3623 aio_rename "$uuid~", $uuid
3624 and return;
3625
3626 warn "uuid file written ($value).\n";
3627
3628 1
3629
3630}
3631
3632sub write_uuid($$) {
3633 my ($skip, $sync) = @_;
3634
3635 $sync ? write_uuid_sync $skip
3636 : async { write_uuid_sync $skip };
3246} 3637}
3247 3638
3248sub emergency_save() { 3639sub emergency_save() {
3249 my $freeze_guard = cf::freeze_mainloop; 3640 my $freeze_guard = cf::freeze_mainloop;
3250 3641
3251 warn "enter emergency perl save\n"; 3642 warn "emergency_perl_save: enter\n";
3252 3643
3253 cf::sync_job { 3644 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649
3254 # use a peculiar iteration method to avoid tripping on perl 3650 # use a peculiar iteration method to avoid tripping on perl
3255 # refcount bugs in for. also avoids problems with players 3651 # refcount bugs in for. also avoids problems with players
3256 # and maps saved/destroyed asynchronously. 3652 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3653 warn "emergency_perl_save: begin player save\n";
3258 for my $login (keys %cf::PLAYER) { 3654 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3655 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3656 $pl->valid or next;
3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3658 $pl->save;
3262 } 3659 }
3263 warn "end emergency player save\n"; 3660 warn "emergency_perl_save: end player save\n";
3264 3661
3265 warn "begin emergency map save\n"; 3662 warn "emergency_perl_save: begin map save\n";
3266 for my $path (keys %cf::MAP) { 3663 for my $path (keys %cf::MAP) {
3267 my $map = $cf::MAP{$path} or next; 3664 my $map = $cf::MAP{$path} or next;
3268 $map->valid or next; 3665 $map->valid or next;
3269 $map->save; 3666 $map->save;
3270 } 3667 }
3271 warn "end emergency map save\n"; 3668 warn "emergency_perl_save: end map save\n";
3272 3669
3273 warn "begin emergency database checkpoint\n"; 3670 warn "emergency_perl_save: begin database checkpoint\n";
3274 BDB::db_env_txn_checkpoint $DB_ENV; 3671 BDB::db_env_txn_checkpoint $DB_ENV;
3275 warn "end emergency database checkpoint\n"; 3672 warn "emergency_perl_save: end database checkpoint\n";
3673
3674 warn "emergency_perl_save: begin write uuid\n";
3675 write_uuid_sync 1;
3676 warn "emergency_perl_save: end write uuid\n";
3276 }; 3677 };
3277 3678
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3278 warn "leave emergency perl save\n"; 3684 warn "emergency_perl_save: leave\n";
3279} 3685}
3280 3686
3281sub post_cleanup { 3687sub post_cleanup {
3282 my ($make_core) = @_; 3688 my ($make_core) = @_;
3283 3689
3284 warn Carp::longmess "post_cleanup backtrace" 3690 warn Carp::longmess "post_cleanup backtrace"
3285 if $make_core; 3691 if $make_core;
3692
3693 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$;
3695}
3696
3697# a safer delete_package, copied from Symbol
3698sub clear_package($) {
3699 my $pkg = shift;
3700
3701 # expand to full symbol table name if needed
3702 unless ($pkg =~ /^main::.*::$/) {
3703 $pkg = "main$pkg" if $pkg =~ /^::/;
3704 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3705 $pkg .= '::' unless $pkg =~ /::$/;
3706 }
3707
3708 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3709 my $stem_symtab = *{$stem}{HASH};
3710
3711 defined $stem_symtab and exists $stem_symtab->{$leaf}
3712 or return;
3713
3714 # clear all symbols
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 }
3720 warn "cleared package $pkg\n";#d#
3286} 3721}
3287 3722
3288sub do_reload_perl() { 3723sub do_reload_perl() {
3289 # can/must only be called in main 3724 # can/must only be called in main
3290 if ($Coro::current != $Coro::main) { 3725 if ($Coro::current != $Coro::main) {
3291 warn "can only reload from main coroutine"; 3726 warn "can only reload from main coroutine";
3292 return; 3727 return;
3293 } 3728 }
3294 3729
3730 return if $RELOAD++;
3731
3732 my $t1 = EV::time;
3733
3734 while ($RELOAD) {
3295 warn "reloading..."; 3735 warn "reloading...";
3296 3736
3297 warn "entering sync_job"; 3737 warn "entering sync_job";
3298 3738
3299 cf::sync_job { 3739 cf::sync_job {
3300 cf::write_runtime; # external watchdog should not bark 3740 cf::write_runtime_sync; # external watchdog should not bark
3301 cf::emergency_save; 3741 cf::emergency_save;
3302 cf::write_runtime; # external watchdog should not bark 3742 cf::write_runtime_sync; # external watchdog should not bark
3303 3743
3304 warn "syncing database to disk"; 3744 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3745 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3746
3307 # if anything goes wrong in here, we should simply crash as we already saved 3747 # if anything goes wrong in here, we should simply crash as we already saved
3308 3748
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313
3314 warn "flushing outstanding aio requests"; 3749 warn "flushing outstanding aio requests";
3315 for (;;) {
3316 BDB::flush;
3317 IO::AIO::flush;
3318 Coro::cede;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3750 while (IO::AIO::nreqs || BDB::nreqs) {
3320 warn "iterate..."; 3751 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3321 }
3322
3323 ++$RELOAD;
3324
3325 warn "cancelling all extension coros";
3326 $_->cancel for values %EXT_CORO;
3327 %EXT_CORO = ();
3328
3329 warn "removing commands";
3330 %COMMAND = ();
3331
3332 warn "removing ext/exti commands";
3333 %EXTCMD = ();
3334 %EXTICMD = ();
3335
3336 warn "unloading/nuking all extensions";
3337 for my $pkg (@EXTS) {
3338 warn "... unloading $pkg";
3339
3340 if (my $cb = $pkg->can ("unload")) {
3341 eval {
3342 $cb->($pkg);
3343 1
3344 } or warn "$pkg unloaded, but with errors: $@";
3345 } 3752 }
3346 3753
3347 warn "... nuking $pkg"; 3754 warn "cancelling all extension coros";
3348 Symbol::delete_package $pkg; 3755 $_->cancel for values %EXT_CORO;
3349 } 3756 %EXT_CORO = ();
3350 3757
3351 warn "unloading all perl modules loaded from $LIBDIR"; 3758 warn "removing commands";
3352 while (my ($k, $v) = each %INC) { 3759 %COMMAND = ();
3353 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3354 3760
3761 warn "removing ext/exti commands";
3762 %EXTCMD = ();
3763 %EXTICMD = ();
3764
3765 warn "unloading/nuking all extensions";
3766 for my $pkg (@EXTS) {
3355 warn "... unloading $k"; 3767 warn "... unloading $pkg";
3356 delete $INC{$k};
3357 3768
3358 $k =~ s/\.pm$//;
3359 $k =~ s/\//::/g;
3360
3361 if (my $cb = $k->can ("unload_module")) { 3769 if (my $cb = $pkg->can ("unload")) {
3770 eval {
3362 $cb->(); 3771 $cb->($pkg);
3772 1
3773 } or warn "$pkg unloaded, but with errors: $@";
3774 }
3775
3776 warn "... clearing $pkg";
3777 clear_package $pkg;
3363 } 3778 }
3364 3779
3365 Symbol::delete_package $k; 3780 warn "unloading all perl modules loaded from $LIBDIR";
3781 while (my ($k, $v) = each %INC) {
3782 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783
3784 warn "... unloading $k";
3785 delete $INC{$k};
3786
3787 $k =~ s/\.pm$//;
3788 $k =~ s/\//::/g;
3789
3790 if (my $cb = $k->can ("unload_module")) {
3791 $cb->();
3792 }
3793
3794 clear_package $k;
3366 } 3795 }
3367 3796
3368 warn "getting rid of safe::, as good as possible"; 3797 warn "getting rid of safe::, as good as possible";
3369 Symbol::delete_package "safe::$_" 3798 clear_package "safe::$_"
3370 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3371 3800
3372 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
3373 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
3374 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3375 3804
3376 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
3377 # and global variables created in xs 3806 # and global variables created in xs
3378 #Symbol::delete_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
3379 3808
3380 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3381 3810
3382 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3383 require cf; 3812 require cf;
3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3385 3814
3386 warn "loading config and database again"; 3815 warn "loading config and database again";
3387 cf::reload_config; 3816 cf::reload_config;
3388 3817
3389 warn "loading extensions"; 3818 warn "loading extensions";
3390 cf::load_extensions; 3819 cf::load_extensions;
3391 3820
3821 if ($REATTACH_ON_RELOAD) {
3392 warn "reattaching attachments to objects/players"; 3822 warn "reattaching attachments to objects/players";
3393 _global_reattach; # objects, sockets 3823 _global_reattach; # objects, sockets
3394 warn "reattaching attachments to maps"; 3824 warn "reattaching attachments to maps";
3395 reattach $_ for values %MAP; 3825 reattach $_ for values %MAP;
3396 warn "reattaching attachments to players"; 3826 warn "reattaching attachments to players";
3397 reattach $_ for values %PLAYER; 3827 reattach $_ for values %PLAYER;
3828 }
3398 3829
3830 warn "running post_init jobs";
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3832
3399 warn "leaving sync_job"; 3833 warn "leaving sync_job";
3400 3834
3401 1 3835 1
3402 } or do { 3836 } or do {
3403 warn $@; 3837 warn $@;
3404 warn "error while reloading, exiting."; 3838 cf::cleanup "error while reloading, exiting.";
3405 exit 1;
3406 }; 3839 };
3407 3840
3408 warn "reloaded"; 3841 warn "reloaded";
3842 --$RELOAD;
3843 }
3844
3845 $t1 = EV::time - $t1;
3846 warn "reload completed in ${t1}s\n";
3409}; 3847};
3410 3848
3411our $RELOAD_WATCHER; # used only during reload 3849our $RELOAD_WATCHER; # used only during reload
3412 3850
3413sub reload_perl() { 3851sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3852 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3853 # coro crashes during coro_state_free->destroy here.
3416 3854
3417 $RELOAD_WATCHER ||= Event->timer ( 3855 $RELOAD_WATCHER ||= cf::async {
3418 reentrant => 0, 3856 Coro::AIO::aio_wait cache_extensions;
3419 after => 0, 3857
3420 data => WF_AUTOCANCEL, 3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3421 cb => sub {
3422 do_reload_perl; 3859 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3860 undef $RELOAD_WATCHER;
3424 }, 3861 };
3425 ); 3862 };
3426} 3863}
3427 3864
3428register_command "reload" => sub { 3865register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3866 my ($who, $arg) = @_;
3430 3867
3431 if ($who->flag (FLAG_WIZ)) { 3868 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3869 $who->message ("reloading server.");
3870 async {
3871 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3872 reload_perl;
3873 };
3434 } 3874 }
3435}; 3875};
3436 3876
3437unshift @INC, $LIBDIR; 3877unshift @INC, $LIBDIR;
3438 3878
3440 3880
3441our @WAIT_FOR_TICK; 3881our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN; 3882our @WAIT_FOR_TICK_BEGIN;
3443 3883
3444sub wait_for_tick { 3884sub wait_for_tick {
3445 return unless $TICK_WATCHER->is_active;
3446 return if $Coro::current == $Coro::main; 3885 return if tick_inhibit || $Coro::current == $Coro::main;
3447 3886
3448 my $signal = new Coro::Signal; 3887 my $signal = new Coro::Signal;
3449 push @WAIT_FOR_TICK, $signal; 3888 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait; 3889 $signal->wait;
3451} 3890}
3452 3891
3453sub wait_for_tick_begin { 3892sub wait_for_tick_begin {
3454 return unless $TICK_WATCHER->is_active;
3455 return if $Coro::current == $Coro::main; 3893 return if tick_inhibit || $Coro::current == $Coro::main;
3456 3894
3457 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3896 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3897 $signal->wait;
3460} 3898}
3461 3899
3462$TICK_WATCHER = Event->timer ( 3900sub tick {
3463 reentrant => 0,
3464 parked => 1,
3465 prio => 0,
3466 at => $NEXT_TICK || $TICK,
3467 data => WF_AUTOCANCEL,
3468 cb => sub {
3469 if ($Coro::current != $Coro::main) { 3901 if ($Coro::current != $Coro::main) {
3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3902 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3471 unless ++$bug_warning > 10; 3903 unless ++$bug_warning > 10;
3472 return; 3904 return;
3473 } 3905 }
3474 3906
3475 $NOW = $tick_start = Event::time;
3476
3477 cf::server_tick; # one server iteration 3907 cf::server_tick; # one server iteration
3478 3908
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3909 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 3911 Coro::async_pool {
3912 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 3913 write_runtime_sync
3486 or warn "ERROR: unable to write runtime file: $!"; 3914 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 } 3915 };
3916 }
3489 3917
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3918 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 3919 $sig->send;
3492 } 3920 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 3921 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 3922 $sig->send;
3495 } 3923 }
3496 3924
3497 $NOW = Event::time; 3925 $LOAD = ($NOW - $TICK_START) / $TICK;
3498
3499 # if we are delayed by four ticks or more, skip them all
3500 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3501
3502 $TICK_WATCHER->at ($NEXT_TICK);
3503 $TICK_WATCHER->start;
3504
3505 $LOAD = ($NOW - $tick_start) / $TICK;
3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3926 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 3927
3508 _post_tick; 3928 if (0) {
3929 if ($NEXT_TICK) {
3930 my $jitter = $TICK_START - $NEXT_TICK;
3931 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3932 warn "jitter $JITTER\n";#d#
3933 }
3509 }, 3934 }
3510); 3935}
3511 3936
3512{ 3937{
3938 # configure BDB
3939
3513 BDB::min_parallel 8; 3940 BDB::min_parallel 8;
3514 BDB::max_poll_time $TICK * 0.1; 3941 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 3942 $AnyEvent::BDB::WATCHER->priority (1);
3516 reentrant => 0,
3517 fd => BDB::poll_fileno,
3518 poll => 'r',
3519 prio => 0,
3520 data => WF_AUTOCANCEL,
3521 cb => \&BDB::poll_cb,
3522 );
3523
3524 BDB::set_sync_prepare {
3525 my $status;
3526 my $current = $Coro::current;
3527 (
3528 sub {
3529 $status = $!;
3530 $current->ready; undef $current;
3531 },
3532 sub {
3533 Coro::schedule while defined $current;
3534 $! = $status;
3535 },
3536 )
3537 };
3538 3943
3539 unless ($DB_ENV) { 3944 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 3945 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3946 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3542 | BDB::LOG_AUTOREMOVE, 1); 3947 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3948 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3949 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3950 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3951
3546 cf::sync_job { 3952 cf::sync_job {
3547 eval { 3953 eval {
3557 3963
3558 cf::cleanup "db_env_open(db): $@" if $@; 3964 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 3965 };
3560 } 3966 }
3561 3967
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 3968 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3969 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 ); 3970 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3971 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3972 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 3973 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 3974 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3975 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 3976 };
3592} 3977}
3593 3978
3594{ 3979{
3980 # configure IO::AIO
3981
3595 IO::AIO::min_parallel 8; 3982 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 3983 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 3984 undef $AnyEvent::AIO::WATCHER;
3600 reentrant => 0,
3601 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno,
3603 poll => 'r',
3604 prio => 6,
3605 cb => \&IO::AIO::poll_cb,
3606 );
3607} 3985}
3608 3986
3609my $_log_backtrace; 3987my $_log_backtrace;
3610 3988
3611sub _log_backtrace { 3989sub _log_backtrace {
3614 $msg =~ s/\n//; 3992 $msg =~ s/\n//;
3615 3993
3616 # limit the # of concurrent backtraces 3994 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 3995 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 3996 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg;
3619 async { 3998 async {
3999 $Coro::current->{desc} = "abt $msg";
4000
3620 my @bt = fork_call { 4001 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 4002 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 4005 or die "addr2line: $!";
3632 } 4013 }
3633 4014
3634 @funcs 4015 @funcs
3635 }; 4016 };
3636 4017
3637 LOG llevInfo, "[ABT] $msg\n"; 4018 LOG llevInfo, "[ABT] $perl_bt\n";
4019 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3638 LOG llevInfo, "[ABT] $_\n" for @bt; 4020 LOG llevInfo, "[ABT] $_\n" for @bt;
3639 --$_log_backtrace; 4021 --$_log_backtrace;
3640 }; 4022 };
3641 } else { 4023 } else {
3642 LOG llevInfo, "[ABT] $msg\n"; 4024 LOG llevInfo, "[ABT] $msg\n";
3643 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3644 } 4026 }
3645} 4027}
3646 4028
3647# load additional modules 4029# load additional modules
3648use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3649 4032
3650END { cf::emergency_save } 4033END { cf::emergency_save }
3651 4034
36521 40351
3653 4036

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines