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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.61 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
53use Coro::Util ();
24 54
55use JSON::XS 2.01 ();
25use BDB (); 56use BDB ();
26use Data::Dumper; 57use Data::Dumper;
27use Digest::MD5; 58use Digest::MD5;
28use Fcntl; 59use Fcntl;
29use YAML::Syck (); 60use YAML::XS ();
30use IO::AIO 2.32 (); 61use IO::AIO ();
31use Time::HiRes; 62use Time::HiRes;
32use Compress::LZF; 63use Compress::LZF;
64use Digest::MD5 ();
65
66AnyEvent::detect;
33 67
34# configure various modules to our taste 68# configure various modules to our taste
35# 69#
36$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 71Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
72
73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
74
75# make sure c-lzf reinitialises itself
76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 78
40$Event::Eval = 1; # no idea why this is required, but it is 79# strictly for debugging
41 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
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 81
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 83
49our %COMMAND = (); 84our %COMMAND = ();
50our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
53our %EXTCMD = (); 88our %EXTCMD = ();
54our %EXTICMD = (); 89our %EXTICMD = ();
55our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
56our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
57 92
58our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
59our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
60 97
61our $CONFDIR = confdir; 98our $CONFDIR = confdir;
62our $DATADIR = datadir; 99our $DATADIR = datadir;
63our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
64our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
65our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
66our $LOCALDIR = localdir; 103our $LOCALDIR = localdir;
67our $TMPDIR = "$LOCALDIR/" . tmpdir; 104our $TMPDIR = "$LOCALDIR/" . tmpdir;
68our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
69our $PLAYERDIR = "$LOCALDIR/" . playerdir; 106our $PLAYERDIR = "$LOCALDIR/" . playerdir;
70our $RANDOMDIR = "$LOCALDIR/random"; 107our $RANDOMDIR = "$LOCALDIR/random";
71our $BDBDIR = "$LOCALDIR/db"; 108our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime";
111
112our %RESOURCE;
72 113
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 116our $NEXT_TICK;
78our $NOW;
79our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
80 118
119our $BDB_DEADLOCK_WATCHER;
120our $BDB_CHECKPOINT_WATCHER;
81our $BDB_POLL_WATCHER; 121our $BDB_TRICKLE_WATCHER;
82our $DB_ENV; 122our $DB_ENV;
123
124our @EXTRA_MODULES = qw(pod match mapscript);
83 125
84our %CFG; 126our %CFG;
85 127
86our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
87our $RUNTIME; 129our $RUNTIME;
130our $NOW;
88 131
89our %PLAYER; # all users 132our (%PLAYER, %PLAYER_LOADING); # all users
90our %MAP; # all maps 133our (%MAP, %MAP_LOADING ); # all maps
91our $LINK_MAP; # the special {link} map, which is always available 134our $LINK_MAP; # the special {link} map, which is always available
92 135
93# used to convert map paths into valid unix filenames by replacing / by ∕ 136# used to convert map paths into valid unix filenames by replacing / by ∕
94our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 137our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95 138
96our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
97our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
141our $JITTER; # average jitter
98our $tick_start; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
143
144our @POST_INIT;
145
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
99 148
100binmode STDOUT; 149binmode STDOUT;
101binmode STDERR; 150binmode STDERR;
102 151
103# read virtual server time, if available 152# read virtual server time, if available
104unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 153unless ($RUNTIME || !-e $RUNTIMEFILE) {
105 open my $fh, "<", "$LOCALDIR/runtime" 154 open my $fh, "<", $RUNTIMEFILE
106 or die "unable to read runtime file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
107 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
108} 157}
158
159eval "sub TICK() { $TICK } 1" or die;
109 160
110mkdir $_ 161mkdir $_
111 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
112 163
113our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
114 165
115sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
116 178
117############################################################################# 179#############################################################################
118 180
119=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
120 182
156 218
157The raw value load value from the last tick. 219The raw value load value from the last tick.
158 220
159=item %cf::CFG 221=item %cf::CFG
160 222
161Configuration for the server, loaded from C</etc/crossfire/config>, or 223Configuration for the server, loaded from C</etc/deliantra-server/config>, or
162from wherever your confdir points to. 224from wherever your confdir points to.
163 225
164=item cf::wait_for_tick, cf::wait_for_tick_begin 226=item cf::wait_for_tick, cf::wait_for_tick_begin
165 227
166These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 228These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
167returns directly I<after> the tick processing (and consequently, can only wake one process 229returns directly I<after> the tick processing (and consequently, can only wake one process
168per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
169 231
232=item @cf::INVOKE_RESULTS
233
234This array contains the results of the last C<invoke ()> call. When
235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
236that call.
237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
170=back 244=back
171 245
172=cut 246=cut
173 247
174BEGIN { 248$Coro::State::WARNHOOK = sub {
175 *CORE::GLOBAL::warn = sub {
176 my $msg = join "", @_; 249 my $msg = join "", @_;
177 250
178 $msg .= "\n" 251 $msg .= "\n"
179 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
180 253
181 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
182 255
183 utf8::encode $msg;
184 LOG llevError, $msg; 256 LOG llevError, $msg;
185 }; 257};
186} 258
259$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
263
264 if ($Coro::current == $Coro::main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d#
267 }#d#
268
269 # kill coroutine otherwise
270 Coro::terminate
271};
187 272
188@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
189@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
190@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
191@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
198for my $pkg (qw( 283for my $pkg (qw(
199 cf::global cf::attachable 284 cf::global cf::attachable
200 cf::object cf::object::player 285 cf::object cf::object::player
201 cf::client cf::player 286 cf::client cf::player
202 cf::arch cf::living 287 cf::arch cf::living
288 cf::map cf::mapspace
203 cf::map cf::party cf::region 289 cf::party cf::region
204)) { 290)) {
205 no strict 'refs';
206 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
207} 292}
208 293
209$Event::DIED = sub { 294$EV::DIED = sub {
210 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
211}; 296};
212 297
213############################################################################# 298#############################################################################
214 299
215=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
237 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 322 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
238 $d 323 $d
239 } || "[unable to dump $_[0]: '$@']"; 324 } || "[unable to dump $_[0]: '$@']";
240} 325}
241 326
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 327=item $ref = cf::decode_json $json
245 328
246Converts a JSON string into the corresponding perl data structure. 329Converts a JSON string into the corresponding perl data structure.
247 330
248=item $json = cf::to_json $ref 331=item $json = cf::encode_json $ref
249 332
250Converts a perl data structure into its JSON representation. 333Converts a perl data structure into its JSON representation.
251 334
252=cut 335=cut
253 336
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 338
256sub to_json ($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
341
342=item cf::post_init { BLOCK }
343
344Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again.
346
347The cdoeblock will have a single boolean argument to indicate whether this
348is a reload or not.
349
350=cut
351
352sub post_init(&) {
353 push @POST_INIT, shift;
354}
258 355
259=item cf::lock_wait $string 356=item cf::lock_wait $string
260 357
261Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
262 359
263=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
264 361
265Wait until the given lock is available and then acquires it and returns 362Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
268returned. 365returned.
269 366
367Locks are *not* recursive, locking from the same coro twice results in a
368deadlocked coro.
369
270Lock names should begin with a unique identifier (for example, cf::map::find 370Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 371uses map_find and cf::map::load uses map_load).
272 372
273=item $locked = cf::lock_active $string 373=item $locked = cf::lock_active $string
274 374
275Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
276 376
277=cut 377=cut
278 378
279our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
280 380
281sub lock_wait($) { 381sub lock_wait($) {
282 my ($key) = @_; 382 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 383}
290 384
291sub lock_acquire($) { 385sub lock_acquire($) {
292 my ($key) = @_; 386 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 387}
304 388
305sub lock_active($) { 389sub lock_active($) {
306 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 391}
310 392
311sub freeze_mainloop { 393sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 394 tick_inhibit_inc;
313 395
314 my $guard = Coro::guard { 396 &Guard::guard (\&tick_inhibit_dec);
315 $TICK_WATCHER->start; 397}
398
399=item cf::periodic $interval, $cb
400
401Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer.
403
404=cut
405
406sub periodic($$) {
407 my ($interval, $cb) = @_;
408
409 my $start = rand List::Util::min 180, $interval;
410
411 EV::periodic $start, $interval, 0, $cb
412}
413
414=item cf::get_slot $time[, $priority[, $name]]
415
416Allocate $time seconds of blocking CPU time at priority C<$priority>:
417This call blocks and returns only when you have at least C<$time> seconds
418of cpu time till the next tick. The slot is only valid till the next cede.
419
420The optional C<$name> can be used to identify the job to run. It might be
421used for statistical purposes and should identify the same time-class.
422
423Useful for short background jobs.
424
425=cut
426
427our @SLOT_QUEUE;
428our $SLOT_QUEUE;
429
430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager");
433
434 my $signal = new Coro::Signal;
435
436 while () {
437 next_job:
438 my $avail = cf::till_tick;
439 if ($avail > 0.01) {
440 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) {
442 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send;
444 Coro::cede;
445 goto next_job;
446 }
447 }
448 }
449
450 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive
452 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait;
454 } else {
455 Coro::schedule;
456 }
316 }; 457 }
317 $TICK_WATCHER->stop; 458};
318 $guard 459
460sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main;
462
463 my ($time, $pri, $name) = @_;
464
465 $time = $TICK * .6 if $time > $TICK * .6;
466 my $sig = new Coro::Signal;
467
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready;
471 $sig->wait;
319} 472}
320 473
321=item cf::async { BLOCK } 474=item cf::async { BLOCK }
322 475
323Currently the same as Coro::async_pool, meaning you cannot use 476Currently the same as Coro::async_pool, meaning you cannot use
328 481
329BEGIN { *async = \&Coro::async_pool } 482BEGIN { *async = \&Coro::async_pool }
330 483
331=item cf::sync_job { BLOCK } 484=item cf::sync_job { BLOCK }
332 485
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 486The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 487is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 488partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 489acceptable.
337 490
338If it must be done, put the blocking parts into C<sync_job>. This will run 491If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 492the given BLOCK in another coroutine while waiting for the result. The
344 497
345sub sync_job(&) { 498sub sync_job(&) {
346 my ($job) = @_; 499 my ($job) = @_;
347 500
348 if ($Coro::current == $Coro::main) { 501 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 502 my $time = EV::time;
350 503
351 # this is the main coro, too bad, we have to block 504 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 505 # till the operation succeeds, freezing the server :/
353 506
354 # TODO: use suspend/resume instead 507 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 508
356 my $freeze_guard = freeze_mainloop; 509 my $freeze_guard = freeze_mainloop;
357 510
358 my $busy = 1; 511 my $busy = 1;
359 my @res; 512 my @res;
360 513
361 (async { 514 (async {
515 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 516 @res = eval { $job->() };
363 warn $@ if $@; 517 warn $@ if $@;
364 undef $busy; 518 undef $busy;
365 })->prio (Coro::PRIO_MAX); 519 })->prio (Coro::PRIO_MAX);
366 520
367 while ($busy) { 521 while ($busy) {
368 Coro::cede or Event::one_event; 522 if (Coro::nready) {
523 Coro::cede_notself;
524 } else {
525 EV::loop EV::LOOP_ONESHOT;
369 } 526 }
527 }
370 528
371 $time = Event::time - $time; 529 my $time = EV::time - $time;
372 530
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 531 $TICK_START += $time; # do not account sync jobs to server load
377 532
378 wantarray ? @res : $res[0] 533 wantarray ? @res : $res[0]
379 } else { 534 } else {
380 # we are in another coroutine, how wonderful, everything just works 535 # we are in another coroutine, how wonderful, everything just works
381 536
406=item fork_call { }, $args 561=item fork_call { }, $args
407 562
408Executes the given code block with the given arguments in a seperate 563Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 564process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 565Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 566never block itself or use any form of event handling.
412 567
413=cut 568=cut
414 569
415sub fork_call(&@) { 570sub fork_call(&@) {
416 my ($cb, @args) = @_; 571 my ($cb, @args) = @_;
417 572
418# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 573 # we seemingly have to make a local copy of the whole thing,
419# or die "socketpair: $!"; 574 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 575 # TODO: investigate and fix (likely this will be rather laborious)
421 or die "pipe: $!";
422 576
423 if (my $pid = fork) { 577 my @res = Coro::Util::fork_eval {
424 close $fh2;
425
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 578 reset_signals;
436 local $SIG{__WARN__}; 579 &$cb
437 local $SIG{__DIE__}; 580 }, @args;
438 eval {
439 close $fh1;
440 581
441 my @res = eval { $cb->(@args) }; 582 wantarray ? @res : $res[-1]
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 583}
443 };
444 584
445 warn $@ if $@; 585=item $coin = coin_from_name $name
446 _exit 0; 586
447 } 587=cut
588
589our %coin_alias = (
590 "silver" => "silvercoin",
591 "silvercoin" => "silvercoin",
592 "silvercoins" => "silvercoin",
593 "gold" => "goldcoin",
594 "goldcoin" => "goldcoin",
595 "goldcoins" => "goldcoin",
596 "platinum" => "platinacoin",
597 "platinumcoin" => "platinacoin",
598 "platinumcoins" => "platinacoin",
599 "platina" => "platinacoin",
600 "platinacoin" => "platinacoin",
601 "platinacoins" => "platinacoin",
602 "royalty" => "royalty",
603 "royalties" => "royalty",
604);
605
606sub coin_from_name($) {
607 $coin_alias{$_[0]}
608 ? cf::arch::find $coin_alias{$_[0]}
609 : undef
448} 610}
449 611
450=item $value = cf::db_get $family => $key 612=item $value = cf::db_get $family => $key
451 613
452Returns a single value from the environment database. 614Returns a single value from the environment database.
454=item cf::db_put $family => $key => $value 616=item cf::db_put $family => $key => $value
455 617
456Stores the given C<$value> in the family. It can currently store binary 618Stores the given C<$value> in the family. It can currently store binary
457data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 619data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
458 620
621=item $db = cf::db_table "name"
622
623Create and/or open a new database table. The string must not be "db" and must be unique
624within each server.
625
459=cut 626=cut
627
628sub db_table($) {
629 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV;
631
632 eval {
633 $db->set_flags (BDB::CHKSUM);
634
635 utf8::encode $name;
636 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
637 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
638 cf::cleanup "db_open(db): $!" if $!;
639 };
640 cf::cleanup "db_open(db): $@" if $@;
641
642 $db
643}
460 644
461our $DB; 645our $DB;
462 646
463sub db_init { 647sub db_init {
464 unless ($DB) {
465 $DB = BDB::db_create $DB_ENV;
466
467 cf::sync_job { 648 cf::sync_job {
468 eval { 649 $DB ||= db_table "db";
469 $DB->set_flags (BDB::CHKSUM);
470
471 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
473 cf::cleanup "db_open(db): $!" if $!;
474 };
475 cf::cleanup "db_open(db): $@" if $@;
476 };
477 } 650 };
478} 651}
479 652
480sub db_get($$) { 653sub db_get($$) {
481 my $key = "$_[0]/$_[1]"; 654 my $key = "$_[0]/$_[1]";
482 655
532 if (1) { 705 if (1) {
533 $md5 = 706 $md5 =
534 join "\x00", 707 join "\x00",
535 $processversion, 708 $processversion,
536 map { 709 map {
537 Coro::cede; 710 cf::cede_to_tick;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 711 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src; 712 } 0.. $#$src;
540 713
541 714
542 my $dbmd5 = db_get cache => "$id/md5"; 715 my $dbmd5 = db_get cache => "$id/md5";
580 753
581############################################################################# 754#############################################################################
582 755
583=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
584 757
585Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
586attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
587to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
588 761
589In the following description, CLASS can be any of C<global>, C<object> 762In the following description, CLASS can be any of C<global>, C<object>
590C<player>, C<client> or C<map> (i.e. the attachable objects in 763C<player>, C<client> or C<map> (i.e. the attachable objects in
591Crossfire TRT). 764Deliantra).
592 765
593=over 4 766=over 4
594 767
595=item $attachable->attach ($attachment, key => $value...) 768=item $attachable->attach ($attachment, key => $value...)
596 769
640=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
641 814
642Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
643given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
644 817
645Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
646that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
647 820
648These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
649 822
650=over 4 823=over 4
848 "; 1021 ";
849 die if $@; 1022 die if $@;
850} 1023}
851 1024
852our $override; 1025our $override;
853our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1026our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
854 1027
855sub override { 1028sub override {
856 $override = 1; 1029 $override = 1;
857 @invoke_results = (); 1030 @INVOKE_RESULTS = (@_);
858} 1031}
859 1032
860sub do_invoke { 1033sub do_invoke {
861 my $event = shift; 1034 my $event = shift;
862 my $callbacks = shift; 1035 my $callbacks = shift;
863 1036
864 @invoke_results = (); 1037 @INVOKE_RESULTS = ();
865 1038
866 local $override; 1039 local $override;
867 1040
868 for (@$callbacks) { 1041 for (@$callbacks) {
869 eval { &{$_->[1]} }; 1042 eval { &{$_->[1]} };
878 } 1051 }
879 1052
880 0 1053 0
881} 1054}
882 1055
883=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1056=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
884 1057
885=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1058=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
886 1059
887Generate an object-specific event with the given arguments. 1060Generate an object-specific event with the given arguments.
888 1061
889This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1062This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
890removed in future versions), and there is no public API to access override 1063removed in future versions), and there is no public API to access override
891results (if you must, access C<@cf::invoke_results> directly). 1064results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 1065
893=back 1066=back
894 1067
895=cut 1068=cut
896 1069
897############################################################################# 1070#############################################################################
898# object support 1071# object support
1072
1073sub _object_equal($$);
1074sub _object_equal($$) {
1075 my ($a, $b) = @_;
1076
1077 return 0 unless (ref $a) eq (ref $b);
1078
1079 if ("HASH" eq ref $a) {
1080 my @ka = keys %$a;
1081 my @kb = keys %$b;
1082
1083 return 0 if @ka != @kb;
1084
1085 for (0 .. $#ka) {
1086 return 0 unless $ka[$_] eq $kb[$_];
1087 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1088 }
1089
1090 } elsif ("ARRAY" eq ref $a) {
1091
1092 return 0 if @$a != @$b;
1093
1094 for (0 .. $#$a) {
1095 return 0 unless _object_equal $a->[$_], $b->[$_];
1096 }
1097
1098 } elsif ($a ne $b) {
1099 return 0;
1100 }
1101
1102 1
1103}
1104
1105our $SLOW_MERGES;#d#
1106sub _can_merge {
1107 my ($ob1, $ob2) = @_;
1108
1109 ++$SLOW_MERGES;#d#
1110
1111 # we do the slow way here
1112 return _object_equal $ob1, $ob2
1113}
899 1114
900sub reattach { 1115sub reattach {
901 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 1117 my ($obj) = @_;
903 1118
1119 # no longer needed after getting rid of delete_package?
904 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
905 1121
906 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
907 1123
908 @$registry = (); 1124 @$registry = ();
909 1125
924cf::attachable->attach ( 1140cf::attachable->attach (
925 prio => -1000000, 1141 prio => -1000000,
926 on_instantiate => sub { 1142 on_instantiate => sub {
927 my ($obj, $data) = @_; 1143 my ($obj, $data) = @_;
928 1144
929 $data = from_json $data; 1145 $data = decode_json $data;
930 1146
931 for (@$data) { 1147 for (@$data) {
932 my ($name, $args) = @$_; 1148 my ($name, $args) = @$_;
933 1149
934 $obj->attach ($name, %{$args || {} }); 1150 $obj->attach ($name, %{$args || {} });
950sub object_freezer_save { 1166sub object_freezer_save {
951 my ($filename, $rdata, $objs) = @_; 1167 my ($filename, $rdata, $objs) = @_;
952 1168
953 sync_job { 1169 sync_job {
954 if (length $$rdata) { 1170 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename);
955 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
956 $filename, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
957 1174
958 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
960 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1180 aio_fsync $fh;
1181 }
962 close $fh; 1182 aio_close $fh;
963 1183
964 if (@$objs) { 1184 if (@$objs) {
965 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
966 chmod SAVE_MODE, $fh; 1186 aio_chmod $fh, SAVE_MODE;
967 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
968 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
969 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1191 aio_fsync $fh;
1192 }
970 close $fh; 1193 aio_close $fh;
971 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
972 } 1195 }
973 } else { 1196 } else {
974 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
975 } 1198 }
976 1199
977 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
978 } else { 1204 } else {
979 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
980 } 1206 }
981 } else { 1207 } else {
982 aio_unlink $filename; 1208 aio_unlink $filename;
983 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
984 } 1210 }
985 } 1211 };
986} 1212}
987 1213
988sub object_freezer_as_string { 1214sub object_freezer_as_string {
989 my ($rdata, $objs) = @_; 1215 my ($rdata, $objs) = @_;
990 1216
1002 or return; 1228 or return;
1003 1229
1004 unless (aio_stat "$filename.pst") { 1230 unless (aio_stat "$filename.pst") {
1005 (aio_load "$filename.pst", $av) >= 0 1231 (aio_load "$filename.pst", $av) >= 0
1006 or return; 1232 or return;
1233
1007 $av = eval { (Storable::thaw $av)->{objs} }; 1234 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs};
1008 } 1236 }
1009 1237
1238 utf8::decode (my $decname = $filename);
1010 warn sprintf "loading %s (%d)\n", 1239 warn sprintf "loading %s (%d,%d)\n",
1011 $filename, length $data, scalar @{$av || []}; 1240 $decname, length $data, scalar @{$av || []};
1241
1012 return ($data, $av); 1242 ($data, $av)
1013} 1243}
1014 1244
1015=head2 COMMAND CALLBACKS 1245=head2 COMMAND CALLBACKS
1016 1246
1017=over 4 1247=over 4
1071 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1072 1302
1073 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1074} 1304}
1075 1305
1306use File::Glob ();
1307
1076cf::player->attach ( 1308cf::player->attach (
1077 on_command => sub { 1309 on_command => sub {
1078 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1079 1311
1080 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
1087 cf::override; 1319 cf::override;
1088 }, 1320 },
1089 on_extcmd => sub { 1321 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1322 my ($pl, $buf) = @_;
1091 1323
1092 my $msg = eval { from_json $buf }; 1324 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1325
1094 if (ref $msg) { 1326 if (ref $msg) {
1327 my ($type, $reply, @payload) =
1328 "ARRAY" eq ref $msg
1329 ? @$msg
1330 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1331
1332 my @reply;
1333
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1334 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1335 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1336 }
1337
1338 $pl->ext_reply ($reply, @reply)
1339 if $reply;
1340
1100 } else { 1341 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1343 }
1103 1344
1104 cf::override; 1345 cf::override;
1105 }, 1346 },
1106); 1347);
1348
1349# "readahead" all extensions
1350sub cache_extensions {
1351 my $grp = IO::AIO::aio_group;
1352
1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1354 for (grep /\.ext$/, @{$_[0]}) {
1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1356 }
1357 };
1358
1359 $grp
1360}
1107 1361
1108sub load_extensions { 1362sub load_extensions {
1109 cf::sync_job { 1363 cf::sync_job {
1110 my %todo; 1364 my %todo;
1111 1365
1131 1385
1132 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1133 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1134 1388
1135 $ext{source} = 1389 $ext{source} =
1136 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1137 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1138 . $source 1392 . $source
1139 . "\n};\n1"; 1393 . "\n};\n1";
1140 1394
1141 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
1157 my $msg = $@ ? "$v->{path}: $@\n" 1411 my $msg = $@ ? "$v->{path}: $@\n"
1158 : "$v->{base}: extension inactive.\n"; 1412 : "$v->{base}: extension inactive.\n";
1159 1413
1160 if (exists $v->{meta}{mandatory}) { 1414 if (exists $v->{meta}{mandatory}) {
1161 warn $msg; 1415 warn $msg;
1162 warn "mandatory extension failed to load, exiting.\n"; 1416 cf::cleanup "mandatory extension failed to load, exiting.";
1163 exit 1;
1164 } 1417 }
1165 1418
1166 warn $msg; 1419 warn $msg;
1167 } 1420 }
1168 1421
1182 1435
1183=back 1436=back
1184 1437
1185=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1186 1439
1187Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1188 1441
1189=cut 1442=cut
1190 1443
1191package cf::player; 1444package cf::player;
1192 1445
1193use Coro::AIO; 1446use Coro::AIO;
1194 1447
1195=head3 cf::player 1448=head3 cf::player
1196 1449
1197=over 4 1450=over 4
1451
1452=item cf::player::num_playing
1453
1454Returns the official number of playing players, as per the Crossfire metaserver rules.
1455
1456=cut
1457
1458sub num_playing {
1459 scalar grep
1460 $_->ob->map
1461 && !$_->hidden
1462 && !$_->ob->flag (cf::FLAG_WIZ),
1463 cf::player::list
1464}
1198 1465
1199=item cf::player::find $login 1466=item cf::player::find $login
1200 1467
1201Returns the given player object, loading it if necessary (might block). 1468Returns the given player object, loading it if necessary (might block).
1202 1469
1221 1488
1222sub exists($) { 1489sub exists($) {
1223 my ($login) = @_; 1490 my ($login) = @_;
1224 1491
1225 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1226 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1227} 1494}
1228 1495
1229sub find($) { 1496sub find($) {
1230 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1231 my $login = $_[0]; 1498 my $login = $_[0];
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1505 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1506 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1507 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl"; 1508 aio_unlink +(playerdir $login) . "/$login.pl";
1242 1509
1243 my $pl = load_pl path $login 1510 my $f = new_from_file cf::object::thawer path $login
1244 or return; 1511 or return;
1512
1513 my $pl = cf::player::load_pl $f
1514 or return;
1515
1516 local $cf::PLAYER_LOADING{$login} = $pl;
1517 $f->resolve_delayed_derefs;
1245 $cf::PLAYER{$login} = $pl 1518 $cf::PLAYER{$login} = $pl
1246 } 1519 }
1247 } 1520 }
1248} 1521}
1249 1522
1258 return if $pl->{deny_save}; 1531 return if $pl->{deny_save};
1259 1532
1260 aio_mkdir playerdir $pl, 0770; 1533 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1534 $pl->{last_save} = $cf::RUNTIME;
1262 1535
1536 cf::get_slot 0.01;
1537
1263 $pl->save_pl ($path); 1538 $pl->save_pl ($path);
1264 Coro::cede; 1539 cf::cede_to_tick;
1265} 1540}
1266 1541
1267sub new($) { 1542sub new($) {
1268 my ($login) = @_; 1543 my ($login) = @_;
1269 1544
1275 $cf::PLAYER{$login} = $self; 1550 $cf::PLAYER{$login} = $self;
1276 1551
1277 $self 1552 $self
1278} 1553}
1279 1554
1555=item $player->send_msg ($channel, $msg, $color, [extra...])
1556
1557=cut
1558
1559sub send_msg {
1560 my $ns = shift->ns
1561 or return;
1562 $ns->send_msg (@_);
1563}
1564
1280=item $pl->quit_character 1565=item $pl->quit_character
1281 1566
1282Nukes the player without looking back. If logged in, the connection will 1567Nukes the player without looking back. If logged in, the connection will
1283be destroyed. May block for a long time. 1568be destroyed. May block for a long time.
1284 1569
1288 my ($pl) = @_; 1573 my ($pl) = @_;
1289 1574
1290 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1291 1576
1292 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1293 $pl->password ("*"); # this should lock out the player until we nuked the dir 1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1294 1579
1295 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1296 $pl->deactivate; 1581 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1297 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1584 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1298 $pl->ns->destroy if $pl->ns; 1585 $pl->ns->destroy if $pl->ns;
1299 1586
1300 my $path = playerdir $pl; 1587 my $path = playerdir $pl;
1301 my $temp = "$path~$cf::RUNTIME~deleting~"; 1588 my $temp = "$path~$cf::RUNTIME~deleting~";
1337 or return []; 1624 or return [];
1338 1625
1339 my @logins; 1626 my @logins;
1340 1627
1341 for my $login (@$dirs) { 1628 for my $login (@$dirs) {
1629 my $path = path $login;
1630
1631 # a .pst is a dead give-away for a valid player
1632 # if no pst file found, open and chekc for blocked users
1633 if (aio_stat "$path.pst") {
1342 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1634 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343 aio_read $fh, 0, 512, my $buf, 0 or next; 1635 aio_read $fh, 0, 512, my $buf, 0 or next;
1344 $buf !~ /^password -------------$/m or next; # official not-valid tag 1636 $buf !~ /^password -------------$/m or next; # official not-valid tag
1637 }
1345 1638
1346 utf8::decode $login; 1639 utf8::decode $login;
1347 push @logins, $login; 1640 push @logins, $login;
1348 } 1641 }
1349 1642
1376 } 1669 }
1377 1670
1378 \@paths 1671 \@paths
1379} 1672}
1380 1673
1381=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1382 1675
1383Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1384 1677
1385=cut
1386
1387sub expand_cfpod {
1388 ((my $self), (local $_)) = @_;
1389
1390 # escape & and <
1391 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g;
1393
1394 # this is buggy, it needs to properly take care of nested <'s
1395
1396 1 while
1397 # replace B<>, I<>, U<> etc.
1398 s/B<([^\>]*)>/<b>$1<\/b>/
1399 || s/I<([^\>]*)>/<i>$1<\/i>/
1400 || s/U<([^\>]*)>/<u>$1<\/u>/
1401 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1
1404 }ge
1405 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1407
1408 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g;
1410
1411 $_
1412}
1413
1414=item $player->ext_reply ($msgid, %msg) 1678=item $player->ext_reply ($msgid, @msg)
1415 1679
1416Sends an ext reply to the player. 1680Sends an ext reply to the player.
1417 1681
1418=cut 1682=cut
1419 1683
1420sub ext_reply($$%) { 1684sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1685 my ($self, $id, @msg) = @_;
1422 1686
1423 $msg{msgid} = $id; 1687 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1688}
1426 1689
1427=item $player->ext_event ($type, %msg) 1690=item $player->ext_msg ($type, @msg)
1428 1691
1429Sends an ext event to the client. 1692Sends an ext event to the client.
1430 1693
1431=cut 1694=cut
1432 1695
1433sub ext_event($$%) { 1696sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1697 my ($self, $type, @msg) = @_;
1435 1698
1436 $self->ns->ext_event ($type, %msg); 1699 $self->ns->ext_msg ($type, @msg);
1437} 1700}
1438 1701
1439=head3 cf::region 1702=head3 cf::region
1440 1703
1441=over 4 1704=over 4
1454 my ($path) = @_; 1717 my ($path) = @_;
1455 1718
1456 my ($match, $specificity); 1719 my ($match, $specificity);
1457 1720
1458 for my $region (list) { 1721 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1722 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1723 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1724 if $region->specificity > $specificity;
1462 } 1725 }
1463 } 1726 }
1464 1727
1485our $MAX_RESET = 3600; 1748our $MAX_RESET = 3600;
1486our $DEFAULT_RESET = 3000; 1749our $DEFAULT_RESET = 3000;
1487 1750
1488sub generate_random_map { 1751sub generate_random_map {
1489 my ($self, $rmp) = @_; 1752 my ($self, $rmp) = @_;
1753
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755
1490 # mit "rum" bekleckern, nicht 1756 # mit "rum" bekleckern, nicht
1491 $self->_create_random_map ( 1757 $self->_create_random_map (
1492 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1493 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1494 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1584 $self->init; # pass $1 etc. 1850 $self->init; # pass $1 etc.
1585 return $self; 1851 return $self;
1586 } 1852 }
1587 } 1853 }
1588 1854
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1855 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1856 ()
1591} 1857}
1592 1858
1593sub init { 1859sub init {
1594 my ($self) = @_; 1860 my ($self) = @_;
1616 1882
1617# the temporary/swap location 1883# the temporary/swap location
1618sub save_path { 1884sub save_path {
1619 my ($self) = @_; 1885 my ($self) = @_;
1620 1886
1621 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1887 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1622 "$TMPDIR/$path.map" 1888 "$TMPDIR/$path.map"
1623} 1889}
1624 1890
1625# the unique path, undef == no special unique path 1891# the unique path, undef == no special unique path
1626sub uniq_path { 1892sub uniq_path {
1627 my ($self) = @_; 1893 my ($self) = @_;
1628 1894
1629 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1630 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1631}
1632
1633# and all this just because we cannot iterate over
1634# all maps in C++...
1635sub change_all_map_light {
1636 my ($change) = @_;
1637
1638 $_->change_map_light ($change)
1639 for grep $_->outdoor, values %cf::MAP;
1640} 1897}
1641 1898
1642sub decay_objects { 1899sub decay_objects {
1643 my ($self) = @_; 1900 my ($self) = @_;
1644 1901
1657 1914
1658sub load_header_from($) { 1915sub load_header_from($) {
1659 my ($self, $path) = @_; 1916 my ($self, $path) = @_;
1660 1917
1661 utf8::encode $path; 1918 utf8::encode $path;
1662 #aio_open $path, O_RDONLY, 0 1919 my $f = new_from_file cf::object::thawer $path
1663 # or return;
1664
1665 $self->_load_header ($path)
1666 or return; 1920 or return;
1921
1922 $self->_load_header ($f)
1923 or return;
1924
1925 local $MAP_LOADING{$self->{path}} = $self;
1926 $f->resolve_delayed_derefs;
1667 1927
1668 $self->{load_path} = $path; 1928 $self->{load_path} = $path;
1669 1929
1670 1 1930 1
1671} 1931}
1725sub find { 1985sub find {
1726 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
1727 1987
1728 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
1729 1989
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1730 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
1731 1992
1732 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
1733 my $guard = cf::lock_acquire "map_find:$path";
1734 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
1735 or return; 1995 or return;
1736 1996
1737 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
1738 1998
1740 or return; 2000 or return;
1741 2001
1742 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2002 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743 # doing this can freeze the server in a sync job, obviously 2003 # doing this can freeze the server in a sync job, obviously
1744 #$cf::WAIT_FOR_TICK->wait; 2004 #$cf::WAIT_FOR_TICK->wait;
2005 undef $guard2;
2006 undef $guard1;
1745 $map->reset; 2007 $map->reset;
1746 undef $guard;
1747 return find $path; 2008 return find $path;
1748 } 2009 }
1749 2010
1750 $cf::MAP{$path} = $map 2011 $cf::MAP{$path} = $map
1751 } 2012 }
1760 local $self->{deny_reset} = 1; # loading can take a long time 2021 local $self->{deny_reset} = 1; # loading can take a long time
1761 2022
1762 my $path = $self->{path}; 2023 my $path = $self->{path};
1763 2024
1764 { 2025 {
1765 my $guard = cf::lock_acquire "map_load:$path"; 2026 my $guard = cf::lock_acquire "map_data:$path";
1766 2027
2028 return unless $self->valid;
1767 return if $self->in_memory != cf::MAP_SWAPPED; 2029 return unless $self->in_memory == cf::MAP_SWAPPED;
1768 2030
1769 $self->in_memory (cf::MAP_LOADING); 2031 $self->in_memory (cf::MAP_LOADING);
1770 2032
1771 $self->alloc; 2033 $self->alloc;
1772 2034
1773 $self->pre_load; 2035 $self->pre_load;
1774 Coro::cede; 2036 cf::cede_to_tick;
1775 2037
2038 my $f = new_from_file cf::object::thawer $self->{load_path};
2039 $f->skip_block;
1776 $self->_load_objects ($self->{load_path}, 1) 2040 $self->_load_objects ($f)
1777 or return; 2041 or return;
1778 2042
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
1780 if delete $self->{load_original}; 2044 if delete $self->{load_original};
1781 2045
1782 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq; 2047 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) { 2048 unless (aio_stat $uniq) {
2049 if (my $f = new_from_file cf::object::thawer $uniq) {
1785 $self->clear_unique_items; 2050 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 2051 $self->_load_objects ($f);
2052 $f->resolve_delayed_derefs;
2053 }
1787 } 2054 }
1788 } 2055 }
1789 2056
1790 Coro::cede; 2057 $f->resolve_delayed_derefs;
2058
2059 cf::cede_to_tick;
1791 # now do the right thing for maps 2060 # now do the right thing for maps
1792 $self->link_multipart_objects; 2061 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 2062 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 2063 unless $self->difficulty;
1795 Coro::cede; 2064 cf::cede_to_tick;
1796 2065
1797 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 2067 $self->decay_objects;
1799 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
1800 $self->update_buttons; 2069 $self->update_buttons;
1801 Coro::cede; 2070 cf::cede_to_tick;
1802 $self->set_darkness_map;
1803 Coro::cede;
1804 $self->activate; 2071 $self->activate;
1805 } 2072 }
1806 2073
2074 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME);
2076
1807 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_ACTIVE);
1808 } 2078 }
1809 2079
1810 $self->post_load; 2080 $self->post_load;
1811} 2081}
1812 2082
1821 2091
1822 $self 2092 $self
1823} 2093}
1824 2094
1825# find and load all maps in the 3x3 area around a map 2095# find and load all maps in the 3x3 area around a map
1826sub load_diag { 2096sub load_neighbours {
1827 my ($map) = @_; 2097 my ($map) = @_;
1828 2098
1829 my @diag; # diagonal neighbours 2099 my @neigh; # diagonal neighbours
1830 2100
1831 for (0 .. 3) { 2101 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 2102 my $neigh = $map->tile_path ($_)
1833 or next; 2103 or next;
1834 $neigh = find $neigh, $map 2104 $neigh = find $neigh, $map
1835 or next; 2105 or next;
1836 $neigh->load; 2106 $neigh->load;
1837 2107
2108 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 2111 }
1841 2112
1842 for (@diag) { 2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 2115 my $neigh = find $path, $origin
1844 or next; 2116 or next;
1845 $neigh->load; 2117 $neigh->load;
1846 } 2118 }
1847} 2119}
1848 2120
1853} 2125}
1854 2126
1855sub do_load_sync { 2127sub do_load_sync {
1856 my ($map) = @_; 2128 my ($map) = @_;
1857 2129
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main;
2132
1858 cf::sync_job { $map->load }; 2133 cf::sync_job { $map->load };
1859} 2134}
1860 2135
1861our %MAP_PREFETCH; 2136our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 2137our $MAP_PREFETCHER = undef;
1863 2138
1864sub find_async { 2139sub find_async {
1865 my ($path, $origin) = @_; 2140 my ($path, $origin, $load) = @_;
1866 2141
1867 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
1868 2143
1869 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1871 } 2146 }
1872 2147
1873 undef $MAP_PREFETCH{$path}; 2148 $MAP_PREFETCH{$path} |= $load;
2149
1874 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
1875 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 2155 if (my $map = find $k) {
1878 or next;
1879 $map->load; 2156 $map->load if $v;
2157 }
1880 2158
1881 delete $MAP_PREFETCH{$path}; 2159 delete $MAP_PREFETCH{$k};
1882 } 2160 }
1883 } 2161 }
1884 undef $MAP_PREFETCHER; 2162 undef $MAP_PREFETCHER;
1885 }; 2163 };
1886 $MAP_PREFETCHER->prio (6); 2164 $MAP_PREFETCHER->prio (6);
1889} 2167}
1890 2168
1891sub save { 2169sub save {
1892 my ($self) = @_; 2170 my ($self) = @_;
1893 2171
1894 my $lock = cf::lock_acquire "map_data:" . $self->path; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
1895 2173
1896 $self->{last_save} = $cf::RUNTIME; 2174 $self->{last_save} = $cf::RUNTIME;
1897 2175
1898 return unless $self->dirty; 2176 return unless $self->dirty;
1899 2177
1905 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1906 2184
1907 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
1908 2186
1909 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
1910 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
1911 }; 2190 };
2191
2192 cf::get_slot 0.02;
1912 2193
1913 if ($uniq) { 2194 if ($uniq) {
1914 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1915 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2196 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1916 } else { 2197 } else {
1922 my ($self) = @_; 2203 my ($self) = @_;
1923 2204
1924 # save first because save cedes 2205 # save first because save cedes
1925 $self->save; 2206 $self->save;
1926 2207
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2208 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2209
1929 return if $self->players; 2210 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY; 2211 return if $self->in_memory != cf::MAP_ACTIVE;
1931 return if $self->{deny_save}; 2212 return if $self->{deny_save};
1932 2213
2214 $self->in_memory (cf::MAP_SWAPPED);
2215
2216 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP;
1933 $self->clear; 2218 $self->clear;
1934 $self->in_memory (cf::MAP_SWAPPED);
1935} 2219}
1936 2220
1937sub reset_at { 2221sub reset_at {
1938 my ($self) = @_; 2222 my ($self) = @_;
1939 2223
1957 2241
1958 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
1959 2243
1960 return if $self->players; 2244 return if $self->players;
1961 2245
1962 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
1963 2247
1964 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
1965 2249
1966 # need to save uniques path 2250 # need to save uniques path
1967 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
1971 if $uniq; 2255 if $uniq;
1972 } 2256 }
1973 2257
1974 delete $cf::MAP{$self->path}; 2258 delete $cf::MAP{$self->path};
1975 2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
1976 $self->clear; 2262 $self->clear;
1977
1978 $_->clear_links_to ($self) for values %cf::MAP;
1979 2263
1980 $self->unlink_save; 2264 $self->unlink_save;
1981 $self->destroy; 2265 $self->destroy;
1982} 2266}
1983 2267
1984my $nuke_counter = "aaaa"; 2268my $nuke_counter = "aaaa";
1985 2269
1986sub nuke { 2270sub nuke {
1987 my ($self) = @_; 2271 my ($self) = @_;
1988 2272
2273 {
2274 my $lock = cf::lock_acquire "map_data:$self->{path}";
2275
1989 delete $cf::MAP{$self->path}; 2276 delete $cf::MAP{$self->path};
1990 2277
1991 $self->unlink_save; 2278 $self->unlink_save;
1992 2279
1993 bless $self, "cf::map"; 2280 bless $self, "cf::map";
1994 delete $self->{deny_reset}; 2281 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2282 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2283 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2285
1999 $cf::MAP{$self->path} = $self; 2286 $cf::MAP{$self->path} = $self;
2287 }
2000 2288
2001 $self->reset; # polite request, might not happen 2289 $self->reset; # polite request, might not happen
2002} 2290}
2003 2291
2004=item $maps = cf::map::tmp_maps 2292=item $maps = cf::map::tmp_maps
2046 2334
2047sub unique_maps() { 2335sub unique_maps() {
2048 [ 2336 [
2049 map { 2337 map {
2050 utf8::decode $_; 2338 utf8::decode $_;
2051 /\.map$/ 2339 s/\.map$//; # TODO future compatibility hack
2340 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2341 ? ()
2052 ? normalise $_ 2342 : normalise $_
2053 : ()
2054 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2055 ] 2344 ]
2056} 2345}
2057 2346
2058package cf; 2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2059 2378
2060=back 2379=back
2061 2380
2062=head3 cf::object 2381=head3 cf::object
2063 2382
2067 2386
2068=over 4 2387=over 4
2069 2388
2070=item $ob->inv_recursive 2389=item $ob->inv_recursive
2071 2390
2072Returns the inventory of the object _and_ their inventories, recursively. 2391Returns the inventory of the object I<and> their inventories, recursively,
2392but I<not> the object itself.
2073 2393
2074=cut 2394=cut
2075 2395
2076sub inv_recursive_; 2396sub inv_recursive_;
2077sub inv_recursive_ { 2397sub inv_recursive_ {
2080 2400
2081sub inv_recursive { 2401sub inv_recursive {
2082 inv_recursive_ inv $_[0] 2402 inv_recursive_ inv $_[0]
2083} 2403}
2084 2404
2405=item $ref = $ob->ref
2406
2407Creates and returns a persistent reference to an object that can be stored as a string.
2408
2409=item $ob = cf::object::deref ($refstring)
2410
2411returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2412even if the object actually exists. May block.
2413
2414=cut
2415
2416sub deref {
2417 my ($ref) = @_;
2418
2419 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2420 my ($uuid, $name) = ($1, $2);
2421 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2422 or return;
2423 $pl->ob->uuid eq $uuid
2424 or return;
2425
2426 $pl->ob
2427 } else {
2428 warn "$ref: cannot resolve object reference\n";
2429 undef
2430 }
2431}
2432
2085package cf; 2433package cf;
2086 2434
2087=back 2435=back
2088 2436
2089=head3 cf::object::player 2437=head3 cf::object::player
2095Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2443Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2096can be C<undef>. Does the right thing when the player is currently in a 2444can be C<undef>. Does the right thing when the player is currently in a
2097dialogue with the given NPC character. 2445dialogue with the given NPC character.
2098 2446
2099=cut 2447=cut
2448
2449our $SAY_CHANNEL = {
2450 id => "say",
2451 title => "Map",
2452 reply => "say ",
2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2454};
2455
2456our $CHAT_CHANNEL = {
2457 id => "chat",
2458 title => "Chat",
2459 reply => "chat ",
2460 tooltip => "Player chat and shouts, global to the server.",
2461};
2100 2462
2101# rough implementation of a future "reply" method that works 2463# rough implementation of a future "reply" method that works
2102# with dialog boxes. 2464# with dialog boxes.
2103#TODO: the first argument must go, split into a $npc->reply_to ( method 2465#TODO: the first argument must go, split into a $npc->reply_to ( method
2104sub cf::object::player::reply($$$;$) { 2466sub cf::object::player::reply($$$;$) {
2111 2473
2112 } else { 2474 } else {
2113 my $pl = $self->contr; 2475 my $pl = $self->contr;
2114 2476
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2477 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2478 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2479 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2480
2124 } else { 2481 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2482 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2483 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2127 } 2484 }
2128 } 2485 }
2486}
2487
2488=item $object->send_msg ($channel, $msg, $color, [extra...])
2489
2490=cut
2491
2492sub cf::object::send_msg {
2493 my $pl = shift->contr
2494 or return;
2495 $pl->send_msg (@_);
2129} 2496}
2130 2497
2131=item $player_object->may ("access") 2498=item $player_object->may ("access")
2132 2499
2133Returns wether the given player is authorized to access resource "access" 2500Returns wether the given player is authorized to access resource "access"
2146 2513
2147=item $player_object->enter_link 2514=item $player_object->enter_link
2148 2515
2149Freezes the player and moves him/her to a special map (C<{link}>). 2516Freezes the player and moves him/her to a special map (C<{link}>).
2150 2517
2151The player should be reasonably safe there for short amounts of time. You 2518The player should be reasonably safe there for short amounts of time (e.g.
2152I<MUST> call C<leave_link> as soon as possible, though. 2519for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link
2521map.
2153 2522
2154Will never block. 2523Will never block.
2155 2524
2156=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2157 2526
2209 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2210 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2211 2580
2212 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2215 2584
2216 $map->load; 2585 $map->load;
2217 $map->load_diag; 2586 $map->load_neighbours;
2218 2587
2219 return unless $self->contr->active; 2588 return unless $self->contr->active;
2220 $self->activate_recursive;
2221 2589
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2224}
2225 2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2595}
2596
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2598
2228Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2601that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2602the new (success) or old (failed) map position. In either case, $done will
2603be called at the end of this process.
2604
2605Note that $check will be called with a potentially non-loaded map, so if
2606it needs a loaded map it has to call C<< ->load >>.
2232 2607
2233=cut 2608=cut
2234 2609
2235our $GOTOGEN; 2610our $GOTOGEN;
2236 2611
2237sub cf::object::player::goto { 2612sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2613 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2614
2240 # do generation counting so two concurrent goto's will be executed in-order 2615 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2617
2243 $self->enter_link; 2618 $self->enter_link;
2244 2619
2245 (async { 2620 (async {
2621 $Coro::current->{desc} = "player::goto $path $x $y";
2622
2623 # *tag paths override both path and x|y
2624 if ($path =~ /^\*(.*)$/) {
2625 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2626 my $ob = $obs[rand @obs];
2627
2628 # see if we actually can go there
2629 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2630 $ob = $obs[rand @obs];
2631 } else {
2632 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2633 }
2634 # else put us there anyways for now #d#
2635
2636 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2637 } else {
2638 ($path, $x, $y) = (undef, undef, undef);
2639 }
2640 }
2641
2246 my $map = eval { 2642 my $map = eval {
2247 my $map = cf::map::find $path; 2643 my $map = defined $path ? cf::map::find $path : undef;
2248 2644
2249 if ($map) { 2645 if ($map) {
2250 $map = $map->customise_for ($self); 2646 $map = $map->customise_for ($self);
2251 $map = $check->($map) if $check && $map; 2647 $map = $check->($map) if $check && $map;
2252 } else { 2648 } else {
2253 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2254 } 2650 }
2255 2651
2256 $map 2652 $map
2257 }; 2653 };
2258 2654
2263 2659
2264 if ($gen == $self->{_goto_generation}) { 2660 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2661 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2662 $self->leave_link ($map, $x, $y);
2267 } 2663 }
2664
2665 $done->() if $done;
2268 })->prio (1); 2666 })->prio (1);
2269} 2667}
2270 2668
2271=item $player_object->enter_exit ($exit_object) 2669=item $player_object->enter_exit ($exit_object)
2272 2670
2292} 2690}
2293 2691
2294sub prepare_random_map { 2692sub prepare_random_map {
2295 my ($exit) = @_; 2693 my ($exit) = @_;
2296 2694
2297 my $guard = cf::lock_acquire "exit_prepare:$exit";
2298
2299 # all this does is basically replace the /! path by 2695 # all this does is basically replace the /! path by
2300 # a new random map path (?random/...) with a seed 2696 # a new random map path (?random/...) with a seed
2301 # that depends on the exit object 2697 # that depends on the exit object
2302 2698
2303 my $rmp = parse_random_map_params $exit->msg; 2699 my $rmp = parse_random_map_params $exit->msg;
2305 if ($exit->map) { 2701 if ($exit->map) {
2306 $rmp->{region} = $exit->region->name; 2702 $rmp->{region} = $exit->region->name;
2307 $rmp->{origin_map} = $exit->map->path; 2703 $rmp->{origin_map} = $exit->map->path;
2308 $rmp->{origin_x} = $exit->x; 2704 $rmp->{origin_x} = $exit->x;
2309 $rmp->{origin_y} = $exit->y; 2705 $rmp->{origin_y} = $exit->y;
2706
2707 $exit->map->touch;
2310 } 2708 }
2311 2709
2312 $rmp->{random_seed} ||= $exit->random_seed; 2710 $rmp->{random_seed} ||= $exit->random_seed;
2313 2711
2314 my $data = cf::to_json $rmp; 2712 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2315 my $md5 = Digest::MD5::md5_hex $data; 2713 my $md5 = Digest::MD5::md5_hex $data;
2316 my $meta = "$RANDOMDIR/$md5.meta"; 2714 my $meta = "$RANDOMDIR/$md5.meta";
2317 2715
2318 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2716 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2319 aio_write $fh, 0, (length $data), $data, 0; 2717 aio_write $fh, 0, (length $data), $data, 0;
2320 undef $fh; 2718 undef $fh;
2321 aio_rename "$meta~", $meta; 2719 aio_rename "$meta~", $meta;
2322 2720
2721 my $slaying = "?random/$md5";
2722
2723 if ($exit->valid) {
2323 $exit->slaying ("?random/$md5"); 2724 $exit->slaying ("?random/$md5");
2324 $exit->msg (undef); 2725 $exit->msg (undef);
2726 }
2325 } 2727 }
2326} 2728}
2327 2729
2328sub cf::object::player::enter_exit { 2730sub cf::object::player::enter_exit {
2329 my ($self, $exit) = @_; 2731 my ($self, $exit) = @_;
2330 2732
2331 return unless $self->type == cf::PLAYER; 2733 return unless $self->type == cf::PLAYER;
2332 2734
2333 if ($exit->slaying eq "/!") {
2334 #TODO: this should de-fi-ni-te-ly not be a sync-job
2335 # the problem is that $exit might not survive long enough
2336 # so it needs to be done right now, right here
2337 cf::sync_job { prepare_random_map $exit };
2338 }
2339
2340 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2341 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp;
2343
2344 $self->enter_link; 2735 $self->enter_link;
2345 2736
2346 (async { 2737 (async {
2347 $self->deactivate_recursive; # just to be sure 2738 $Coro::current->{desc} = "enter_exit";
2739
2348 unless (eval { 2740 unless (eval {
2741 $self->deactivate_recursive; # just to be sure
2742
2743 # random map handling
2744 {
2745 my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747 prepare_random_map $exit
2748 if $exit->slaying eq "/!";
2749 }
2750
2751 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2752 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp;
2754
2349 $self->goto ($slaying, $hp, $sp); 2755 $self->goto ($map, $x, $y);
2350 2756
2757 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y)
2759 if $exit->flag (cf::FLAG_DAMNED);
2760
2351 1; 2761 1
2352 }) { 2762 }) {
2353 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2354 . "I'll try to bring you back to the map you were before. " 2764 . "I'll try to bring you back to the map you were before. "
2355 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2356 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2357 2767
2358 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2377 2787
2378 utf8::encode $text; 2788 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2790}
2381 2791
2792=item $client->send_big_packet ($pkt)
2793
2794Like C<send_packet>, but tries to compress large packets, and fragments
2795them as required.
2796
2797=cut
2798
2799our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2800
2801sub cf::client::send_big_packet {
2802 my ($self, $pkt) = @_;
2803
2804 # try lzf for large packets
2805 $pkt = "lzf " . Compress::LZF::compress $pkt
2806 if 1024 <= length $pkt and $self->{can_lzf};
2807
2808 # split very large packets
2809 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2810 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2811 $pkt = "frag";
2812 }
2813
2814 $self->send_packet ($pkt);
2815}
2816
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2818
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2819Send a drawinfo or msg packet to the client, formatting the msg for the
2385client if neccessary. C<$type> should be a string identifying the type of 2820client if neccessary. C<$type> should be a string identifying the type of
2386the message, with C<log> being the default. If C<$color> is negative, suppress 2821the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 2822the message unless the client supports the msg packet.
2388 2823
2389=cut 2824=cut
2390 2825
2826# non-persistent channels (usually the info channel)
2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2834 "c/identify" => {
2835 id => "infobox",
2836 title => "Identify",
2837 reply => undef,
2838 tooltip => "Items recently identified",
2839 },
2840 "c/examine" => {
2841 id => "infobox",
2842 title => "Examine",
2843 reply => undef,
2844 tooltip => "Signs and other items you examined",
2845 },
2846 "c/shopinfo" => {
2847 id => "infobox",
2848 title => "Shop Info",
2849 reply => undef,
2850 tooltip => "What your bargaining skill tells you about the shop",
2851 },
2852 "c/book" => {
2853 id => "infobox",
2854 title => "Book",
2855 reply => undef,
2856 tooltip => "The contents of a note or book",
2857 },
2858 "c/lookat" => {
2859 id => "infobox",
2860 title => "Look",
2861 reply => undef,
2862 tooltip => "What you saw there",
2863 },
2864 "c/who" => {
2865 id => "infobox",
2866 title => "Players",
2867 reply => undef,
2868 tooltip => "Shows players who are currently online",
2869 },
2870 "c/body" => {
2871 id => "infobox",
2872 title => "Body Parts",
2873 reply => undef,
2874 tooltip => "Shows which body parts you posess and are available",
2875 },
2876 "c/statistics" => {
2877 id => "infobox",
2878 title => "Statistics",
2879 reply => undef,
2880 tooltip => "Shows your primary statistics",
2881 },
2882 "c/skills" => {
2883 id => "infobox",
2884 title => "Skills",
2885 reply => undef,
2886 tooltip => "Shows your experience per skill and item power",
2887 },
2888 "c/shopitems" => {
2889 id => "infobox",
2890 title => "Shop Items",
2891 reply => undef,
2892 tooltip => "Shows the items currently for sale in this shop",
2893 },
2894 "c/resistances" => {
2895 id => "infobox",
2896 title => "Resistances",
2897 reply => undef,
2898 tooltip => "Shows your resistances",
2899 },
2900 "c/pets" => {
2901 id => "infobox",
2902 title => "Pets",
2903 reply => undef,
2904 tooltip => "Shows information abotu your pets/a specific pet",
2905 },
2906 "c/perceiveself" => {
2907 id => "infobox",
2908 title => "Perceive Self",
2909 reply => undef,
2910 tooltip => "You gained detailed knowledge about yourself",
2911 },
2912 "c/uptime" => {
2913 id => "infobox",
2914 title => "Uptime",
2915 reply => undef,
2916 tooltip => "How long the server has been running since last restart",
2917 },
2918 "c/mapinfo" => {
2919 id => "infobox",
2920 title => "Map Info",
2921 reply => undef,
2922 tooltip => "Information related to the maps",
2923 },
2924 "c/party" => {
2925 id => "party",
2926 title => "Party",
2927 reply => "gsay ",
2928 tooltip => "Messages and chat related to your party",
2929 },
2930 "c/death" => {
2931 id => "death",
2932 title => "Death",
2933 reply => undef,
2934 tooltip => "Reason for and more info about your most recent death",
2935 },
2936 "c/say" => $SAY_CHANNEL,
2937 "c/chat" => $CHAT_CHANNEL,
2938);
2939
2391sub cf::client::send_msg { 2940sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2942
2394 $msg = $self->pl->expand_cfpod ($msg); 2943 $msg = $self->pl->expand_cfpod ($msg)
2944 unless $color & cf::NDI_VERBATIM;
2395 2945
2396 if ($self->can_msg) { 2946 $color &= cf::NDI_CLIENT_MASK; # just in case...
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2398 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408 2947
2409 if ($color >= 0) { 2948 # check predefined channels, for the benefit of C
2410 if (0 && $msg =~ /\[/) { 2949 if ($CHANNEL{$channel}) {
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2950 $channel = $CHANNEL{$channel};
2412 } else { 2951
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2952 $self->ext_msg (channel_info => $channel);
2414 $self->send_packet ("drawinfo $color $msg") 2953 $channel = $channel->{id};
2954
2955 } elsif (ref $channel) {
2956 # send meta info to client, if not yet sent
2957 unless (exists $self->{channel}{$channel->{id}}) {
2958 $self->{channel}{$channel->{id}} = $channel;
2959 $self->ext_msg (channel_info => $channel);
2415 } 2960 }
2416 }
2417 }
2418}
2419 2961
2962 $channel = $channel->{id};
2963 }
2964
2965 return unless @extra || length $msg;
2966
2967 # default colour, mask it out
2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2969 if $color & cf::NDI_DEF;
2970
2971 my $pkt = "msg "
2972 . $self->{json_coder}->encode (
2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2974 );
2975
2976 $self->send_big_packet ($pkt);
2977}
2978
2420=item $client->ext_event ($type, %msg) 2979=item $client->ext_msg ($type, @msg)
2421 2980
2422Sends an ext event to the client. 2981Sends an ext event to the client.
2423 2982
2424=cut 2983=cut
2425 2984
2426sub cf::client::ext_event($$%) { 2985sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2986 my ($self, $type, @msg) = @_;
2428 2987
2988 if ($self->extcmd == 2) {
2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2990 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2991 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2993 }
2994}
2995
2996=item $client->ext_reply ($msgid, @msg)
2997
2998Sends an ext reply to the client.
2999
3000=cut
3001
3002sub cf::client::ext_reply($$@) {
3003 my ($self, $id, @msg) = @_;
3004
3005 if ($self->extcmd == 2) {
3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3007 } elsif ($self->extcmd == 1) {
3008 #TODO: version 1, remove
3009 unshift @msg, msgtype => "reply", msgid => $id;
3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3011 }
2431} 3012}
2432 3013
2433=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2434 3015
2435Queues a query to the client, calling the given callback with 3016Queues a query to the client, calling the given callback with
2458 3039
2459 1 3040 1
2460} 3041}
2461 3042
2462cf::client->attach ( 3043cf::client->attach (
3044 on_connect => sub {
3045 my ($ns) = @_;
3046
3047 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3048 },
2463 on_reply => sub { 3049 on_reply => sub {
2464 my ($ns, $msg) = @_; 3050 my ($ns, $msg) = @_;
2465 3051
2466 # this weird shuffling is so that direct followup queries 3052 # this weird shuffling is so that direct followup queries
2467 # get handled first 3053 # get handled first
2482 } 3068 }
2483 }, 3069 },
2484 on_exticmd => sub { 3070 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 3071 my ($ns, $buf) = @_;
2486 3072
2487 my $msg = eval { from_json $buf }; 3073 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 3074
2489 if (ref $msg) { 3075 if (ref $msg) {
3076 my ($type, $reply, @payload) =
3077 "ARRAY" eq ref $msg
3078 ? @$msg
3079 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3080
3081 my @reply;
3082
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3083 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 3084 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 3085 }
3086
3087 $ns->ext_reply ($reply, @reply)
3088 if $reply;
3089
2496 } else { 3090 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3091 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 3092 }
2499 3093
2500 cf::override; 3094 cf::override;
2547our $safe = new Safe "safe"; 3141our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 3142our $safe_hole = new Safe::Hole;
2549 3143
2550$SIG{FPE} = 'IGNORE'; 3144$SIG{FPE} = 'IGNORE';
2551 3145
2552$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3146$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math
3148 grepstart grepwhile mapstart mapwhile
3149 sort time
3150));
2553 3151
2554# here we export the classes and methods available to script code 3152# here we export the classes and methods available to script code
2555 3153
2556=pod 3154=pod
2557 3155
2558The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
2559 3157
2560 cf::object contr pay_amount pay_player map 3158 cf::object
3159 contr pay_amount pay_player map x y force_find force_add destroy
3160 insert remove name archname title slaying race decrease split
3161 value
3162
2561 cf::object::player player 3163 cf::object::player
2562 cf::player peaceful 3164 player
2563 cf::map trigger 3165
3166 cf::player
3167 peaceful
3168
3169 cf::map
3170 trigger
2564 3171
2565=cut 3172=cut
2566 3173
2567for ( 3174for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 3175 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3176 insert remove inv nrof name archname title slaying race
3177 decrease split destroy change_exp value msg lore send_msg)],
2569 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
2571 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
2572) { 3181) {
2573 no strict 'refs'; 3182 no strict 'refs';
2574 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
2575 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2592 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
2593 3202
2594 my $qcode = $code; 3203 my $qcode = $code;
2595 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2596 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
2597 3208
2598 local $_; 3209 local $_;
2599 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
2600 3211
2601 my $eval = 3212 my $eval =
2649# the server's init and main functions 3260# the server's init and main functions
2650 3261
2651sub load_facedata($) { 3262sub load_facedata($) {
2652 my ($path) = @_; 3263 my ($path) = @_;
2653 3264
3265 # HACK to clear player env face cache, we need some signal framework
3266 # for this (global event?)
3267 %ext::player_env::MUSIC_FACE_CACHE = ();
3268
3269 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270
2654 warn "loading facedata from $path\n"; 3271 warn "loading facedata from $path\n";
2655 3272
2656 my $facedata; 3273 my $facedata;
2657 0 < aio_load $path, $facedata 3274 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 3275 or die "$path: $!";
2660 $facedata = Coro::Storable::thaw $facedata; 3277 $facedata = Coro::Storable::thaw $facedata;
2661 3278
2662 $facedata->{version} == 2 3279 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 3280 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 3281
3282 # patch in the exptable
3283 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC,
3285 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3286 };
3287 cf::cede_to_tick;
3288
2665 { 3289 {
2666 my $faces = $facedata->{faceinfo}; 3290 my $faces = $facedata->{faceinfo};
2667 3291
2668 while (my ($face, $info) = each %$faces) { 3292 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3293 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3295 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 3299
3300 cf::cede_to_tick;
2674 } 3301 }
2675 3302
2676 while (my ($face, $info) = each %$faces) { 3303 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 3304 next unless $info->{smooth};
3305
2678 my $idx = cf::face::find $face 3306 my $idx = cf::face::find $face
2679 or next; 3307 or next;
3308
2680 if (my $smooth = cf::face::find $info->{smooth}) { 3309 if (my $smooth = cf::face::find $info->{smooth}) {
3310 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 3312 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3313 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 3314 }
2685 Coro::cede; 3315
3316 cf::cede_to_tick;
2686 } 3317 }
2687 } 3318 }
2688 3319
2689 { 3320 {
2690 my $anims = $facedata->{animinfo}; 3321 my $anims = $facedata->{animinfo};
2691 3322
2692 while (my ($anim, $info) = each %$anims) { 3323 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3324 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 3325 cf::cede_to_tick;
2695 } 3326 }
2696 3327
2697 cf::anim::invalidate_all; # d'oh 3328 cf::anim::invalidate_all; # d'oh
2698 } 3329 }
2699 3330
3331 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource};
3335
3336 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) {
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340
3341 if ($info->{type} & 1) {
3342 # prepend meta info
3343
3344 my $meta = $enc->encode ({
3345 name => $name,
3346 %{ $info->{meta} || {} },
3347 });
3348
3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type};
3356 } else {
3357 $RESOURCE{$name} = $info;
3358 }
3359
3360 cf::cede_to_tick;
3361 }
3362 }
3363
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365
2700 1 3366 1
2701} 3367}
2702 3368
3369cf::global->attach (on_resource_update => sub {
3370 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374 my $sound = $soundconf->{compat}[$_]
3375 or next;
3376
3377 my $face = cf::face::find "sound/$sound->[1]";
3378 cf::sound::set $sound->[0] => $face;
3379 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380 }
3381
3382 while (my ($k, $v) = each %{$soundconf->{event}}) {
3383 my $face = cf::face::find "sound/$v";
3384 cf::sound::set $k => $face;
3385 }
3386 }
3387});
3388
3389register_exticmd fx_want => sub {
3390 my ($ns, $want) = @_;
3391
3392 while (my ($k, $v) = each %$want) {
3393 $ns->fx_want ($k, $v);
3394 }
3395};
3396
3397sub load_resource_file($) {
3398 my $guard = lock_acquire "load_resource_file";
3399
3400 my $status = load_resource_file_ $_[0];
3401 get_slot 0.1, 100;
3402 cf::arch::commit_load;
3403
3404 $status
3405}
3406
2703sub reload_regions { 3407sub reload_regions {
3408 # HACK to clear player env face cache, we need some signal framework
3409 # for this (global event?)
3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3411
2704 load_resource_file "$MAPDIR/regions" 3412 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 3413 or die "unable to load regions file\n";
3414
3415 for (cf::region::list) {
3416 $_->{match} = qr/$_->{match}/
3417 if exists $_->{match};
3418 }
2706} 3419}
2707 3420
2708sub reload_facedata { 3421sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3422 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3423 or die "unable to load facedata\n";
2721} 3434}
2722 3435
2723sub reload_resources { 3436sub reload_resources {
2724 warn "reloading resource files...\n"; 3437 warn "reloading resource files...\n";
2725 3438
3439 reload_facedata;
3440 reload_archetypes;
2726 reload_regions; 3441 reload_regions;
2727 reload_facedata;
2728 #reload_archetypes;#d#
2729 reload_archetypes;
2730 reload_treasures; 3442 reload_treasures;
2731 3443
2732 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
2733} 3445}
2734 3446
2735sub init { 3447sub reload_config {
2736 reload_resources; 3448 warn "reloading config file...\n";
2737}
2738 3449
2739sub cfg_load {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3451 or return;
2742 3452
2743 local $/; 3453 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
2745 3455
2746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2747 3457
2748 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2749 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2753 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2754 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
2755 }; 3465 };
2756 warn $@ if $@; 3466 warn $@ if $@;
2757 } 3467 }
3468
3469 warn "finished reloading resource files\n";
3470}
3471
3472sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!";
3475 flock $fh, &Fcntl::LOCK_EX
3476 or die "$PIDFILE: flock: $!";
3477 $fh
3478}
3479
3480# make sure only one server instance is running at any one time
3481sub atomic {
3482 my $fh = pidfile;
3483
3484 my $pid = <$fh>;
3485 kill 9, $pid if $pid > 0;
3486
3487 seek $fh, 0, 0;
3488 print $fh $$;
3489}
3490
3491sub main_loop {
3492 warn "EV::loop starting\n";
3493 if (1) {
3494 EV::loop;
3495 }
3496 warn "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP;
2758} 3498}
2759 3499
2760sub main { 3500sub main {
3501 cf::init_globals; # initialise logging
3502
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514
2761 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
2762 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
2763 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3517 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2764 (async { 3518 (async {
2765 Event::one_event; 3519 $Coro::current->{desc} = "IDLE BUG HANDLER";
3520 EV::loop EV::LOOP_ONESHOT;
2766 })->prio (Coro::PRIO_MAX); 3521 })->prio (Coro::PRIO_MAX);
2767 }; 3522 };
2768 3523
2769 cfg_load; 3524 evthread_start IO::AIO::poll_fileno;
3525
3526 cf::sync_job {
3527 reload_resources;
3528 reload_config;
2770 db_init; 3529 db_init;
3530
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid;
3534 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills;
3537
3538 cf::init_beforeplay;
3539
3540 atomic;
3541
2771 load_extensions; 3542 load_extensions;
2772 3543
2773 $TICK_WATCHER->start; 3544 utime time, time, $RUNTIMEFILE;
2774 Event::loop; 3545
3546 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549
3550 (pop @POST_INIT)->(0) while @POST_INIT;
3551 };
3552
3553 main_loop;
2775} 3554}
2776 3555
2777############################################################################# 3556#############################################################################
2778# initialisation and cleanup 3557# initialisation and cleanup
2779 3558
2780# install some emergency cleanup handlers 3559# install some emergency cleanup handlers
2781BEGIN { 3560BEGIN {
3561 our %SIGWATCHER = ();
2782 for my $signal (qw(INT HUP TERM)) { 3562 for my $signal (qw(INT HUP TERM)) {
2783 Event->signal ( 3563 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2784 reentrant => 0,
2785 data => WF_AUTOCANCEL,
2786 signal => $signal,
2787 prio => 0,
2788 cb => sub {
2789 cf::cleanup "SIG$signal"; 3564 cf::cleanup "SIG$signal";
2790 },
2791 ); 3565 };
2792 } 3566 }
2793} 3567}
2794 3568
2795sub write_runtime { 3569sub write_runtime_sync {
2796 my $runtime = "$LOCALDIR/runtime";
2797
2798 # first touch the runtime file to show we are still running: 3570 # first touch the runtime file to show we are still running:
2799 # the fsync below can take a very very long time. 3571 # the fsync below can take a very very long time.
2800 3572
2801 IO::AIO::aio_utime $runtime, undef, undef; 3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2802 3574
2803 my $guard = cf::lock_acquire "write_runtime"; 3575 my $guard = cf::lock_acquire "write_runtime";
2804 3576
2805 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2806 or return; 3578 or return;
2807 3579
2808 my $value = $cf::RUNTIME + 90 + 10; 3580 my $value = $cf::RUNTIME + 90 + 10;
2809 # 10 is the runtime save interval, for a monotonic clock 3581 # 10 is the runtime save interval, for a monotonic clock
2810 # 60 allows for the watchdog to kill the server. 3582 # 60 allows for the watchdog to kill the server.
2820 aio_utime $fh, undef, undef; 3592 aio_utime $fh, undef, undef;
2821 3593
2822 close $fh 3594 close $fh
2823 or return; 3595 or return;
2824 3596
2825 aio_rename "$runtime~", $runtime 3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2826 and return; 3598 and return;
2827 3599
2828 warn "runtime file written.\n"; 3600 warn "runtime file written.\n";
2829 3601
2830 1 3602 1
3603}
3604
3605our $uuid_lock;
3606our $uuid_skip;
3607
3608sub write_uuid_sync($) {
3609 $uuid_skip ||= $_[0];
3610
3611 return if $uuid_lock;
3612 local $uuid_lock = 1;
3613
3614 my $uuid = "$LOCALDIR/uuid";
3615
3616 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3617 or return;
3618
3619 my $value = uuid_seq uuid_cur;
3620
3621 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n";
3623 return;
3624 }
3625
3626 my $value = uuid_str $value + $uuid_skip;
3627 $uuid_skip = 0;
3628
3629 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3630 and return;
3631
3632 # always fsync - this file is important
3633 aio_fsync $fh
3634 and return;
3635
3636 close $fh
3637 or return;
3638
3639 aio_rename "$uuid~", $uuid
3640 and return;
3641
3642 warn "uuid file written ($value).\n";
3643
3644 1
3645
3646}
3647
3648sub write_uuid($$) {
3649 my ($skip, $sync) = @_;
3650
3651 $sync ? write_uuid_sync $skip
3652 : async { write_uuid_sync $skip };
2831} 3653}
2832 3654
2833sub emergency_save() { 3655sub emergency_save() {
2834 my $freeze_guard = cf::freeze_mainloop; 3656 my $freeze_guard = cf::freeze_mainloop;
2835 3657
2836 warn "enter emergency perl save\n"; 3658 warn "emergency_perl_save: enter\n";
2837 3659
2838 cf::sync_job { 3660 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so
3662 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0;
3665
2839 # use a peculiar iteration method to avoid tripping on perl 3666 # use a peculiar iteration method to avoid tripping on perl
2840 # refcount bugs in for. also avoids problems with players 3667 # refcount bugs in for. also avoids problems with players
2841 # and maps saved/destroyed asynchronously. 3668 # and maps saved/destroyed asynchronously.
2842 warn "begin emergency player save\n"; 3669 warn "emergency_perl_save: begin player save\n";
2843 for my $login (keys %cf::PLAYER) { 3670 for my $login (keys %cf::PLAYER) {
2844 my $pl = $cf::PLAYER{$login} or next; 3671 my $pl = $cf::PLAYER{$login} or next;
2845 $pl->valid or next; 3672 $pl->valid or next;
3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846 $pl->save; 3674 $pl->save;
2847 } 3675 }
2848 warn "end emergency player save\n"; 3676 warn "emergency_perl_save: end player save\n";
2849 3677
2850 warn "begin emergency map save\n"; 3678 warn "emergency_perl_save: begin map save\n";
2851 for my $path (keys %cf::MAP) { 3679 for my $path (keys %cf::MAP) {
2852 my $map = $cf::MAP{$path} or next; 3680 my $map = $cf::MAP{$path} or next;
2853 $map->valid or next; 3681 $map->valid or next;
2854 $map->save; 3682 $map->save;
2855 } 3683 }
2856 warn "end emergency map save\n"; 3684 warn "emergency_perl_save: end map save\n";
2857 3685
2858 warn "begin emergency database checkpoint\n"; 3686 warn "emergency_perl_save: begin database checkpoint\n";
2859 BDB::db_env_txn_checkpoint $DB_ENV; 3687 BDB::db_env_txn_checkpoint $DB_ENV;
2860 warn "end emergency database checkpoint\n"; 3688 warn "emergency_perl_save: end database checkpoint\n";
3689
3690 warn "emergency_perl_save: begin write uuid\n";
3691 write_uuid_sync 1;
3692 warn "emergency_perl_save: end write uuid\n";
2861 }; 3693 };
2862 3694
3695 warn "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n";
3698 };
3699
2863 warn "leave emergency perl save\n"; 3700 warn "emergency_perl_save: leave\n";
2864} 3701}
2865 3702
2866sub post_cleanup { 3703sub post_cleanup {
2867 my ($make_core) = @_; 3704 my ($make_core) = @_;
2868 3705
2869 warn Carp::longmess "post_cleanup backtrace" 3706 warn Carp::longmess "post_cleanup backtrace"
2870 if $make_core; 3707 if $make_core;
3708
3709 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$;
3711}
3712
3713# a safer delete_package, copied from Symbol
3714sub clear_package($) {
3715 my $pkg = shift;
3716
3717 # expand to full symbol table name if needed
3718 unless ($pkg =~ /^main::.*::$/) {
3719 $pkg = "main$pkg" if $pkg =~ /^::/;
3720 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3721 $pkg .= '::' unless $pkg =~ /::$/;
3722 }
3723
3724 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3725 my $stem_symtab = *{$stem}{HASH};
3726
3727 defined $stem_symtab and exists $stem_symtab->{$leaf}
3728 or return;
3729
3730 # clear all symbols
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 }
3736 warn "cleared package $pkg\n";#d#
2871} 3737}
2872 3738
2873sub do_reload_perl() { 3739sub do_reload_perl() {
2874 # can/must only be called in main 3740 # can/must only be called in main
2875 if ($Coro::current != $Coro::main) { 3741 if ($Coro::current != $Coro::main) {
2876 warn "can only reload from main coroutine"; 3742 warn "can only reload from main coroutine";
2877 return; 3743 return;
2878 } 3744 }
2879 3745
3746 return if $RELOAD++;
3747
3748 my $t1 = EV::time;
3749
3750 while ($RELOAD) {
2880 warn "reloading..."; 3751 warn "reloading...";
2881 3752
2882 warn "entering sync_job"; 3753 warn "entering sync_job";
2883 3754
2884 cf::sync_job { 3755 cf::sync_job {
2885 cf::write_runtime; # external watchdog should not bark 3756 cf::write_runtime_sync; # external watchdog should not bark
2886 cf::emergency_save; 3757 cf::emergency_save;
2887 cf::write_runtime; # external watchdog should not bark 3758 cf::write_runtime_sync; # external watchdog should not bark
2888 3759
2889 warn "syncing database to disk"; 3760 warn "syncing database to disk";
2890 BDB::db_env_txn_checkpoint $DB_ENV; 3761 BDB::db_env_txn_checkpoint $DB_ENV;
2891 3762
2892 # if anything goes wrong in here, we should simply crash as we already saved 3763 # if anything goes wrong in here, we should simply crash as we already saved
2893 3764
2894 warn "cancelling all WF_AUTOCANCEL watchers";
2895 for (Event::all_watchers) {
2896 $_->cancel if $_->data & WF_AUTOCANCEL;
2897 }
2898
2899 warn "flushing outstanding aio requests"; 3765 warn "flushing outstanding aio requests";
2900 for (;;) {
2901 BDB::flush;
2902 IO::AIO::flush;
2903 Coro::cede;
2904 last unless IO::AIO::nreqs || BDB::nreqs; 3766 while (IO::AIO::nreqs || BDB::nreqs) {
2905 warn "iterate..."; 3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2906 }
2907
2908 ++$RELOAD;
2909
2910 warn "cancelling all extension coros";
2911 $_->cancel for values %EXT_CORO;
2912 %EXT_CORO = ();
2913
2914 warn "removing commands";
2915 %COMMAND = ();
2916
2917 warn "removing ext/exti commands";
2918 %EXTCMD = ();
2919 %EXTICMD = ();
2920
2921 warn "unloading/nuking all extensions";
2922 for my $pkg (@EXTS) {
2923 warn "... unloading $pkg";
2924
2925 if (my $cb = $pkg->can ("unload")) {
2926 eval {
2927 $cb->($pkg);
2928 1
2929 } or warn "$pkg unloaded, but with errors: $@";
2930 } 3768 }
2931 3769
2932 warn "... nuking $pkg"; 3770 warn "cancelling all extension coros";
2933 Symbol::delete_package $pkg; 3771 $_->cancel for values %EXT_CORO;
2934 } 3772 %EXT_CORO = ();
2935 3773
2936 warn "unloading all perl modules loaded from $LIBDIR"; 3774 warn "removing commands";
2937 while (my ($k, $v) = each %INC) { 3775 %COMMAND = ();
2938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2939 3776
3777 warn "removing ext/exti commands";
3778 %EXTCMD = ();
3779 %EXTICMD = ();
3780
3781 warn "unloading/nuking all extensions";
3782 for my $pkg (@EXTS) {
2940 warn "... unloading $k"; 3783 warn "... unloading $pkg";
2941 delete $INC{$k};
2942 3784
2943 $k =~ s/\.pm$//;
2944 $k =~ s/\//::/g;
2945
2946 if (my $cb = $k->can ("unload_module")) { 3785 if (my $cb = $pkg->can ("unload")) {
3786 eval {
2947 $cb->(); 3787 $cb->($pkg);
3788 1
3789 } or warn "$pkg unloaded, but with errors: $@";
3790 }
3791
3792 warn "... clearing $pkg";
3793 clear_package $pkg;
2948 } 3794 }
2949 3795
2950 Symbol::delete_package $k; 3796 warn "unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799
3800 warn "... unloading $k";
3801 delete $INC{$k};
3802
3803 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g;
3805
3806 if (my $cb = $k->can ("unload_module")) {
3807 $cb->();
3808 }
3809
3810 clear_package $k;
2951 } 3811 }
2952 3812
2953 warn "getting rid of safe::, as good as possible"; 3813 warn "getting rid of safe::, as good as possible";
2954 Symbol::delete_package "safe::$_" 3814 clear_package "safe::$_"
2955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2956 3816
2957 warn "unloading cf.pm \"a bit\""; 3817 warn "unloading cf.pm \"a bit\"";
2958 delete $INC{"cf.pm"}; 3818 delete $INC{"cf.pm"};
2959 delete $INC{"cf/pod.pm"}; 3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2960 3820
2961 # don't, removes xs symbols, too, 3821 # don't, removes xs symbols, too,
2962 # and global variables created in xs 3822 # and global variables created in xs
2963 #Symbol::delete_package __PACKAGE__; 3823 #clear_package __PACKAGE__;
2964 3824
2965 warn "unload completed, starting to reload now"; 3825 warn "unload completed, starting to reload now";
2966 3826
2967 warn "reloading cf.pm"; 3827 warn "reloading cf.pm";
2968 require cf; 3828 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3829 cf::_connect_to_perl_1;
2970 3830
2971 warn "loading config and database again"; 3831 warn "loading config and database again";
2972 cf::cfg_load; 3832 cf::reload_config;
2973 3833
2974 warn "loading extensions"; 3834 warn "loading extensions";
2975 cf::load_extensions; 3835 cf::load_extensions;
2976 3836
3837 if ($REATTACH_ON_RELOAD) {
2977 warn "reattaching attachments to objects/players"; 3838 warn "reattaching attachments to objects/players";
2978 _global_reattach; # objects, sockets 3839 _global_reattach; # objects, sockets
2979 warn "reattaching attachments to maps"; 3840 warn "reattaching attachments to maps";
2980 reattach $_ for values %MAP; 3841 reattach $_ for values %MAP;
2981 warn "reattaching attachments to players"; 3842 warn "reattaching attachments to players";
2982 reattach $_ for values %PLAYER; 3843 reattach $_ for values %PLAYER;
3844 }
2983 3845
3846 warn "running post_init jobs";
3847 (pop @POST_INIT)->(1) while @POST_INIT;
3848
2984 warn "leaving sync_job"; 3849 warn "leaving sync_job";
2985 3850
2986 1 3851 1
2987 } or do { 3852 } or do {
2988 warn $@; 3853 warn $@;
2989 warn "error while reloading, exiting."; 3854 cf::cleanup "error while reloading, exiting.";
2990 exit 1;
2991 }; 3855 };
2992 3856
2993 warn "reloaded"; 3857 warn "reloaded";
3858 --$RELOAD;
3859 }
3860
3861 $t1 = EV::time - $t1;
3862 warn "reload completed in ${t1}s\n";
2994}; 3863};
2995 3864
2996our $RELOAD_WATCHER; # used only during reload 3865our $RELOAD_WATCHER; # used only during reload
2997 3866
2998sub reload_perl() { 3867sub reload_perl() {
2999 # doing reload synchronously and two reloads happen back-to-back, 3868 # doing reload synchronously and two reloads happen back-to-back,
3000 # coro crashes during coro_state_free->destroy here. 3869 # coro crashes during coro_state_free->destroy here.
3001 3870
3002 $RELOAD_WATCHER ||= Event->timer ( 3871 $RELOAD_WATCHER ||= cf::async {
3003 reentrant => 0, 3872 Coro::AIO::aio_wait cache_extensions;
3004 after => 0, 3873
3005 data => WF_AUTOCANCEL, 3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3006 cb => sub {
3007 do_reload_perl; 3875 do_reload_perl;
3008 undef $RELOAD_WATCHER; 3876 undef $RELOAD_WATCHER;
3009 }, 3877 };
3010 ); 3878 };
3011} 3879}
3012 3880
3013register_command "reload" => sub { 3881register_command "reload" => sub {
3014 my ($who, $arg) = @_; 3882 my ($who, $arg) = @_;
3015 3883
3016 if ($who->flag (FLAG_WIZ)) { 3884 if ($who->flag (FLAG_WIZ)) {
3017 $who->message ("reloading server."); 3885 $who->message ("reloading server.");
3886 async {
3887 $Coro::current->{desc} = "perl_reload";
3018 async { reload_perl }; 3888 reload_perl;
3889 };
3019 } 3890 }
3020}; 3891};
3021 3892
3022unshift @INC, $LIBDIR; 3893unshift @INC, $LIBDIR;
3023 3894
3025 3896
3026our @WAIT_FOR_TICK; 3897our @WAIT_FOR_TICK;
3027our @WAIT_FOR_TICK_BEGIN; 3898our @WAIT_FOR_TICK_BEGIN;
3028 3899
3029sub wait_for_tick { 3900sub wait_for_tick {
3030 return unless $TICK_WATCHER->is_active;
3031 return if $Coro::current == $Coro::main; 3901 return if tick_inhibit || $Coro::current == $Coro::main;
3032 3902
3033 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3034 push @WAIT_FOR_TICK, $signal; 3904 push @WAIT_FOR_TICK, $signal;
3035 $signal->wait; 3905 $signal->wait;
3036} 3906}
3037 3907
3038sub wait_for_tick_begin { 3908sub wait_for_tick_begin {
3039 return unless $TICK_WATCHER->is_active;
3040 return if $Coro::current == $Coro::main; 3909 return if tick_inhibit || $Coro::current == $Coro::main;
3041 3910
3042 my $signal = new Coro::Signal; 3911 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK_BEGIN, $signal; 3912 push @WAIT_FOR_TICK_BEGIN, $signal;
3044 $signal->wait; 3913 $signal->wait;
3045} 3914}
3046 3915
3047 my $min = 1e6;#d# 3916sub tick {
3048 my $avg = 10;
3049$TICK_WATCHER = Event->timer (
3050 reentrant => 0,
3051 parked => 1,
3052 prio => 0,
3053 at => $NEXT_TICK || $TICK,
3054 data => WF_AUTOCANCEL,
3055 cb => sub {
3056 if ($Coro::current != $Coro::main) { 3917 if ($Coro::current != $Coro::main) {
3057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3918 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3058 unless ++$bug_warning > 10; 3919 unless ++$bug_warning > 10;
3059 return; 3920 return;
3060 } 3921 }
3061 3922
3062 $NOW = $tick_start = Event::time;
3063
3064 cf::server_tick; # one server iteration 3923 cf::server_tick; # one server iteration
3065 3924
3066 0 && sync_job {#d# 3925 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3067 for(1..10) { 3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3068 my $t = Event::time; 3927 Coro::async_pool {
3069 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3928 $Coro::current->{desc} = "runtime saver";
3070 or die; 3929 write_runtime_sync
3071 3930 or warn "ERROR: unable to write runtime file: $!";
3072 $map->width (50);
3073 $map->height (50);
3074 $map->alloc;
3075 $map->_load_objects ("/tmp/x.map", 1);
3076 my $t = Event::time - $t;
3077
3078 #next unless $t < 0.0013;#d#
3079 if ($t < $min) {
3080 $min = $t;
3081 }
3082 $avg = $avg * 0.99 + $t * 0.01;
3083 }
3084 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085 exit 0;
3086 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087 }; 3931 };
3932 }
3088 3933
3089 $RUNTIME += $TICK;
3090 $NEXT_TICK += $TICK;
3091
3092 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093 $NEXT_RUNTIME_WRITE = $NOW + 10;
3094 Coro::async_pool {
3095 write_runtime
3096 or warn "ERROR: unable to write runtime file: $!";
3097 };
3098 }
3099
3100# my $AFTER = Event::time;
3101# warn $AFTER - $NOW;#d#
3102
3103 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3934 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104 $sig->send; 3935 $sig->send;
3105 } 3936 }
3106 while (my $sig = shift @WAIT_FOR_TICK) { 3937 while (my $sig = shift @WAIT_FOR_TICK) {
3107 $sig->send; 3938 $sig->send;
3108 } 3939 }
3109 3940
3110 $NOW = Event::time; 3941 $LOAD = ($NOW - $TICK_START) / $TICK;
3111
3112 # if we are delayed by four ticks or more, skip them all
3113 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3114
3115 $TICK_WATCHER->at ($NEXT_TICK);
3116 $TICK_WATCHER->start;
3117
3118 $LOAD = ($NOW - $tick_start) / $TICK;
3119 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3942 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120 3943
3121 _post_tick; 3944 if (0) {
3122 3945 if ($NEXT_TICK) {
3123 3946 my $jitter = $TICK_START - $NEXT_TICK;
3947 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948 warn "jitter $JITTER\n";#d#
3949 }
3124 }, 3950 }
3125); 3951}
3126 3952
3127{ 3953{
3128 BDB::max_poll_time $TICK * 0.1; 3954 # configure BDB
3129 $BDB_POLL_WATCHER = Event->io ( 3955
3130 reentrant => 0,
3131 fd => BDB::poll_fileno,
3132 poll => 'r',
3133 prio => 0,
3134 data => WF_AUTOCANCEL,
3135 cb => \&BDB::poll_cb,
3136 );
3137 BDB::min_parallel 8; 3956 BDB::min_parallel 8;
3138 3957 BDB::max_poll_reqs $TICK * 0.1;
3139 BDB::set_sync_prepare { 3958 $AnyEvent::BDB::WATCHER->priority (1);
3140 my $status;
3141 my $current = $Coro::current;
3142 (
3143 sub {
3144 $status = $!;
3145 $current->ready; undef $current;
3146 },
3147 sub {
3148 Coro::schedule while defined $current;
3149 $! = $status;
3150 },
3151 )
3152 };
3153 3959
3154 unless ($DB_ENV) { 3960 unless ($DB_ENV) {
3155 $DB_ENV = BDB::db_env_create; 3961 $DB_ENV = BDB::db_env_create;
3962 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3963 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3964 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3965 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3966 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3156 3967
3157 cf::sync_job { 3968 cf::sync_job {
3158 eval { 3969 eval {
3159 BDB::db_env_open 3970 BDB::db_env_open
3160 $DB_ENV, 3971 $DB_ENV,
3162 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3973 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3163 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3974 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164 0666; 3975 0666;
3165 3976
3166 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3977 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167
3168 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3169 $DB_ENV->set_lk_detect;
3170 }; 3978 };
3171 3979
3172 cf::cleanup "db_env_open(db): $@" if $@; 3980 cf::cleanup "db_env_open(db): $@" if $@;
3173 }; 3981 };
3174 } 3982 }
3983
3984 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3985 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3986 };
3987 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3988 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3989 };
3990 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3991 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3992 };
3175} 3993}
3176 3994
3177{ 3995{
3996 # configure IO::AIO
3997
3178 IO::AIO::min_parallel 8; 3998 IO::AIO::min_parallel 8;
3179
3180 undef $Coro::AIO::WATCHER;
3181 IO::AIO::max_poll_time $TICK * 0.1; 3999 IO::AIO::max_poll_time $TICK * 0.1;
3182 $AIO_POLL_WATCHER = Event->io ( 4000 undef $AnyEvent::AIO::WATCHER;
3183 reentrant => 0,
3184 data => WF_AUTOCANCEL,
3185 fd => IO::AIO::poll_fileno,
3186 poll => 'r',
3187 prio => 6,
3188 cb => \&IO::AIO::poll_cb,
3189 );
3190} 4001}
3191 4002
3192my $_log_backtrace; 4003my $_log_backtrace;
3193 4004
3194sub _log_backtrace { 4005sub _log_backtrace {
3197 $msg =~ s/\n//; 4008 $msg =~ s/\n//;
3198 4009
3199 # limit the # of concurrent backtraces 4010 # limit the # of concurrent backtraces
3200 if ($_log_backtrace < 2) { 4011 if ($_log_backtrace < 2) {
3201 ++$_log_backtrace; 4012 ++$_log_backtrace;
4013 my $perl_bt = Carp::longmess $msg;
3202 async { 4014 async {
4015 $Coro::current->{desc} = "abt $msg";
4016
3203 my @bt = fork_call { 4017 my @bt = fork_call {
3204 @addr = map { sprintf "%x", $_ } @addr; 4018 @addr = map { sprintf "%x", $_ } @addr;
3205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4019 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4020 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3207 or die "addr2line: $!"; 4021 or die "addr2line: $!";
3215 } 4029 }
3216 4030
3217 @funcs 4031 @funcs
3218 }; 4032 };
3219 4033
3220 LOG llevInfo, "[ABT] $msg\n"; 4034 LOG llevInfo, "[ABT] $perl_bt\n";
4035 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3221 LOG llevInfo, "[ABT] $_\n" for @bt; 4036 LOG llevInfo, "[ABT] $_\n" for @bt;
3222 --$_log_backtrace; 4037 --$_log_backtrace;
3223 }; 4038 };
3224 } else { 4039 } else {
3225 LOG llevInfo, "[ABT] $msg\n"; 4040 LOG llevInfo, "[ABT] $msg\n";
3226 LOG llevInfo, "[ABT] [suppressed]\n"; 4041 LOG llevInfo, "[ABT] [suppressed]\n";
3227 } 4042 }
3228} 4043}
3229 4044
3230# load additional modules 4045# load additional modules
3231use cf::pod; 4046require "cf/$_.pm" for @EXTRA_MODULES;
4047cf::_connect_to_perl_2;
3232 4048
3233END { cf::emergency_save } 4049END { cf::emergency_save }
3234 4050
32351 40511
3236 4052

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines