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.278 by root, Mon Jun 11 21:38:14 2007 UTC vs.
Revision 1.464 by root, Thu Jan 1 18:35:48 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
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your 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 GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5; 56use Digest::MD5;
28use Fcntl; 57use Fcntl;
29use YAML::Syck (); 58use YAML ();
30use IO::AIO 2.32 (); 59use IO::AIO ();
31use Time::HiRes; 60use Time::HiRes;
32use Compress::LZF; 61use Compress::LZF;
62use Digest::MD5 ();
63
64AnyEvent::detect;
33 65
34# configure various modules to our taste 66# configure various modules to our taste
35# 67#
36$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 76
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 78
49our %COMMAND = (); 79our %COMMAND = ();
50our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
51 81
52our @EXTS = (); # list of extension package names 82our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 83our %EXTCMD = ();
84our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
56 87
57our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 89our @EVENT;
59 90
60our $CONFDIR = confdir; 91our $CONFDIR = confdir;
61our $DATADIR = datadir; 92our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
71 106
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 109our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
79 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 115our $DB_ENV;
82 116
83our %CFG; 117our %CFG;
84 118
85our $UPTIME; $UPTIME ||= time; 119our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 120our $RUNTIME;
121our $NOW;
87 122
88our %PLAYER; # all users 123our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 124our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 125our $LINK_MAP; # the special {link} map, which is always available
91 126
92# used to convert map paths into valid unix filenames by replacing / by ∕ 127# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 128our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 129
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
132our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
98 138
99binmode STDOUT; 139binmode STDOUT;
100binmode STDERR; 140binmode STDERR;
101 141
102# read virtual server time, if available 142# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
107} 147}
108 148
109mkdir $_ 149mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
155 195
156The raw value load value from the last tick. 196The raw value load value from the last tick.
157 197
158=item %cf::CFG 198=item %cf::CFG
159 199
160Configuration for the server, loaded from C</etc/crossfire/config>, or 200Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 201from wherever your confdir points to.
162 202
163=item cf::wait_for_tick, cf::wait_for_tick_begin 203=item cf::wait_for_tick, cf::wait_for_tick_begin
164 204
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 205These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 206returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 207per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 208
209=item @cf::INVOKE_RESULTS
210
211This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call.
214
169=back 215=back
170 216
171=cut 217=cut
172 218
173BEGIN { 219BEGIN {
… …
177 $msg .= "\n" 223 $msg .= "\n"
178 unless $msg =~ /\n$/; 224 unless $msg =~ /\n$/;
179 225
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 227
182 utf8::encode $msg;
183 LOG llevError, $msg; 228 LOG llevError, $msg;
184 }; 229 };
185} 230}
231
232$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "=="
234
235 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d#
238 }#d#
239
240 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate
243};
244
245$SIG{__DIE__} = sub { }; #d#?
186 246
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
197for my $pkg (qw( 257for my $pkg (qw(
198 cf::global cf::attachable 258 cf::global cf::attachable
199 cf::object cf::object::player 259 cf::object cf::object::player
200 cf::client cf::player 260 cf::client cf::player
201 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
202 cf::map cf::party cf::region 263 cf::party cf::region
203)) { 264)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 266}
207 267
208$Event::DIED = sub { 268$EV::DIED = sub {
209 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
210}; 270};
271
272#############################################################################
211 273
212=head2 UTILITY FUNCTIONS 274=head2 UTILITY FUNCTIONS
213 275
214=over 4 276=over 4
215 277
… …
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 296 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 297 $d
236 } || "[unable to dump $_[0]: '$@']"; 298 } || "[unable to dump $_[0]: '$@']";
237} 299}
238 300
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 301=item $ref = cf::decode_json $json
242 302
243Converts a JSON string into the corresponding perl data structure. 303Converts a JSON string into the corresponding perl data structure.
244 304
245=item $json = cf::to_json $ref 305=item $json = cf::encode_json $ref
246 306
247Converts a perl data structure into its JSON representation. 307Converts a perl data structure into its JSON representation.
248 308
309=cut
310
311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
312
313sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) }
315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
329
249=item cf::lock_wait $string 330=item cf::lock_wait $string
250 331
251Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
252 333
253=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
254 335
255Wait until the given lock is available and then acquires it and returns 336Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
258returned. 339returned.
259 340
341Locks are *not* recursive, locking from the same coro twice results in a
342deadlocked coro.
343
260Lock names should begin with a unique identifier (for example, cf::map::find 344Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 345uses map_find and cf::map::load uses map_load).
262 346
263=item $locked = cf::lock_active $string 347=item $locked = cf::lock_active $string
264 348
265Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
266 350
267=cut 351=cut
268 352
269our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
270 354
271sub lock_wait($) { 355sub lock_wait($) {
272 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
273
274 # wait for lock, if any
275 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule;
278 }
279} 357}
280 358
281sub lock_acquire($) { 359sub lock_acquire($) {
282 my ($key) = @_; 360 $LOCKS->guard ($_[0])
283
284 # wait, to be sure we are not locked
285 lock_wait $key;
286
287 $LOCK{$key} = [];
288
289 Coro::guard {
290 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} };
292 }
293} 361}
294 362
295sub lock_active($) { 363sub lock_active($) {
296 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
297
298 ! ! $LOCK{$key}
299} 365}
300 366
301sub freeze_mainloop { 367sub freeze_mainloop {
302 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
303 369
304 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
305 $TICK_WATCHER->start; 371}
372
373=item cf::periodic $interval, $cb
374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
386}
387
388=item cf::get_slot $time[, $priority[, $name]]
389
390Allocate $time seconds of blocking CPU time at priority C<$priority>:
391This call blocks and returns only when you have at least C<$time> seconds
392of cpu time till the next tick. The slot is only valid till the next cede.
393
394The optional C<$name> can be used to identify the job to run. It might be
395used for statistical purposes and should identify the same time-class.
396
397Useful for short background jobs.
398
399=cut
400
401our @SLOT_QUEUE;
402our $SLOT_QUEUE;
403
404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
408 my $signal = new Coro::Signal;
409
410 while () {
411 next_job:
412 my $avail = cf::till_tick;
413 if ($avail > 0.01) {
414 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) {
416 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send;
418 Coro::cede;
419 goto next_job;
420 }
421 }
422 }
423
424 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait;
428 } else {
429 Coro::schedule;
430 }
306 }; 431 }
307 $TICK_WATCHER->stop; 432};
308 $guard 433
434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
437 my ($time, $pri, $name) = @_;
438
439 $time = $TICK * .6 if $time > $TICK * .6;
440 my $sig = new Coro::Signal;
441
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready;
445 $sig->wait;
309} 446}
310 447
311=item cf::async { BLOCK } 448=item cf::async { BLOCK }
312 449
313Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
… …
318 455
319BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
320 457
321=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
322 459
323The design of crossfire+ requires that the main coro ($Coro::main) is 460The design of Deliantra requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 461is always able to handle events or runnable, as Deliantra is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
463acceptable.
326 464
327If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 467server will be frozen during this time, so the block should either finish
330fast or be very important. 468fast or be very important.
… …
333 471
334sub sync_job(&) { 472sub sync_job(&) {
335 my ($job) = @_; 473 my ($job) = @_;
336 474
337 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
338 my $time = Event::time; 476 my $time = EV::time;
339 477
340 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
342 480
343 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
344 # (but this is cancel-safe) 482
345 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
346 484
347 my $busy = 1; 485 my $busy = 1;
348 my @res; 486 my @res;
349 487
350 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 490 @res = eval { $job->() };
352 warn $@ if $@; 491 warn $@ if $@;
353 undef $busy; 492 undef $busy;
354 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
355 494
356 while ($busy) { 495 while ($busy) {
357 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
358 } 500 }
501 }
359 502
360 $time = Event::time - $time; 503 my $time = EV::time - $time;
361 504
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
366 506
367 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
368 } else { 508 } else {
369 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
370 510
… …
390 $EXT_CORO{$coro+0} = $coro; 530 $EXT_CORO{$coro+0} = $coro;
391 531
392 $coro 532 $coro
393} 533}
394 534
395sub write_runtime { 535=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 536
398 # first touch the runtime file to show we are still running: 537Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 538process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling.
400 541
401 IO::AIO::aio_utime $runtime, undef, undef; 542=cut
402 543
403 my $guard = cf::lock_acquire "write_runtime"; 544sub fork_call(&@) {
545 my ($cb, @args) = @_;
404 546
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 547 # we seemingly have to make a local copy of the whole thing,
406 or return; 548 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious)
407 550
408 my $value = $cf::RUNTIME + 90 + 10; 551 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 552 reset_signals;
410 # 60 allows for the watchdog to kill the server. 553 &$cb
554 }, @args;
411 555
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 556 wantarray ? @res : $res[-1]
413 and return; 557}
414 558
415 # always fsync - this file is important 559=item $coin = coin_from_name $name
416 aio_fsync $fh
417 and return;
418 560
419 # touch it again to show we are up-to-date 561=cut
420 aio_utime $fh, undef, undef;
421 562
422 close $fh 563our %coin_alias = (
423 or return; 564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
424 579
425 aio_rename "$runtime~", $runtime 580sub coin_from_name($) {
426 and return; 581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
584}
427 585
428 warn "runtime file written.\n"; 586=item $value = cf::db_get $family => $key
429 587
588Returns a single value from the environment database.
589
590=item cf::db_put $family => $key => $value
591
592Stores the given C<$value> in the family. It can currently store binary
593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
618
619our $DB;
620
621sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db";
624 };
625}
626
627sub db_get($$) {
628 my $key = "$_[0]/$_[1]";
629
630 cf::sync_job {
631 BDB::db_get $DB, undef, $key, my $data;
632
633 $! ? ()
634 : $data
430 1 635 }
636}
637
638sub db_put($$$) {
639 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
641}
642
643=item cf::cache $id => [$paths...], $processversion => $process
644
645Generic caching function that returns the value of the resource $id,
646caching and regenerating as required.
647
648This function can block.
649
650=cut
651
652sub cache {
653 my ($id, $src, $processversion, $process) = @_;
654
655 my $meta =
656 join "\x00",
657 $processversion,
658 map {
659 aio_stat $_
660 and Carp::croak "$_: $!";
661
662 ($_, (stat _)[7,9])
663 } @$src;
664
665 my $dbmeta = db_get cache => "$id/meta";
666 if ($dbmeta ne $meta) {
667 # changed, we may need to process
668
669 my @data;
670 my $md5;
671
672 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_]
674 or Carp::croak "$src->[$_]: $!";
675 }
676
677 # if processing is expensive, check
678 # checksum first
679 if (1) {
680 $md5 =
681 join "\x00",
682 $processversion,
683 map {
684 cf::cede_to_tick;
685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
686 } 0.. $#$src;
687
688
689 my $dbmd5 = db_get cache => "$id/md5";
690 if ($dbmd5 eq $md5) {
691 db_put cache => "$id/meta", $meta;
692
693 return db_get cache => "$id/data";
694 }
695 }
696
697 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time;
700
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
702
703 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta;
706
707 return $data;
708 }
709
710 db_get cache => "$id/data"
431} 711}
432 712
433=item cf::datalog type => key => value, ... 713=item cf::datalog type => key => value, ...
434 714
435Log a datalog packet of the given type with the given key-value pairs. 715Log a datalog packet of the given type with the given key-value pairs.
… …
447 727
448############################################################################# 728#############################################################################
449 729
450=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
451 731
452Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
453attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
455 735
456In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 738Deliantra).
459 739
460=over 4 740=over 4
461 741
462=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
463 743
… …
507=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
508 788
509Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
510given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
511 791
512Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
513that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
514 794
515These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
516 796
517=over 4 797=over 4
… …
665 _attach $registry, $klass, @attach; 945 _attach $registry, $klass, @attach;
666 } 946 }
667 947
668 $obj->{$name} = \%arg; 948 $obj->{$name} = \%arg;
669 } else { 949 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 950 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 951 }
672 952
673 $obj->{_attachment}{$name} = undef; 953 $obj->{_attachment}{$name} = undef;
674} 954}
675 955
… …
715 "; 995 ";
716 die if $@; 996 die if $@;
717} 997}
718 998
719our $override; 999our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1000our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 1001
722sub override { 1002sub override {
723 $override = 1; 1003 $override = 1;
724 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
725} 1005}
726 1006
727sub do_invoke { 1007sub do_invoke {
728 my $event = shift; 1008 my $event = shift;
729 my $callbacks = shift; 1009 my $callbacks = shift;
730 1010
731 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
732 1012
733 local $override; 1013 local $override;
734 1014
735 for (@$callbacks) { 1015 for (@$callbacks) {
736 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
… …
745 } 1025 }
746 1026
747 0 1027 0
748} 1028}
749 1029
750=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
751 1031
752=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
753 1033
754Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
755 1035
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1036This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 1037removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 1039
760=back 1040=back
761 1041
762=cut 1042=cut
763 1043
764############################################################################# 1044#############################################################################
765# object support 1045# object support
1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
1080sub _can_merge {
1081 my ($ob1, $ob2) = @_;
1082
1083 ++$SLOW_MERGES;#d#
1084
1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
1087}
766 1088
767sub reattach { 1089sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1091 my ($obj) = @_;
770 1092
1093 # no longer needed after getting rid of delete_package?
771 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
772 1095
773 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
774 1097
775 @$registry = (); 1098 @$registry = ();
776 1099
… …
791cf::attachable->attach ( 1114cf::attachable->attach (
792 prio => -1000000, 1115 prio => -1000000,
793 on_instantiate => sub { 1116 on_instantiate => sub {
794 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
795 1118
796 $data = from_json $data; 1119 $data = decode_json $data;
797 1120
798 for (@$data) { 1121 for (@$data) {
799 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
800 1123
801 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
… …
817sub object_freezer_save { 1140sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
819 1142
820 sync_job { 1143 sync_job {
821 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
824 1148
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1153 aio_close $fh;
830 1154
831 if (@$objs) { 1155 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1161 aio_close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
839 } 1163 }
840 } else { 1164 } else {
841 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
842 } 1166 }
843 1167
844 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
845 } else { 1172 } else {
846 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
847 } 1174 }
848 } else { 1175 } else {
849 aio_unlink $filename; 1176 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
851 } 1178 }
852 } 1179 };
853} 1180}
854 1181
855sub object_freezer_as_string { 1182sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1183 my ($rdata, $objs) = @_;
857 1184
… …
869 or return; 1196 or return;
870 1197
871 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
873 or return; 1200 or return;
1201
874 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
875 } 1204 }
876 1205
1206 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1209
879 return ($data, $av); 1210 ($data, $av)
880} 1211}
1212
1213=head2 COMMAND CALLBACKS
1214
1215=over 4
1216
1217=cut
881 1218
882############################################################################# 1219#############################################################################
883# command handling &c 1220# command handling &c
884 1221
885=item cf::register_command $name => \&callback($ob,$args); 1222=item cf::register_command $name => \&callback($ob,$args);
… …
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1235 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1236}
900 1237
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1238=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1239
903Register a callbackf ro execution when the client sends an extcmd packet. 1240Register a callback for execution when the client sends an (synchronous)
1241extcmd packet. Ext commands will be processed in the order they are
1242received by the server, like other user commands. The first argument is
1243the logged-in player. Ext commands can only be processed after a player
1244has logged in successfully.
904 1245
905If the callback returns something, it is sent back as if reply was being 1246If the callback returns something, it is sent back as if reply was being
906called. 1247called.
907 1248
1249=item cf::register_exticmd $name => \&callback($ns,$packet);
1250
1251Register a callback for execution when the client sends an (asynchronous)
1252exticmd packet. Exti commands are processed by the server as soon as they
1253are received, i.e. out of order w.r.t. other commands. The first argument
1254is a client socket. Exti commands can be received anytime, even before
1255log-in.
1256
1257If the callback returns something, it is sent back as if reply was being
1258called.
1259
908=cut 1260=cut
909 1261
910sub register_extcmd { 1262sub register_extcmd {
911 my ($name, $cb) = @_; 1263 my ($name, $cb) = @_;
912 1264
913 $EXTCMD{$name} = $cb; 1265 $EXTCMD{$name} = $cb;
914} 1266}
1267
1268sub register_exticmd {
1269 my ($name, $cb) = @_;
1270
1271 $EXTICMD{$name} = $cb;
1272}
1273
1274use File::Glob ();
915 1275
916cf::player->attach ( 1276cf::player->attach (
917 on_command => sub { 1277 on_command => sub {
918 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
919 1279
… …
927 cf::override; 1287 cf::override;
928 }, 1288 },
929 on_extcmd => sub { 1289 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1290 my ($pl, $buf) = @_;
931 1291
932 my $msg = eval { from_json $buf }; 1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1293
934 if (ref $msg) { 1294 if (ref $msg) {
1295 my ($type, $reply, @payload) =
1296 "ARRAY" eq ref $msg
1297 ? @$msg
1298 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1299
1300 my @reply;
1301
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1302 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1303 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1304 }
1305
1306 $pl->ext_reply ($reply, @reply)
1307 if $reply;
1308
940 } else { 1309 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1311 }
943 1312
944 cf::override; 1313 cf::override;
945 }, 1314 },
946); 1315);
1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
947 1329
948sub load_extensions { 1330sub load_extensions {
949 cf::sync_job { 1331 cf::sync_job {
950 my %todo; 1332 my %todo;
951 1333
… …
967 path => $path, 1349 path => $path,
968 base => $base, 1350 base => $base,
969 pkg => $pkg, 1351 pkg => $pkg,
970 ); 1352 );
971 1353
972 $ext{meta} = { map { split /=/, $_, 2 } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /^#!.*?perl.*?#\s*(.*)$/; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974 1356
975 $ext{source} = 1357 $ext{source} =
976 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
978 . $source 1360 . $source
979 . "\n};\n1"; 1361 . "\n};\n1";
980 1362
981 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
… …
984 my %done; 1366 my %done;
985 while (%todo) { 1367 while (%todo) {
986 my $progress; 1368 my $progress;
987 1369
988 while (my ($k, $v) = each %todo) { 1370 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $ext{meta}{depends}) { 1371 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip 1372 goto skip
991 unless exists $done{$_}; 1373 unless exists $done{$_};
992 } 1374 }
993 1375
994 warn "... loading '$k' into '$v->{pkg}'\n"; 1376 warn "... loading '$k' into '$v->{pkg}'\n";
995 1377
996 unless (eval $v->{source}) { 1378 unless (eval $v->{source}) {
997 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
998 : "extension disabled.\n"; 1380 : "$v->{base}: extension inactive.\n";
999 1381
1000 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1001 warn $msg; 1383 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1003 exit 1;
1004 } 1385 }
1005 1386
1006 die $msg; 1387 warn $msg;
1007 } 1388 }
1008 1389
1009 $done{$k} = delete $todo{$k}; 1390 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg}; 1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1011 } 1393 }
1012 1394
1013 skip: 1395 skip:
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1015 unless $progress; 1397 unless $progress;
… …
1017 }; 1399 };
1018} 1400}
1019 1401
1020############################################################################# 1402#############################################################################
1021 1403
1404=back
1405
1022=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1023 1407
1024Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1025 1409
1026=cut 1410=cut
1027 1411
1028package cf::player; 1412package cf::player;
1029 1413
1030use Coro::AIO; 1414use Coro::AIO;
1031 1415
1032=head3 cf::player 1416=head3 cf::player
1033 1417
1034=over 4 1418=over 4
1419
1420=item cf::player::num_playing
1421
1422Returns the official number of playing players, as per the Crossfire metaserver rules.
1423
1424=cut
1425
1426sub num_playing {
1427 scalar grep
1428 $_->ob->map
1429 && !$_->hidden
1430 && !$_->ob->flag (cf::FLAG_WIZ),
1431 cf::player::list
1432}
1035 1433
1036=item cf::player::find $login 1434=item cf::player::find $login
1037 1435
1038Returns the given player object, loading it if necessary (might block). 1436Returns the given player object, loading it if necessary (might block).
1039 1437
… …
1058 1456
1059sub exists($) { 1457sub exists($) {
1060 my ($login) = @_; 1458 my ($login) = @_;
1061 1459
1062 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1063 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1064} 1462}
1065 1463
1066sub find($) { 1464sub find($) {
1067 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1068 my $login = $_[0]; 1466 my $login = $_[0];
… …
1075 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1473 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1076 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1474 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1077 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1475 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1078 aio_unlink +(playerdir $login) . "/$login.pl"; 1476 aio_unlink +(playerdir $login) . "/$login.pl";
1079 1477
1080 my $pl = load_pl path $login 1478 my $f = new_from_file cf::object::thawer path $login
1081 or return; 1479 or return;
1480
1481 my $pl = cf::player::load_pl $f
1482 or return;
1483
1484 local $cf::PLAYER_LOADING{$login} = $pl;
1485 $f->resolve_delayed_derefs;
1082 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1083 } 1487 }
1084 } 1488 }
1085} 1489}
1086 1490
… …
1095 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1096 1500
1097 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1098 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1099 1503
1504 cf::get_slot 0.01;
1505
1100 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1101 Coro::cede; 1507 cf::cede_to_tick;
1102} 1508}
1103 1509
1104sub new($) { 1510sub new($) {
1105 my ($login) = @_; 1511 my ($login) = @_;
1106 1512
… …
1112 $cf::PLAYER{$login} = $self; 1518 $cf::PLAYER{$login} = $self;
1113 1519
1114 $self 1520 $self
1115} 1521}
1116 1522
1523=item $player->send_msg ($channel, $msg, $color, [extra...])
1524
1525=cut
1526
1527sub send_msg {
1528 my $ns = shift->ns
1529 or return;
1530 $ns->send_msg (@_);
1531}
1532
1117=item $pl->quit_character 1533=item $pl->quit_character
1118 1534
1119Nukes the player without looking back. If logged in, the connection will 1535Nukes the player without looking back. If logged in, the connection will
1120be destroyed. May block for a long time. 1536be destroyed. May block for a long time.
1121 1537
… …
1125 my ($pl) = @_; 1541 my ($pl) = @_;
1126 1542
1127 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1128 1544
1129 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1130 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1131 1547
1132 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1133 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1134 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1135 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1136 1554
1137 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1138 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1174 or return []; 1592 or return [];
1175 1593
1176 my @logins; 1594 my @logins;
1177 1595
1178 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1597 my $path = path $login;
1598
1599 # a .pst is a dead give-away for a valid player
1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1179 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1180 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1181 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1605 }
1182 1606
1183 utf8::decode $login; 1607 utf8::decode $login;
1184 push @logins, $login; 1608 push @logins, $login;
1185 } 1609 }
1186 1610
… …
1213 } 1637 }
1214 1638
1215 \@paths 1639 \@paths
1216} 1640}
1217 1641
1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1643
1644Expand deliantra pod fragments into protocol xml.
1645
1218=item $player->ext_reply ($msgid, %msg) 1646=item $player->ext_reply ($msgid, @msg)
1219 1647
1220Sends an ext reply to the player. 1648Sends an ext reply to the player.
1221 1649
1222=cut 1650=cut
1223 1651
1224sub ext_reply($$%) { 1652sub ext_reply($$@) {
1225 my ($self, $id, %msg) = @_; 1653 my ($self, $id, @msg) = @_;
1226 1654
1227 $msg{msgid} = $id; 1655 $self->ns->ext_reply ($id, @msg)
1228
1229 $self->send ("ext " . cf::to_json \%msg);
1230} 1656}
1231 1657
1232=item $player->ext_event ($type, %msg) 1658=item $player->ext_msg ($type, @msg)
1233 1659
1234Sends an ext event to the client. 1660Sends an ext event to the client.
1235 1661
1236=cut 1662=cut
1237 1663
1238sub ext_event($$%) { 1664sub ext_msg($$@) {
1239 my ($self, $type, %msg) = @_; 1665 my ($self, $type, @msg) = @_;
1240 1666
1241 $self->ns->ext_event ($type, %msg); 1667 $self->ns->ext_msg ($type, @msg);
1242} 1668}
1243 1669
1244=head3 cf::region 1670=head3 cf::region
1245 1671
1246=over 4 1672=over 4
… …
1249 1675
1250package cf::region; 1676package cf::region;
1251 1677
1252=item cf::region::find_by_path $path 1678=item cf::region::find_by_path $path
1253 1679
1254Tries to decuce the probable region for a map knowing only its path. 1680Tries to decuce the likely region for a map knowing only its path.
1255 1681
1256=cut 1682=cut
1257 1683
1258sub find_by_path($) { 1684sub find_by_path($) {
1259 my ($path) = @_; 1685 my ($path) = @_;
1260 1686
1261 my ($match, $specificity); 1687 my ($match, $specificity);
1262 1688
1263 for my $region (list) { 1689 for my $region (list) {
1264 if ($region->match && $path =~ $region->match) { 1690 if ($region->{match} && $path =~ $region->{match}) {
1265 ($match, $specificity) = ($region, $region->specificity) 1691 ($match, $specificity) = ($region, $region->specificity)
1266 if $region->specificity > $specificity; 1692 if $region->specificity > $specificity;
1267 } 1693 }
1268 } 1694 }
1269 1695
… …
1290our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1291our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1292 1718
1293sub generate_random_map { 1719sub generate_random_map {
1294 my ($self, $rmp) = @_; 1720 my ($self, $rmp) = @_;
1721
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723
1295 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1296 $self->_create_random_map ( 1725 $self->_create_random_map (
1297 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1298 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1299 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1389 $self->init; # pass $1 etc. 1818 $self->init; # pass $1 etc.
1390 return $self; 1819 return $self;
1391 } 1820 }
1392 } 1821 }
1393 1822
1394 Carp::carp "unable to resolve path '$path' (base '$base')."; 1823 Carp::cluck "unable to resolve path '$path' (base '$base').";
1395 () 1824 ()
1396} 1825}
1397 1826
1398sub init { 1827sub init {
1399 my ($self) = @_; 1828 my ($self) = @_;
… …
1421 1850
1422# the temporary/swap location 1851# the temporary/swap location
1423sub save_path { 1852sub save_path {
1424 my ($self) = @_; 1853 my ($self) = @_;
1425 1854
1426 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1427 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1428} 1857}
1429 1858
1430# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1431sub uniq_path { 1860sub uniq_path {
1432 my ($self) = @_; 1861 my ($self) = @_;
1433 1862
1434 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1435 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1436}
1437
1438# and all this just because we cannot iterate over
1439# all maps in C++...
1440sub change_all_map_light {
1441 my ($change) = @_;
1442
1443 $_->change_map_light ($change)
1444 for grep $_->outdoor, values %cf::MAP;
1445} 1865}
1446 1866
1447sub decay_objects { 1867sub decay_objects {
1448 my ($self) = @_; 1868 my ($self) = @_;
1449 1869
… …
1462 1882
1463sub load_header_from($) { 1883sub load_header_from($) {
1464 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1465 1885
1466 utf8::encode $path; 1886 utf8::encode $path;
1467 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1468 # or return;
1469
1470 $self->_load_header ($path)
1471 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1472 1895
1473 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1474 1897
1475 1 1898 1
1476} 1899}
… …
1530sub find { 1953sub find {
1531 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1532 1955
1533 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1534 1957
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1535 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1536 1960
1537 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1538 my $guard = cf::lock_acquire "map_find:$path";
1539 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1540 or return; 1963 or return;
1541 1964
1542 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1543 1966
… …
1545 or return; 1968 or return;
1546 1969
1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1548 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1549 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1974 undef $guard1;
1550 $map->reset; 1975 $map->reset;
1551 undef $guard;
1552 return find $path; 1976 return find $path;
1553 } 1977 }
1554 1978
1555 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1556 } 1980 }
… …
1565 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1566 1990
1567 my $path = $self->{path}; 1991 my $path = $self->{path};
1568 1992
1569 { 1993 {
1570 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1571 1995
1996 return unless $self->valid;
1572 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1573 1998
1574 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1575 2000
1576 $self->alloc; 2001 $self->alloc;
1577 2002
1578 $self->pre_load; 2003 $self->pre_load;
1579 Coro::cede; 2004 cf::cede_to_tick;
1580 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1581 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1582 or return; 2009 or return;
1583 2010
1584 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1585 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1586 2013
1587 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1588 utf8::encode $uniq; 2015 utf8::encode $uniq;
1589 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1590 $self->clear_unique_items; 2018 $self->clear_unique_items;
1591 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1592 } 2022 }
1593 } 2023 }
1594 2024
1595 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1596 # now do the right thing for maps 2028 # now do the right thing for maps
1597 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1598 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1599 unless $self->difficulty; 2031 unless $self->difficulty;
1600 Coro::cede; 2032 cf::cede_to_tick;
1601 2033
1602 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1603 $self->decay_objects; 2035 $self->decay_objects;
1604 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1605 $self->update_buttons; 2037 $self->update_buttons;
1606 Coro::cede; 2038 cf::cede_to_tick;
1607 $self->set_darkness_map;
1608 Coro::cede;
1609 $self->activate; 2039 $self->activate;
1610 } 2040 }
1611 2041
2042 $self->{last_save} = $cf::RUNTIME;
2043 $self->last_access ($cf::RUNTIME);
2044
1612 $self->in_memory (cf::MAP_IN_MEMORY); 2045 $self->in_memory (cf::MAP_ACTIVE);
1613 } 2046 }
1614 2047
1615 $self->post_load; 2048 $self->post_load;
1616} 2049}
1617 2050
… …
1626 2059
1627 $self 2060 $self
1628} 2061}
1629 2062
1630# find and load all maps in the 3x3 area around a map 2063# find and load all maps in the 3x3 area around a map
1631sub load_diag { 2064sub load_neighbours {
1632 my ($map) = @_; 2065 my ($map) = @_;
1633 2066
1634 my @diag; # diagonal neighbours 2067 my @neigh; # diagonal neighbours
1635 2068
1636 for (0 .. 3) { 2069 for (0 .. 3) {
1637 my $neigh = $map->tile_path ($_) 2070 my $neigh = $map->tile_path ($_)
1638 or next; 2071 or next;
1639 $neigh = find $neigh, $map 2072 $neigh = find $neigh, $map
1640 or next; 2073 or next;
1641 $neigh->load; 2074 $neigh->load;
1642 2075
2076 push @neigh,
1643 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2077 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1644 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2078 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1645 } 2079 }
1646 2080
1647 for (@diag) { 2081 for (grep defined $_->[0], @neigh) {
2082 my ($path, $origin) = @$_;
1648 my $neigh = find @$_ 2083 my $neigh = find $path, $origin
1649 or next; 2084 or next;
1650 $neigh->load; 2085 $neigh->load;
1651 } 2086 }
1652} 2087}
1653 2088
… …
1658} 2093}
1659 2094
1660sub do_load_sync { 2095sub do_load_sync {
1661 my ($map) = @_; 2096 my ($map) = @_;
1662 2097
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main;
2100
1663 cf::sync_job { $map->load }; 2101 cf::sync_job { $map->load };
1664} 2102}
1665 2103
1666our %MAP_PREFETCH; 2104our %MAP_PREFETCH;
1667our $MAP_PREFETCHER = undef; 2105our $MAP_PREFETCHER = undef;
1668 2106
1669sub find_async { 2107sub find_async {
1670 my ($path, $origin) = @_; 2108 my ($path, $origin, $load) = @_;
1671 2109
1672 $path = normalise $path, $origin && $origin->{path}; 2110 $path = normalise $path, $origin && $origin->{path};
1673 2111
1674 if (my $map = $cf::MAP{$path}) { 2112 if (my $map = $cf::MAP{$path}) {
1675 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1676 } 2114 }
1677 2115
1678 undef $MAP_PREFETCH{$path}; 2116 $MAP_PREFETCH{$path} |= $load;
2117
1679 $MAP_PREFETCHER ||= cf::async { 2118 $MAP_PREFETCHER ||= cf::async {
2119 $Coro::current->{desc} = "map prefetcher";
2120
1680 while (%MAP_PREFETCH) { 2121 while (%MAP_PREFETCH) {
1681 for my $path (keys %MAP_PREFETCH) { 2122 while (my ($k, $v) = each %MAP_PREFETCH) {
1682 my $map = find $path 2123 if (my $map = find $k) {
1683 or next;
1684 $map->load; 2124 $map->load if $v;
2125 }
1685 2126
1686 delete $MAP_PREFETCH{$path}; 2127 delete $MAP_PREFETCH{$k};
1687 } 2128 }
1688 } 2129 }
1689 undef $MAP_PREFETCHER; 2130 undef $MAP_PREFETCHER;
1690 }; 2131 };
1691 $MAP_PREFETCHER->prio (6); 2132 $MAP_PREFETCHER->prio (6);
… …
1694} 2135}
1695 2136
1696sub save { 2137sub save {
1697 my ($self) = @_; 2138 my ($self) = @_;
1698 2139
1699 my $lock = cf::lock_acquire "map_data:" . $self->path; 2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
1700 2141
1701 $self->{last_save} = $cf::RUNTIME; 2142 $self->{last_save} = $cf::RUNTIME;
1702 2143
1703 return unless $self->dirty; 2144 return unless $self->dirty;
1704 2145
… …
1710 return if $self->{deny_save}; 2151 return if $self->{deny_save};
1711 2152
1712 local $self->{last_access} = $self->last_access;#d# 2153 local $self->{last_access} = $self->last_access;#d#
1713 2154
1714 cf::async { 2155 cf::async {
2156 $Coro::current->{desc} = "map player save";
1715 $_->contr->save for $self->players; 2157 $_->contr->save for $self->players;
1716 }; 2158 };
2159
2160 cf::get_slot 0.02;
1717 2161
1718 if ($uniq) { 2162 if ($uniq) {
1719 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1720 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2164 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1721 } else { 2165 } else {
… …
1727 my ($self) = @_; 2171 my ($self) = @_;
1728 2172
1729 # save first because save cedes 2173 # save first because save cedes
1730 $self->save; 2174 $self->save;
1731 2175
1732 my $lock = cf::lock_acquire "map_data:" . $self->path; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
1733 2177
1734 return if $self->players; 2178 return if $self->players;
1735 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_ACTIVE;
1736 return if $self->{deny_save}; 2180 return if $self->{deny_save};
1737 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
1738 $self->clear; 2186 $self->clear;
1739 $self->in_memory (cf::MAP_SWAPPED);
1740} 2187}
1741 2188
1742sub reset_at { 2189sub reset_at {
1743 my ($self) = @_; 2190 my ($self) = @_;
1744 2191
… …
1776 if $uniq; 2223 if $uniq;
1777 } 2224 }
1778 2225
1779 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
1780 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
1781 $self->clear; 2230 $self->clear;
1782
1783 $_->clear_links_to ($self) for values %cf::MAP;
1784 2231
1785 $self->unlink_save; 2232 $self->unlink_save;
1786 $self->destroy; 2233 $self->destroy;
1787} 2234}
1788 2235
1789my $nuke_counter = "aaaa"; 2236my $nuke_counter = "aaaa";
1790 2237
1791sub nuke { 2238sub nuke {
1792 my ($self) = @_; 2239 my ($self) = @_;
1793 2240
2241 {
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
1794 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
1795 2245
1796 $self->unlink_save; 2246 $self->unlink_save;
1797 2247
1798 bless $self, "cf::map"; 2248 bless $self, "cf::map";
1799 delete $self->{deny_reset}; 2249 delete $self->{deny_reset};
1800 $self->{deny_save} = 1; 2250 $self->{deny_save} = 1;
1801 $self->reset_timeout (1); 2251 $self->reset_timeout (1);
1802 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1803 2253
1804 $cf::MAP{$self->path} = $self; 2254 $cf::MAP{$self->path} = $self;
2255 }
1805 2256
1806 $self->reset; # polite request, might not happen 2257 $self->reset; # polite request, might not happen
1807} 2258}
1808 2259
1809=item $maps = cf::map::tmp_maps 2260=item $maps = cf::map::tmp_maps
… …
1851 2302
1852sub unique_maps() { 2303sub unique_maps() {
1853 [ 2304 [
1854 map { 2305 map {
1855 utf8::decode $_; 2306 utf8::decode $_;
1856 /\.map$/ 2307 s/\.map$//; # TODO future compatibility hack
2308 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2309 ? ()
1857 ? normalise $_ 2310 : normalise $_
1858 : ()
1859 } @{ aio_readdir $UNIQUEDIR or [] } 2311 } @{ aio_readdir $UNIQUEDIR or [] }
1860 ] 2312 ]
1861} 2313}
1862 2314
1863package cf;
1864
1865=back 2315=back
1866 2316
1867=head3 cf::object 2317=head3 cf::object
1868 2318
1869=cut 2319=cut
… …
1872 2322
1873=over 4 2323=over 4
1874 2324
1875=item $ob->inv_recursive 2325=item $ob->inv_recursive
1876 2326
1877Returns the inventory of the object _and_ their inventories, recursively. 2327Returns the inventory of the object I<and> their inventories, recursively,
2328but I<not> the object itself.
1878 2329
1879=cut 2330=cut
1880 2331
1881sub inv_recursive_; 2332sub inv_recursive_;
1882sub inv_recursive_ { 2333sub inv_recursive_ {
… …
1885 2336
1886sub inv_recursive { 2337sub inv_recursive {
1887 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
1888} 2339}
1889 2340
2341=item $ref = $ob->ref
2342
2343Creates and returns a persistent reference to an object that can be stored as a string.
2344
2345=item $ob = cf::object::deref ($refstring)
2346
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block.
2349
2350=cut
2351
2352sub deref {
2353 my ($ref) = @_;
2354
2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2356 my ($uuid, $name) = ($1, $2);
2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2358 or return;
2359 $pl->ob->uuid eq $uuid
2360 or return;
2361
2362 $pl->ob
2363 } else {
2364 warn "$ref: cannot resolve object reference\n";
2365 undef
2366 }
2367}
2368
1890package cf; 2369package cf;
1891 2370
1892=back 2371=back
1893 2372
1894=head3 cf::object::player 2373=head3 cf::object::player
… …
1900Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2379Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1901can be C<undef>. Does the right thing when the player is currently in a 2380can be C<undef>. Does the right thing when the player is currently in a
1902dialogue with the given NPC character. 2381dialogue with the given NPC character.
1903 2382
1904=cut 2383=cut
2384
2385our $SAY_CHANNEL = {
2386 id => "say",
2387 title => "Map",
2388 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2390};
2391
2392our $CHAT_CHANNEL = {
2393 id => "chat",
2394 title => "Chat",
2395 reply => "chat ",
2396 tooltip => "Player chat and shouts, global to the server.",
2397};
1905 2398
1906# rough implementation of a future "reply" method that works 2399# rough implementation of a future "reply" method that works
1907# with dialog boxes. 2400# with dialog boxes.
1908#TODO: the first argument must go, split into a $npc->reply_to ( method 2401#TODO: the first argument must go, split into a $npc->reply_to ( method
1909sub cf::object::player::reply($$$;$) { 2402sub cf::object::player::reply($$$;$) {
… …
1911 2404
1912 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2405 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1913 2406
1914 if ($self->{record_replies}) { 2407 if ($self->{record_replies}) {
1915 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2408 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2409
1916 } else { 2410 } else {
2411 my $pl = $self->contr;
2412
2413 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2414 my $dialog = $pl->{npc_dialog};
2415 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2416
2417 } else {
1917 $msg = $npc->name . " says: $msg" if $npc; 2418 $msg = $npc->name . " says: $msg" if $npc;
1918 $self->message ($msg, $flags); 2419 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2420 }
1919 } 2421 }
2422}
2423
2424=item $object->send_msg ($channel, $msg, $color, [extra...])
2425
2426=cut
2427
2428sub cf::object::send_msg {
2429 my $pl = shift->contr
2430 or return;
2431 $pl->send_msg (@_);
1920} 2432}
1921 2433
1922=item $player_object->may ("access") 2434=item $player_object->may ("access")
1923 2435
1924Returns wether the given player is authorized to access resource "access" 2436Returns wether the given player is authorized to access resource "access"
… …
1937 2449
1938=item $player_object->enter_link 2450=item $player_object->enter_link
1939 2451
1940Freezes the player and moves him/her to a special map (C<{link}>). 2452Freezes the player and moves him/her to a special map (C<{link}>).
1941 2453
1942The player should be reasonably safe there for short amounts of time. You 2454The player should be reasonably safe there for short amounts of time (e.g.
1943I<MUST> call C<leave_link> as soon as possible, though. 2455for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link
2457map.
1944 2458
1945Will never block. 2459Will never block.
1946 2460
1947=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
1948 2462
… …
2003 # use -1 or undef as default coordinates, not 0, 0 2517 # use -1 or undef as default coordinates, not 0, 0
2004 ($x, $y) = ($map->enter_x, $map->enter_y) 2518 ($x, $y) = ($map->enter_x, $map->enter_y)
2005 if $x <=0 && $y <= 0; 2519 if $x <=0 && $y <= 0;
2006 2520
2007 $map->load; 2521 $map->load;
2008 $map->load_diag; 2522 $map->load_neighbours;
2009 2523
2010 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2011 $self->activate_recursive; 2526 $self->activate_recursive;
2012 2527
2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2014 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2015} 2530}
2016 2531
2017=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2018 2533
2019Moves the player to the given map-path and coordinates by first freezing 2534Moves the player to the given map-path and coordinates by first freezing
2020her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2021that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
2022the new (success) or old (failed) map position. 2537the new (success) or old (failed) map position. In either case, $done will
2538be called at the end of this process.
2539
2540Note that $check will be called with a potentially non-loaded map, so if
2541it needs a loaded map it has to call C<< ->load >>.
2023 2542
2024=cut 2543=cut
2025 2544
2026our $GOTOGEN; 2545our $GOTOGEN;
2027 2546
2028sub cf::object::player::goto { 2547sub cf::object::player::goto {
2029 my ($self, $path, $x, $y, $check) = @_; 2548 my ($self, $path, $x, $y, $check, $done) = @_;
2030 2549
2031 # do generation counting so two concurrent goto's will be executed in-order 2550 # do generation counting so two concurrent goto's will be executed in-order
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2033 2552
2034 $self->enter_link; 2553 $self->enter_link;
2035 2554
2036 (async { 2555 (async {
2556 $Coro::current->{desc} = "player::goto $path $x $y";
2557
2558 # *tag paths override both path and x|y
2559 if ($path =~ /^\*(.*)$/) {
2560 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2561 my $ob = $obs[rand @obs];
2562
2563 # see if we actually can go there
2564 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2565 $ob = $obs[rand @obs];
2566 } else {
2567 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2568 }
2569 # else put us there anyways for now #d#
2570
2571 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2572 } else {
2573 ($path, $x, $y) = (undef, undef, undef);
2574 }
2575 }
2576
2037 my $map = eval { 2577 my $map = eval {
2038 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2039 2579
2040 if ($map) { 2580 if ($map) {
2041 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2042 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2043 } else { 2583 } else {
2044 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2045 } 2585 }
2046 2586
2047 $map 2587 $map
2048 }; 2588 };
2049 2589
… …
2054 2594
2055 if ($gen == $self->{_goto_generation}) { 2595 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation}; 2596 delete $self->{_goto_generation};
2057 $self->leave_link ($map, $x, $y); 2597 $self->leave_link ($map, $x, $y);
2058 } 2598 }
2599
2600 $done->() if $done;
2059 })->prio (1); 2601 })->prio (1);
2060} 2602}
2061 2603
2062=item $player_object->enter_exit ($exit_object) 2604=item $player_object->enter_exit ($exit_object)
2063 2605
… …
2083} 2625}
2084 2626
2085sub prepare_random_map { 2627sub prepare_random_map {
2086 my ($exit) = @_; 2628 my ($exit) = @_;
2087 2629
2088 my $guard = cf::lock_acquire "exit_prepare:$exit";
2089
2090 # all this does is basically replace the /! path by 2630 # all this does is basically replace the /! path by
2091 # a new random map path (?random/...) with a seed 2631 # a new random map path (?random/...) with a seed
2092 # that depends on the exit object 2632 # that depends on the exit object
2093 2633
2094 my $rmp = parse_random_map_params $exit->msg; 2634 my $rmp = parse_random_map_params $exit->msg;
… …
2096 if ($exit->map) { 2636 if ($exit->map) {
2097 $rmp->{region} = $exit->region->name; 2637 $rmp->{region} = $exit->region->name;
2098 $rmp->{origin_map} = $exit->map->path; 2638 $rmp->{origin_map} = $exit->map->path;
2099 $rmp->{origin_x} = $exit->x; 2639 $rmp->{origin_x} = $exit->x;
2100 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2641
2642 $exit->map->touch;
2101 } 2643 }
2102 2644
2103 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2104 2646
2105 my $data = cf::to_json $rmp; 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2106 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2107 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2108 2650
2109 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2110 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2111 undef $fh; 2653 undef $fh;
2112 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
2113 2655
2656 my $slaying = "?random/$md5";
2657
2658 if ($exit->valid) {
2114 $exit->slaying ("?random/$md5"); 2659 $exit->slaying ("?random/$md5");
2115 $exit->msg (undef); 2660 $exit->msg (undef);
2661 }
2116 } 2662 }
2117} 2663}
2118 2664
2119sub cf::object::player::enter_exit { 2665sub cf::object::player::enter_exit {
2120 my ($self, $exit) = @_; 2666 my ($self, $exit) = @_;
2121 2667
2122 return unless $self->type == cf::PLAYER; 2668 return unless $self->type == cf::PLAYER;
2123 2669
2124 if ($exit->slaying eq "/!") {
2125 #TODO: this should de-fi-ni-te-ly not be a sync-job
2126 # the problem is that $exit might not survive long enough
2127 # so it needs to be done right now, right here
2128 cf::sync_job { prepare_random_map $exit };
2129 }
2130
2131 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2132 my $hp = $exit->stats->hp;
2133 my $sp = $exit->stats->sp;
2134
2135 $self->enter_link; 2670 $self->enter_link;
2136 2671
2137 (async { 2672 (async {
2138 $self->deactivate_recursive; # just to be sure 2673 $Coro::current->{desc} = "enter_exit";
2674
2139 unless (eval { 2675 unless (eval {
2676 $self->deactivate_recursive; # just to be sure
2677
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2687 my $x = $exit->stats->hp;
2688 my $y = $exit->stats->sp;
2689
2140 $self->goto ($slaying, $hp, $sp); 2690 $self->goto ($map, $x, $y);
2141 2691
2692 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y)
2694 if $exit->flag (cf::FLAG_DAMNED);
2695
2142 1; 2696 1
2143 }) { 2697 }) {
2144 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2145 . "I'll try to bring you back to the map you were before. " 2699 . "I'll try to bring you back to the map you were before. "
2146 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2147 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2148 2702
2149 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
… …
2168 2722
2169 utf8::encode $text; 2723 utf8::encode $text;
2170 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2171} 2725}
2172 2726
2727=item $client->send_msg ($channel, $msg, $color, [extra...])
2728
2729Send a drawinfo or msg packet to the client, formatting the msg for the
2730client if neccessary. C<$type> should be a string identifying the type of
2731the message, with C<log> being the default. If C<$color> is negative, suppress
2732the message unless the client supports the msg packet.
2733
2734=cut
2735
2736# non-persistent channels (usually the info channel)
2737our %CHANNEL = (
2738 "c/identify" => {
2739 id => "infobox",
2740 title => "Identify",
2741 reply => undef,
2742 tooltip => "Items recently identified",
2743 },
2744 "c/examine" => {
2745 id => "infobox",
2746 title => "Examine",
2747 reply => undef,
2748 tooltip => "Signs and other items you examined",
2749 },
2750 "c/book" => {
2751 id => "infobox",
2752 title => "Book",
2753 reply => undef,
2754 tooltip => "The contents of a note or book",
2755 },
2756 "c/lookat" => {
2757 id => "infobox",
2758 title => "Look",
2759 reply => undef,
2760 tooltip => "What you saw there",
2761 },
2762 "c/who" => {
2763 id => "infobox",
2764 title => "Players",
2765 reply => undef,
2766 tooltip => "Shows players who are currently online",
2767 },
2768 "c/body" => {
2769 id => "infobox",
2770 title => "Body Parts",
2771 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available",
2773 },
2774 "c/skills" => {
2775 id => "infobox",
2776 title => "Skills",
2777 reply => undef,
2778 tooltip => "Shows your experience per skill and item power",
2779 },
2780 "c/uptime" => {
2781 id => "infobox",
2782 title => "Uptime",
2783 reply => undef,
2784 tooltip => "How long the server has been running since last restart",
2785 },
2786 "c/mapinfo" => {
2787 id => "infobox",
2788 title => "Map Info",
2789 reply => undef,
2790 tooltip => "Information related to the maps",
2791 },
2792 "c/party" => {
2793 id => "party",
2794 title => "Party",
2795 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party",
2797 },
2798 "c/death" => {
2799 id => "death",
2800 title => "Death",
2801 reply => undef,
2802 tooltip => "Reason for and more info about your most recent death",
2803 },
2804 "c/say" => $SAY_CHANNEL,
2805 "c/chat" => $CHAT_CHANNEL,
2806);
2807
2808sub cf::client::send_msg {
2809 my ($self, $channel, $msg, $color, @extra) = @_;
2810
2811 $msg = $self->pl->expand_cfpod ($msg)
2812 unless $color & cf::NDI_VERBATIM;
2813
2814 $color &= cf::NDI_CLIENT_MASK; # just in case...
2815
2816 # check predefined channels, for the benefit of C
2817 if ($CHANNEL{$channel}) {
2818 $channel = $CHANNEL{$channel};
2819
2820 $self->ext_msg (channel_info => $channel);
2821 $channel = $channel->{id};
2822
2823 } elsif (ref $channel) {
2824 # send meta info to client, if not yet sent
2825 unless (exists $self->{channel}{$channel->{id}}) {
2826 $self->{channel}{$channel->{id}} = $channel;
2827 $self->ext_msg (channel_info => $channel);
2828 }
2829
2830 $channel = $channel->{id};
2831 }
2832
2833 return unless @extra || length $msg;
2834
2835 # default colour, mask it out
2836 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2837 if $color & cf::NDI_DEF;
2838
2839 my $pkt = "msg "
2840 . $self->{json_coder}->encode (
2841 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2842 );
2843
2844 # try lzf for large packets
2845 $pkt = "lzf " . Compress::LZF::compress $pkt
2846 if 1024 <= length $pkt and $self->{can_lzf};
2847
2848 # split very large packets
2849 if (8192 < length $pkt and $self->{can_lzf}) {
2850 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2851 $pkt = "frag";
2852 }
2853
2854 $self->send_packet ($pkt);
2855}
2856
2173=item $client->ext_event ($type, %msg) 2857=item $client->ext_msg ($type, @msg)
2174 2858
2175Sends an exti event to the client. 2859Sends an ext event to the client.
2176 2860
2177=cut 2861=cut
2178 2862
2179sub cf::client::ext_event($$%) { 2863sub cf::client::ext_msg($$@) {
2180 my ($self, $type, %msg) = @_; 2864 my ($self, $type, @msg) = @_;
2181 2865
2866 if ($self->extcmd == 2) {
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2868 } elsif ($self->extcmd == 1) { # TODO: remove
2182 $msg{msgtype} = "event_$type"; 2869 push @msg, msgtype => "event_$type";
2183 $self->send_packet ("ext " . cf::to_json \%msg); 2870 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2871 }
2872}
2873
2874=item $client->ext_reply ($msgid, @msg)
2875
2876Sends an ext reply to the client.
2877
2878=cut
2879
2880sub cf::client::ext_reply($$@) {
2881 my ($self, $id, @msg) = @_;
2882
2883 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2885 } elsif ($self->extcmd == 1) {
2886 #TODO: version 1, remove
2887 unshift @msg, msgtype => "reply", msgid => $id;
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 }
2184} 2890}
2185 2891
2186=item $success = $client->query ($flags, "text", \&cb) 2892=item $success = $client->query ($flags, "text", \&cb)
2187 2893
2188Queues a query to the client, calling the given callback with 2894Queues a query to the client, calling the given callback with
2189the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2895the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2190C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2896C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2191 2897
2192Queries can fail, so check the return code. Or don't, as queries will become 2898Queries can fail, so check the return code. Or don't, as queries will
2193reliable at some point in the future. 2899become reliable at some point in the future.
2194 2900
2195=cut 2901=cut
2196 2902
2197sub cf::client::query { 2903sub cf::client::query {
2198 my ($self, $flags, $text, $cb) = @_; 2904 my ($self, $flags, $text, $cb) = @_;
… …
2206 utf8::encode $text; 2912 utf8::encode $text;
2207 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2913 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2208 2914
2209 $self->send_packet ($self->{query_queue}[0][0]) 2915 $self->send_packet ($self->{query_queue}[0][0])
2210 if @{ $self->{query_queue} } == 1; 2916 if @{ $self->{query_queue} } == 1;
2917
2918 1
2211} 2919}
2212 2920
2213cf::client->attach ( 2921cf::client->attach (
2922 on_connect => sub {
2923 my ($ns) = @_;
2924
2925 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2926 },
2214 on_reply => sub { 2927 on_reply => sub {
2215 my ($ns, $msg) = @_; 2928 my ($ns, $msg) = @_;
2216 2929
2217 # this weird shuffling is so that direct followup queries 2930 # this weird shuffling is so that direct followup queries
2218 # get handled first 2931 # get handled first
… …
2230 } else { 2943 } else {
2231 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2944 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2232 } 2945 }
2233 } 2946 }
2234 }, 2947 },
2948 on_exticmd => sub {
2949 my ($ns, $buf) = @_;
2950
2951 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2952
2953 if (ref $msg) {
2954 my ($type, $reply, @payload) =
2955 "ARRAY" eq ref $msg
2956 ? @$msg
2957 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2958
2959 my @reply;
2960
2961 if (my $cb = $EXTICMD{$type}) {
2962 @reply = $cb->($ns, @payload);
2963 }
2964
2965 $ns->ext_reply ($reply, @reply)
2966 if $reply;
2967
2968 } else {
2969 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2970 }
2971
2972 cf::override;
2973 },
2235); 2974);
2236 2975
2237=item $client->async (\&cb) 2976=item $client->async (\&cb)
2238 2977
2239Create a new coroutine, running the specified callback. The coroutine will 2978Create a new coroutine, running the specified callback. The coroutine will
… …
2280our $safe = new Safe "safe"; 3019our $safe = new Safe "safe";
2281our $safe_hole = new Safe::Hole; 3020our $safe_hole = new Safe::Hole;
2282 3021
2283$SIG{FPE} = 'IGNORE'; 3022$SIG{FPE} = 'IGNORE';
2284 3023
2285$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3024$safe->permit_only (Opcode::opset qw(
3025 :base_core :base_mem :base_orig :base_math
3026 grepstart grepwhile mapstart mapwhile
3027 sort time
3028));
2286 3029
2287# here we export the classes and methods available to script code 3030# here we export the classes and methods available to script code
2288 3031
2289=pod 3032=pod
2290 3033
2291The following functions and methods are available within a safe environment: 3034The following functions and methods are available within a safe environment:
2292 3035
2293 cf::object contr pay_amount pay_player map 3036 cf::object
3037 contr pay_amount pay_player map x y force_find force_add destroy
3038 insert remove name archname title slaying race decrease split
3039
2294 cf::object::player player 3040 cf::object::player
2295 cf::player peaceful 3041 player
2296 cf::map trigger 3042
3043 cf::player
3044 peaceful
3045
3046 cf::map
3047 trigger
2297 3048
2298=cut 3049=cut
2299 3050
2300for ( 3051for (
2301 ["cf::object" => qw(contr pay_amount pay_player map)], 3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3053 insert remove inv nrof name archname title slaying race
3054 decrease split destroy change_exp)],
2302 ["cf::object::player" => qw(player)], 3055 ["cf::object::player" => qw(player)],
2303 ["cf::player" => qw(peaceful)], 3056 ["cf::player" => qw(peaceful)],
2304 ["cf::map" => qw(trigger)], 3057 ["cf::map" => qw(trigger)],
2305) { 3058) {
2306 no strict 'refs'; 3059 no strict 'refs';
… …
2377=back 3130=back
2378 3131
2379=cut 3132=cut
2380 3133
2381############################################################################# 3134#############################################################################
2382
2383=head2 EXTENSION DATABASE SUPPORT
2384
2385Crossfire maintains a very simple database for extension use. It can
2386currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2387convert to/from binary).
2388
2389The parameter C<$family> should best start with the name of the extension
2390using it, it should be unique.
2391
2392=over 4
2393
2394=item $value = cf::db_get $family => $key
2395
2396Returns a single value from the database.
2397
2398=item cf::db_put $family => $key => $value
2399
2400Stores the given C<$value> in the family.
2401
2402=cut
2403
2404our $DB;
2405
2406sub db_init {
2407 unless ($DB) {
2408 $DB = BDB::db_create $DB_ENV;
2409
2410 cf::sync_job {
2411 eval {
2412 $DB->set_flags (BDB::CHKSUM);
2413
2414 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2415 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2416 cf::cleanup "db_open(db): $!" if $!;
2417 };
2418 cf::cleanup "db_open(db): $@" if $@;
2419 };
2420 }
2421}
2422
2423sub db_get($$) {
2424 my $key = "$_[0]/$_[1]";
2425
2426 cf::sync_job {
2427 BDB::db_get $DB, undef, $key, my $data;
2428
2429 $! ? ()
2430 : $data
2431 }
2432}
2433
2434sub db_put($$$) {
2435 BDB::dbreq_pri 4;
2436 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2437}
2438
2439=item cf::cache $id => [$paths...], $processversion => $process
2440
2441Generic caching function that returns the value of the resource $id,
2442caching and regenerating as required.
2443
2444This function can block.
2445
2446=cut
2447
2448sub cache {
2449 my ($id, $src, $processversion, $process) = @_;
2450
2451 my $meta =
2452 join "\x00",
2453 $processversion,
2454 map {
2455 aio_stat $_
2456 and Carp::croak "$_: $!";
2457
2458 ($_, (stat _)[7,9])
2459 } @$src;
2460
2461 my $dbmeta = db_get cache => "$id/meta";
2462 if ($dbmeta ne $meta) {
2463 # changed, we may need to process
2464
2465 my @data;
2466 my $md5;
2467
2468 for (0 .. $#$src) {
2469 0 <= aio_load $src->[$_], $data[$_]
2470 or Carp::croak "$src->[$_]: $!";
2471 }
2472
2473 # if processing is expensive, check
2474 # checksum first
2475 if (1) {
2476 $md5 =
2477 join "\x00",
2478 $processversion,
2479 map {
2480 Coro::cede;
2481 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2482 } 0.. $#$src;
2483
2484
2485 my $dbmd5 = db_get cache => "$id/md5";
2486 if ($dbmd5 eq $md5) {
2487 db_put cache => "$id/meta", $meta;
2488
2489 return db_get cache => "$id/data";
2490 }
2491 }
2492
2493 my $t1 = Time::HiRes::time;
2494 my $data = $process->(\@data);
2495 my $t2 = Time::HiRes::time;
2496
2497 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2498
2499 db_put cache => "$id/data", $data;
2500 db_put cache => "$id/md5" , $md5;
2501 db_put cache => "$id/meta", $meta;
2502
2503 return $data;
2504 }
2505
2506 db_get cache => "$id/data"
2507}
2508
2509=item fork_call { }, $args
2510
2511Executes the given code block with the given arguments in a seperate
2512process, returning the results. Everything must be serialisable with
2513Coro::Storable. May, of course, block. Note that the executed sub may
2514never block itself or use any form of Event handling.
2515
2516=cut
2517
2518sub fork_call(&@) {
2519 my ($cb, @args) = @_;
2520
2521# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2522# or die "socketpair: $!";
2523 pipe my $fh1, my $fh2
2524 or die "pipe: $!";
2525
2526 if (my $pid = fork) {
2527 close $fh2;
2528
2529 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2530 $res = Coro::Storable::thaw $res;
2531
2532 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2533
2534 die $$res unless "ARRAY" eq ref $res;
2535
2536 return wantarray ? @$res : $res->[-1];
2537 } else {
2538 reset_signals;
2539 local $SIG{__WARN__};
2540 local $SIG{__DIE__};
2541 eval {
2542 close $fh1;
2543
2544 my @res = eval { $cb->(@args) };
2545 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2546 };
2547
2548 warn $@ if $@;
2549 _exit 0;
2550 }
2551}
2552
2553#############################################################################
2554# the server's init and main functions 3135# the server's init and main functions
2555 3136
2556sub load_facedata($) { 3137sub load_facedata($) {
2557 my ($path) = @_; 3138 my ($path) = @_;
3139
3140 # HACK to clear player env face cache, we need some signal framework
3141 # for this (global event?)
3142 %ext::player_env::MUSIC_FACE_CACHE = ();
3143
3144 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2558 3145
2559 warn "loading facedata from $path\n"; 3146 warn "loading facedata from $path\n";
2560 3147
2561 my $facedata; 3148 my $facedata;
2562 0 < aio_load $path, $facedata 3149 0 < aio_load $path, $facedata
… …
2565 $facedata = Coro::Storable::thaw $facedata; 3152 $facedata = Coro::Storable::thaw $facedata;
2566 3153
2567 $facedata->{version} == 2 3154 $facedata->{version} == 2
2568 or cf::cleanup "$path: version mismatch, cannot proceed."; 3155 or cf::cleanup "$path: version mismatch, cannot proceed.";
2569 3156
3157 # patch in the exptable
3158 $facedata->{resource}{"res/exp_table"} = {
3159 type => FT_RSRC,
3160 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3161 };
3162 cf::cede_to_tick;
3163
2570 { 3164 {
2571 my $faces = $facedata->{faceinfo}; 3165 my $faces = $facedata->{faceinfo};
2572 3166
2573 while (my ($face, $info) = each %$faces) { 3167 while (my ($face, $info) = each %$faces) {
2574 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3168 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3169
2575 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3170 cf::face::set_visibility $idx, $info->{visibility};
3171 cf::face::set_magicmap $idx, $info->{magicmap};
2576 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3172 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2577 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3173 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2578 Coro::cede; 3174
3175 cf::cede_to_tick;
2579 } 3176 }
2580 3177
2581 while (my ($face, $info) = each %$faces) { 3178 while (my ($face, $info) = each %$faces) {
2582 next unless $info->{smooth}; 3179 next unless $info->{smooth};
3180
2583 my $idx = cf::face::find $face 3181 my $idx = cf::face::find $face
2584 or next; 3182 or next;
3183
2585 if (my $smooth = cf::face::find $info->{smooth}) { 3184 if (my $smooth = cf::face::find $info->{smooth}) {
3185 cf::face::set_smooth $idx, $smooth;
2586 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3186 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2587 } else { 3187 } else {
2588 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3188 warn "smooth face '$info->{smooth}' not found for face '$face'";
2589 } 3189 }
2590 Coro::cede; 3190
3191 cf::cede_to_tick;
2591 } 3192 }
2592 } 3193 }
2593 3194
2594 { 3195 {
2595 my $anims = $facedata->{animinfo}; 3196 my $anims = $facedata->{animinfo};
2596 3197
2597 while (my ($anim, $info) = each %$anims) { 3198 while (my ($anim, $info) = each %$anims) {
2598 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3199 cf::anim::set $anim, $info->{frames}, $info->{facings};
2599 Coro::cede; 3200 cf::cede_to_tick;
2600 } 3201 }
2601 3202
2602 cf::anim::invalidate_all; # d'oh 3203 cf::anim::invalidate_all; # d'oh
2603 } 3204 }
2604 3205
3206 {
3207 # TODO: for gcfclient pleasure, we should give resources
3208 # that gcfclient doesn't grok a >10000 face index.
3209 my $res = $facedata->{resource};
3210
3211 while (my ($name, $info) = each %$res) {
3212 if (defined $info->{type}) {
3213 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3214 my $data;
3215
3216 if ($info->{type} & 1) {
3217 # prepend meta info
3218
3219 my $meta = $enc->encode ({
3220 name => $name,
3221 %{ $info->{meta} || {} },
3222 });
3223
3224 $data = pack "(w/a*)*", $meta, $info->{data};
3225 } else {
3226 $data = $info->{data};
3227 }
3228
3229 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3230 cf::face::set_type $idx, $info->{type};
3231 } else {
3232 $RESOURCE{$name} = $info;
3233 }
3234
3235 cf::cede_to_tick;
3236 }
3237 }
3238
3239 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3240
2605 1 3241 1
2606} 3242}
2607 3243
3244cf::global->attach (on_resource_update => sub {
3245 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3246 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3247
3248 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3249 my $sound = $soundconf->{compat}[$_]
3250 or next;
3251
3252 my $face = cf::face::find "sound/$sound->[1]";
3253 cf::sound::set $sound->[0] => $face;
3254 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3255 }
3256
3257 while (my ($k, $v) = each %{$soundconf->{event}}) {
3258 my $face = cf::face::find "sound/$v";
3259 cf::sound::set $k => $face;
3260 }
3261 }
3262});
3263
3264register_exticmd fx_want => sub {
3265 my ($ns, $want) = @_;
3266
3267 while (my ($k, $v) = each %$want) {
3268 $ns->fx_want ($k, $v);
3269 }
3270};
3271
3272sub load_resource_file($) {
3273 my $guard = lock_acquire "load_resource_file";
3274
3275 my $status = load_resource_file_ $_[0];
3276 get_slot 0.1, 100;
3277 cf::arch::commit_load;
3278
3279 $status
3280}
3281
2608sub reload_regions { 3282sub reload_regions {
3283 # HACK to clear player env face cache, we need some signal framework
3284 # for this (global event?)
3285 %ext::player_env::MUSIC_FACE_CACHE = ();
3286
2609 load_resource_file "$MAPDIR/regions" 3287 load_resource_file "$MAPDIR/regions"
2610 or die "unable to load regions file\n"; 3288 or die "unable to load regions file\n";
3289
3290 for (cf::region::list) {
3291 $_->{match} = qr/$_->{match}/
3292 if exists $_->{match};
3293 }
2611} 3294}
2612 3295
2613sub reload_facedata { 3296sub reload_facedata {
2614 load_facedata "$DATADIR/facedata" 3297 load_facedata "$DATADIR/facedata"
2615 or die "unable to load facedata\n"; 3298 or die "unable to load facedata\n";
… …
2626} 3309}
2627 3310
2628sub reload_resources { 3311sub reload_resources {
2629 warn "reloading resource files...\n"; 3312 warn "reloading resource files...\n";
2630 3313
3314 reload_facedata;
3315 reload_archetypes;
2631 reload_regions; 3316 reload_regions;
2632 reload_facedata;
2633 #reload_archetypes;#d#
2634 reload_archetypes;
2635 reload_treasures; 3317 reload_treasures;
2636 3318
2637 warn "finished reloading resource files\n"; 3319 warn "finished reloading resource files\n";
2638} 3320}
2639 3321
2640sub init { 3322sub reload_config {
2641 reload_resources;
2642}
2643
2644sub cfg_load {
2645 open my $fh, "<:utf8", "$CONFDIR/config" 3323 open my $fh, "<:utf8", "$CONFDIR/config"
2646 or return; 3324 or return;
2647 3325
2648 local $/; 3326 local $/;
2649 *CFG = YAML::Syck::Load <$fh>; 3327 *CFG = YAML::Load <$fh>;
2650 3328
2651 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3329 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2652 3330
2653 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3331 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2654 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3332 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2660 }; 3338 };
2661 warn $@ if $@; 3339 warn $@ if $@;
2662 } 3340 }
2663} 3341}
2664 3342
3343sub pidfile() {
3344 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3345 or die "$PIDFILE: $!";
3346 flock $fh, &Fcntl::LOCK_EX
3347 or die "$PIDFILE: flock: $!";
3348 $fh
3349}
3350
3351# make sure only one server instance is running at any one time
3352sub atomic {
3353 my $fh = pidfile;
3354
3355 my $pid = <$fh>;
3356 kill 9, $pid if $pid > 0;
3357
3358 seek $fh, 0, 0;
3359 print $fh $$;
3360}
3361
2665sub main { 3362sub main {
3363 cf::init_globals; # initialise logging
3364
3365 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3366 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3367 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3368 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3369
3370 cf::init_experience;
3371 cf::init_anim;
3372 cf::init_attackmess;
3373 cf::init_dynamic;
3374
3375 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3376
2666 # we must not ever block the main coroutine 3377 # we must not ever block the main coroutine
2667 local $Coro::idle = sub { 3378 local $Coro::idle = sub {
2668 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3379 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2669 (async { 3380 (async {
2670 Event::one_event; 3381 $Coro::current->{desc} = "IDLE BUG HANDLER";
3382 EV::loop EV::LOOP_ONESHOT;
2671 })->prio (Coro::PRIO_MAX); 3383 })->prio (Coro::PRIO_MAX);
2672 }; 3384 };
2673 3385
2674 cfg_load; 3386 evthread_start IO::AIO::poll_fileno;
3387
3388 cf::sync_job {
3389 reload_resources;
3390 reload_config;
2675 db_init; 3391 db_init;
3392
3393 cf::load_settings;
3394 cf::load_materials;
3395 cf::init_uuid;
3396 cf::init_signals;
3397 cf::init_commands;
3398 cf::init_skills;
3399
3400 cf::init_beforeplay;
3401
3402 atomic;
3403
2676 load_extensions; 3404 load_extensions;
2677 3405
2678 $TICK_WATCHER->start; 3406 utime time, time, $RUNTIMEFILE;
3407
3408 # no (long-running) fork's whatsoever before this point(!)
3409 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3410
3411 (pop @POST_INIT)->(0) while @POST_INIT;
3412 };
3413
2679 Event::loop; 3414 EV::loop;
2680} 3415}
2681 3416
2682############################################################################# 3417#############################################################################
2683# initialisation and cleanup 3418# initialisation and cleanup
2684 3419
2685# install some emergency cleanup handlers 3420# install some emergency cleanup handlers
2686BEGIN { 3421BEGIN {
3422 our %SIGWATCHER = ();
2687 for my $signal (qw(INT HUP TERM)) { 3423 for my $signal (qw(INT HUP TERM)) {
2688 Event->signal ( 3424 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2689 reentrant => 0,
2690 data => WF_AUTOCANCEL,
2691 signal => $signal,
2692 prio => 0,
2693 cb => sub {
2694 cf::cleanup "SIG$signal"; 3425 cf::cleanup "SIG$signal";
2695 },
2696 ); 3426 };
3427 }
3428}
3429
3430sub write_runtime_sync {
3431 # first touch the runtime file to show we are still running:
3432 # the fsync below can take a very very long time.
3433
3434 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3435
3436 my $guard = cf::lock_acquire "write_runtime";
3437
3438 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3439 or return;
3440
3441 my $value = $cf::RUNTIME + 90 + 10;
3442 # 10 is the runtime save interval, for a monotonic clock
3443 # 60 allows for the watchdog to kill the server.
3444
3445 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3446 and return;
3447
3448 # always fsync - this file is important
3449 aio_fsync $fh
3450 and return;
3451
3452 # touch it again to show we are up-to-date
3453 aio_utime $fh, undef, undef;
3454
3455 close $fh
3456 or return;
3457
3458 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3459 and return;
3460
3461 warn "runtime file written.\n";
3462
2697 } 3463 1
3464}
3465
3466our $uuid_lock;
3467our $uuid_skip;
3468
3469sub write_uuid_sync($) {
3470 $uuid_skip ||= $_[0];
3471
3472 return if $uuid_lock;
3473 local $uuid_lock = 1;
3474
3475 my $uuid = "$LOCALDIR/uuid";
3476
3477 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3478 or return;
3479
3480 my $value = uuid_seq uuid_cur;
3481
3482 unless ($value) {
3483 warn "cowardly refusing to write zero uuid value!\n";
3484 return;
3485 }
3486
3487 my $value = uuid_str $value + $uuid_skip;
3488 $uuid_skip = 0;
3489
3490 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3491 and return;
3492
3493 # always fsync - this file is important
3494 aio_fsync $fh
3495 and return;
3496
3497 close $fh
3498 or return;
3499
3500 aio_rename "$uuid~", $uuid
3501 and return;
3502
3503 warn "uuid file written ($value).\n";
3504
3505 1
3506
3507}
3508
3509sub write_uuid($$) {
3510 my ($skip, $sync) = @_;
3511
3512 $sync ? write_uuid_sync $skip
3513 : async { write_uuid_sync $skip };
2698} 3514}
2699 3515
2700sub emergency_save() { 3516sub emergency_save() {
2701 my $freeze_guard = cf::freeze_mainloop; 3517 my $freeze_guard = cf::freeze_mainloop;
2702 3518
2703 warn "enter emergency perl save\n"; 3519 warn "emergency_perl_save: enter\n";
2704 3520
2705 cf::sync_job { 3521 cf::sync_job {
3522 # this is a trade-off: we want to be very quick here, so
3523 # save all maps without fsync, and later call a global sync
3524 # (which in turn might be very very slow)
3525 local $USE_FSYNC = 0;
3526
2706 # use a peculiar iteration method to avoid tripping on perl 3527 # use a peculiar iteration method to avoid tripping on perl
2707 # refcount bugs in for. also avoids problems with players 3528 # refcount bugs in for. also avoids problems with players
2708 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
2709 warn "begin emergency player save\n"; 3530 warn "emergency_perl_save: begin player save\n";
2710 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
2711 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
2712 $pl->valid or next; 3533 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2713 $pl->save; 3535 $pl->save;
2714 } 3536 }
2715 warn "end emergency player save\n"; 3537 warn "emergency_perl_save: end player save\n";
2716 3538
2717 warn "begin emergency map save\n"; 3539 warn "emergency_perl_save: begin map save\n";
2718 for my $path (keys %cf::MAP) { 3540 for my $path (keys %cf::MAP) {
2719 my $map = $cf::MAP{$path} or next; 3541 my $map = $cf::MAP{$path} or next;
2720 $map->valid or next; 3542 $map->valid or next;
2721 $map->save; 3543 $map->save;
2722 } 3544 }
2723 warn "end emergency map save\n"; 3545 warn "emergency_perl_save: end map save\n";
2724 3546
2725 warn "begin emergency database checkpoint\n"; 3547 warn "emergency_perl_save: begin database checkpoint\n";
2726 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
2727 warn "end emergency database checkpoint\n"; 3549 warn "emergency_perl_save: end database checkpoint\n";
3550
3551 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1;
3553 warn "emergency_perl_save: end write uuid\n";
2728 }; 3554 };
2729 3555
3556 warn "emergency_perl_save: starting sync()\n";
3557 IO::AIO::aio_sync sub {
3558 warn "emergency_perl_save: finished sync()\n";
3559 };
3560
2730 warn "leave emergency perl save\n"; 3561 warn "emergency_perl_save: leave\n";
2731} 3562}
2732 3563
2733sub post_cleanup { 3564sub post_cleanup {
2734 my ($make_core) = @_; 3565 my ($make_core) = @_;
2735 3566
2736 warn Carp::longmess "post_cleanup backtrace" 3567 warn Carp::longmess "post_cleanup backtrace"
2737 if $make_core; 3568 if $make_core;
3569
3570 my $fh = pidfile;
3571 unlink $PIDFILE if <$fh> == $$;
3572}
3573
3574# a safer delete_package, copied from Symbol
3575sub clear_package($) {
3576 my $pkg = shift;
3577
3578 # expand to full symbol table name if needed
3579 unless ($pkg =~ /^main::.*::$/) {
3580 $pkg = "main$pkg" if $pkg =~ /^::/;
3581 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3582 $pkg .= '::' unless $pkg =~ /::$/;
3583 }
3584
3585 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3586 my $stem_symtab = *{$stem}{HASH};
3587
3588 defined $stem_symtab and exists $stem_symtab->{$leaf}
3589 or return;
3590
3591 # clear all symbols
3592 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3593 for my $name (keys %$leaf_symtab) {
3594 _gv_clear *{"$pkg$name"};
3595# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3596 }
3597 warn "cleared package $pkg\n";#d#
2738} 3598}
2739 3599
2740sub do_reload_perl() { 3600sub do_reload_perl() {
2741 # can/must only be called in main 3601 # can/must only be called in main
2742 if ($Coro::current != $Coro::main) { 3602 if ($Coro::current != $Coro::main) {
2743 warn "can only reload from main coroutine"; 3603 warn "can only reload from main coroutine";
2744 return; 3604 return;
2745 } 3605 }
2746 3606
3607 return if $RELOAD++;
3608
3609 my $t1 = EV::time;
3610
3611 while ($RELOAD) {
2747 warn "reloading..."; 3612 warn "reloading...";
2748 3613
2749 warn "entering sync_job"; 3614 warn "entering sync_job";
2750 3615
2751 cf::sync_job { 3616 cf::sync_job {
2752 cf::write_runtime; # external watchdog should not bark 3617 cf::write_runtime_sync; # external watchdog should not bark
2753 cf::emergency_save; 3618 cf::emergency_save;
2754 cf::write_runtime; # external watchdog should not bark 3619 cf::write_runtime_sync; # external watchdog should not bark
2755 3620
2756 warn "syncing database to disk"; 3621 warn "syncing database to disk";
2757 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
2758 3623
2759 # if anything goes wrong in here, we should simply crash as we already saved 3624 # if anything goes wrong in here, we should simply crash as we already saved
2760 3625
2761 warn "cancelling all WF_AUTOCANCEL watchers";
2762 for (Event::all_watchers) {
2763 $_->cancel if $_->data & WF_AUTOCANCEL;
2764 }
2765
2766 warn "flushing outstanding aio requests"; 3626 warn "flushing outstanding aio requests";
2767 for (;;) {
2768 BDB::flush;
2769 IO::AIO::flush;
2770 Coro::cede;
2771 last unless IO::AIO::nreqs || BDB::nreqs; 3627 while (IO::AIO::nreqs || BDB::nreqs) {
2772 warn "iterate..."; 3628 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2773 }
2774
2775 ++$RELOAD;
2776
2777 warn "cancelling all extension coros";
2778 $_->cancel for values %EXT_CORO;
2779 %EXT_CORO = ();
2780
2781 warn "removing commands";
2782 %COMMAND = ();
2783
2784 warn "removing ext commands";
2785 %EXTCMD = ();
2786
2787 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg";
2790
2791 if (my $cb = $pkg->can ("unload")) {
2792 eval {
2793 $cb->($pkg);
2794 1
2795 } or warn "$pkg unloaded, but with errors: $@";
2796 } 3629 }
2797 3630
2798 warn "... nuking $pkg"; 3631 warn "cancelling all extension coros";
2799 Symbol::delete_package $pkg; 3632 $_->cancel for values %EXT_CORO;
2800 } 3633 %EXT_CORO = ();
2801 3634
2802 warn "unloading all perl modules loaded from $LIBDIR"; 3635 warn "removing commands";
2803 while (my ($k, $v) = each %INC) { 3636 %COMMAND = ();
2804 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2805 3637
3638 warn "removing ext/exti commands";
3639 %EXTCMD = ();
3640 %EXTICMD = ();
3641
3642 warn "unloading/nuking all extensions";
3643 for my $pkg (@EXTS) {
2806 warn "... unloading $k"; 3644 warn "... unloading $pkg";
2807 delete $INC{$k};
2808 3645
2809 $k =~ s/\.pm$//;
2810 $k =~ s/\//::/g;
2811
2812 if (my $cb = $k->can ("unload_module")) { 3646 if (my $cb = $pkg->can ("unload")) {
3647 eval {
2813 $cb->(); 3648 $cb->($pkg);
3649 1
3650 } or warn "$pkg unloaded, but with errors: $@";
3651 }
3652
3653 warn "... clearing $pkg";
3654 clear_package $pkg;
2814 } 3655 }
2815 3656
2816 Symbol::delete_package $k; 3657 warn "unloading all perl modules loaded from $LIBDIR";
3658 while (my ($k, $v) = each %INC) {
3659 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3660
3661 warn "... unloading $k";
3662 delete $INC{$k};
3663
3664 $k =~ s/\.pm$//;
3665 $k =~ s/\//::/g;
3666
3667 if (my $cb = $k->can ("unload_module")) {
3668 $cb->();
3669 }
3670
3671 clear_package $k;
2817 } 3672 }
2818 3673
2819 warn "getting rid of safe::, as good as possible"; 3674 warn "getting rid of safe::, as good as possible";
2820 Symbol::delete_package "safe::$_" 3675 clear_package "safe::$_"
2821 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3676 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2822 3677
2823 warn "unloading cf.pm \"a bit\""; 3678 warn "unloading cf.pm \"a bit\"";
2824 delete $INC{"cf.pm"}; 3679 delete $INC{"cf.pm"};
2825 delete $INC{"cf/pod.pm"}; 3680 delete $INC{"cf/pod.pm"};
2826 3681
2827 # don't, removes xs symbols, too, 3682 # don't, removes xs symbols, too,
2828 # and global variables created in xs 3683 # and global variables created in xs
2829 #Symbol::delete_package __PACKAGE__; 3684 #clear_package __PACKAGE__;
2830 3685
2831 warn "unload completed, starting to reload now"; 3686 warn "unload completed, starting to reload now";
2832 3687
2833 warn "reloading cf.pm"; 3688 warn "reloading cf.pm";
2834 require cf; 3689 require cf;
2835 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3690 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2836 3691
2837 warn "loading config and database again"; 3692 warn "loading config and database again";
2838 cf::cfg_load; 3693 cf::reload_config;
2839 3694
2840 warn "loading extensions"; 3695 warn "loading extensions";
2841 cf::load_extensions; 3696 cf::load_extensions;
2842 3697
3698 if ($REATTACH_ON_RELOAD) {
2843 warn "reattaching attachments to objects/players"; 3699 warn "reattaching attachments to objects/players";
2844 _global_reattach; # objects, sockets 3700 _global_reattach; # objects, sockets
2845 warn "reattaching attachments to maps"; 3701 warn "reattaching attachments to maps";
2846 reattach $_ for values %MAP; 3702 reattach $_ for values %MAP;
2847 warn "reattaching attachments to players"; 3703 warn "reattaching attachments to players";
2848 reattach $_ for values %PLAYER; 3704 reattach $_ for values %PLAYER;
3705 }
2849 3706
3707 warn "running post_init jobs";
3708 (pop @POST_INIT)->(1) while @POST_INIT;
3709
2850 warn "leaving sync_job"; 3710 warn "leaving sync_job";
2851 3711
2852 1 3712 1
2853 } or do { 3713 } or do {
2854 warn $@; 3714 warn $@;
2855 warn "error while reloading, exiting."; 3715 cf::cleanup "error while reloading, exiting.";
2856 exit 1;
2857 }; 3716 };
2858 3717
2859 warn "reloaded"; 3718 warn "reloaded";
3719 --$RELOAD;
3720 }
3721
3722 $t1 = EV::time - $t1;
3723 warn "reload completed in ${t1}s\n";
2860}; 3724};
2861 3725
2862our $RELOAD_WATCHER; # used only during reload 3726our $RELOAD_WATCHER; # used only during reload
2863 3727
2864sub reload_perl() { 3728sub reload_perl() {
2865 # doing reload synchronously and two reloads happen back-to-back, 3729 # doing reload synchronously and two reloads happen back-to-back,
2866 # coro crashes during coro_state_free->destroy here. 3730 # coro crashes during coro_state_free->destroy here.
2867 3731
2868 $RELOAD_WATCHER ||= Event->timer ( 3732 $RELOAD_WATCHER ||= cf::async {
2869 reentrant => 0, 3733 Coro::AIO::aio_wait cache_extensions;
2870 after => 0, 3734
2871 data => WF_AUTOCANCEL, 3735 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
2872 cb => sub {
2873 do_reload_perl; 3736 do_reload_perl;
2874 undef $RELOAD_WATCHER; 3737 undef $RELOAD_WATCHER;
2875 }, 3738 };
2876 ); 3739 };
2877} 3740}
2878 3741
2879register_command "reload" => sub { 3742register_command "reload" => sub {
2880 my ($who, $arg) = @_; 3743 my ($who, $arg) = @_;
2881 3744
2882 if ($who->flag (FLAG_WIZ)) { 3745 if ($who->flag (FLAG_WIZ)) {
2883 $who->message ("reloading server."); 3746 $who->message ("reloading server.");
3747 async {
3748 $Coro::current->{desc} = "perl_reload";
2884 async { reload_perl }; 3749 reload_perl;
3750 };
2885 } 3751 }
2886}; 3752};
2887 3753
2888unshift @INC, $LIBDIR; 3754unshift @INC, $LIBDIR;
2889 3755
… …
2891 3757
2892our @WAIT_FOR_TICK; 3758our @WAIT_FOR_TICK;
2893our @WAIT_FOR_TICK_BEGIN; 3759our @WAIT_FOR_TICK_BEGIN;
2894 3760
2895sub wait_for_tick { 3761sub wait_for_tick {
2896 return unless $TICK_WATCHER->is_active;
2897 return if $Coro::current == $Coro::main; 3762 return if tick_inhibit || $Coro::current == $Coro::main;
2898 3763
2899 my $signal = new Coro::Signal; 3764 my $signal = new Coro::Signal;
2900 push @WAIT_FOR_TICK, $signal; 3765 push @WAIT_FOR_TICK, $signal;
2901 $signal->wait; 3766 $signal->wait;
2902} 3767}
2903 3768
2904sub wait_for_tick_begin { 3769sub wait_for_tick_begin {
2905 return unless $TICK_WATCHER->is_active;
2906 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
2907 3771
2908 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
2909 push @WAIT_FOR_TICK_BEGIN, $signal; 3773 push @WAIT_FOR_TICK_BEGIN, $signal;
2910 $signal->wait; 3774 $signal->wait;
2911} 3775}
2912 3776
2913 my $min = 1e6;#d# 3777sub tick {
2914 my $avg = 10;
2915$TICK_WATCHER = Event->timer (
2916 reentrant => 0,
2917 parked => 1,
2918 prio => 0,
2919 at => $NEXT_TICK || $TICK,
2920 data => WF_AUTOCANCEL,
2921 cb => sub {
2922 if ($Coro::current != $Coro::main) { 3778 if ($Coro::current != $Coro::main) {
2923 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3779 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2924 unless ++$bug_warning > 10; 3780 unless ++$bug_warning > 10;
2925 return; 3781 return;
2926 } 3782 }
2927 3783
2928 $NOW = $tick_start = Event::time;
2929
2930 cf::server_tick; # one server iteration 3784 cf::server_tick; # one server iteration
2931 3785
2932 0 && sync_job {#d# 3786 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2933 for(1..10) { 3787 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2934 my $t = Event::time; 3788 Coro::async_pool {
2935 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3789 $Coro::current->{desc} = "runtime saver";
2936 or die; 3790 write_runtime_sync
2937 3791 or warn "ERROR: unable to write runtime file: $!";
2938 $map->width (50);
2939 $map->height (50);
2940 $map->alloc;
2941 $map->_load_objects ("/tmp/x.map", 1);
2942 my $t = Event::time - $t;
2943
2944 #next unless $t < 0.0013;#d#
2945 if ($t < $min) {
2946 $min = $t;
2947 }
2948 $avg = $avg * 0.99 + $t * 0.01;
2949 }
2950 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2951 exit 0;
2952 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2953 }; 3792 };
3793 }
2954 3794
2955 $RUNTIME += $TICK;
2956 $NEXT_TICK += $TICK;
2957
2958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2959 $NEXT_RUNTIME_WRITE = $NOW + 10;
2960 Coro::async_pool {
2961 write_runtime
2962 or warn "ERROR: unable to write runtime file: $!";
2963 };
2964 }
2965
2966# my $AFTER = Event::time;
2967# warn $AFTER - $NOW;#d#
2968
2969 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3795 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970 $sig->send; 3796 $sig->send;
2971 } 3797 }
2972 while (my $sig = shift @WAIT_FOR_TICK) { 3798 while (my $sig = shift @WAIT_FOR_TICK) {
2973 $sig->send; 3799 $sig->send;
2974 } 3800 }
2975 3801
2976 $NOW = Event::time; 3802 $LOAD = ($NOW - $TICK_START) / $TICK;
2977
2978 # if we are delayed by four ticks or more, skip them all
2979 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2980
2981 $TICK_WATCHER->at ($NEXT_TICK);
2982 $TICK_WATCHER->start;
2983
2984 $LOAD = ($NOW - $tick_start) / $TICK;
2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3803 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2986 3804
2987 _post_tick; 3805 if (0) {
2988 3806 if ($NEXT_TICK) {
2989 3807 my $jitter = $TICK_START - $NEXT_TICK;
3808 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3809 warn "jitter $JITTER\n";#d#
3810 }
2990 }, 3811 }
2991); 3812}
2992 3813
2993{ 3814{
2994 BDB::max_poll_time $TICK * 0.1; 3815 # configure BDB
2995 $BDB_POLL_WATCHER = Event->io ( 3816
2996 reentrant => 0,
2997 fd => BDB::poll_fileno,
2998 poll => 'r',
2999 prio => 0,
3000 data => WF_AUTOCANCEL,
3001 cb => \&BDB::poll_cb,
3002 );
3003 BDB::min_parallel 8; 3817 BDB::min_parallel 8;
3004 3818 BDB::max_poll_reqs $TICK * 0.1;
3005 BDB::set_sync_prepare { 3819 $AnyEvent::BDB::WATCHER->priority (1);
3006 my $status;
3007 my $current = $Coro::current;
3008 (
3009 sub {
3010 $status = $!;
3011 $current->ready; undef $current;
3012 },
3013 sub {
3014 Coro::schedule while defined $current;
3015 $! = $status;
3016 },
3017 )
3018 };
3019 3820
3020 unless ($DB_ENV) { 3821 unless ($DB_ENV) {
3021 $DB_ENV = BDB::db_env_create; 3822 $DB_ENV = BDB::db_env_create;
3823 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3824 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3825 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3826 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3827 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3022 3828
3023 cf::sync_job { 3829 cf::sync_job {
3024 eval { 3830 eval {
3025 BDB::db_env_open 3831 BDB::db_env_open
3026 $DB_ENV, 3832 $DB_ENV,
… …
3028 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3834 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3029 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3835 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3030 0666; 3836 0666;
3031 3837
3032 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3838 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3033
3034 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3035 $DB_ENV->set_lk_detect;
3036 }; 3839 };
3037 3840
3038 cf::cleanup "db_env_open(db): $@" if $@; 3841 cf::cleanup "db_env_open(db): $@" if $@;
3039 }; 3842 };
3040 } 3843 }
3844
3845 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3846 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3847 };
3848 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3849 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3850 };
3851 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3852 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3853 };
3041} 3854}
3042 3855
3043{ 3856{
3857 # configure IO::AIO
3858
3044 IO::AIO::min_parallel 8; 3859 IO::AIO::min_parallel 8;
3045
3046 undef $Coro::AIO::WATCHER;
3047 IO::AIO::max_poll_time $TICK * 0.1; 3860 IO::AIO::max_poll_time $TICK * 0.1;
3048 $AIO_POLL_WATCHER = Event->io ( 3861 undef $AnyEvent::AIO::WATCHER;
3049 reentrant => 0,
3050 data => WF_AUTOCANCEL,
3051 fd => IO::AIO::poll_fileno,
3052 poll => 'r',
3053 prio => 6,
3054 cb => \&IO::AIO::poll_cb,
3055 );
3056} 3862}
3057 3863
3058my $_log_backtrace; 3864my $_log_backtrace;
3059 3865
3060sub _log_backtrace { 3866sub _log_backtrace {
… …
3063 $msg =~ s/\n//; 3869 $msg =~ s/\n//;
3064 3870
3065 # limit the # of concurrent backtraces 3871 # limit the # of concurrent backtraces
3066 if ($_log_backtrace < 2) { 3872 if ($_log_backtrace < 2) {
3067 ++$_log_backtrace; 3873 ++$_log_backtrace;
3874 my $perl_bt = Carp::longmess $msg;
3068 async { 3875 async {
3876 $Coro::current->{desc} = "abt $msg";
3877
3069 my @bt = fork_call { 3878 my @bt = fork_call {
3070 @addr = map { sprintf "%x", $_ } @addr; 3879 @addr = map { sprintf "%x", $_ } @addr;
3071 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3880 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3072 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3881 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3073 or die "addr2line: $!"; 3882 or die "addr2line: $!";
… …
3081 } 3890 }
3082 3891
3083 @funcs 3892 @funcs
3084 }; 3893 };
3085 3894
3086 LOG llevInfo, "[ABT] $msg\n"; 3895 LOG llevInfo, "[ABT] $perl_bt\n";
3896 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3087 LOG llevInfo, "[ABT] $_\n" for @bt; 3897 LOG llevInfo, "[ABT] $_\n" for @bt;
3088 --$_log_backtrace; 3898 --$_log_backtrace;
3089 }; 3899 };
3090 } else { 3900 } else {
3091 LOG llevInfo, "[ABT] $msg\n"; 3901 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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