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.352 by root, Sun Sep 2 04:57:14 2007 UTC vs.
Revision 1.521 by root, Fri Apr 16 23:28:42 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines