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.267 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.442 by root, Sun Aug 31 09:03:31 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines