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.304 by root, Wed Jul 11 16:55:18 2007 UTC vs.
Revision 1.432 by root, Mon May 5 22:38:47 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
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
34use Digest::MD5 (); 57use Digest::MD5 ();
35 58
36# configure various modules to our taste 59# configure various modules to our taste
37# 60#
38$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 64
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 66
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 68
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
74 93
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 97our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
82 99
83our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 104our $DB_ENV;
85 105
86our %CFG; 106our %CFG;
87 107
88our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 109our $RUNTIME;
110our $NOW;
90 111
91our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
94 115
95# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 118
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
101 123
102binmode STDOUT; 124binmode STDOUT;
103binmode STDERR; 125binmode STDERR;
104 126
105# read virtual server time, if available 127# read virtual server time, if available
158 180
159The raw value load value from the last tick. 181The raw value load value from the last tick.
160 182
161=item %cf::CFG 183=item %cf::CFG
162 184
163Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 186from wherever your confdir points to.
165 187
166=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
167 189
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 191returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 192per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 193
194=item @cf::INVOKE_RESULTS
195
196This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call.
199
172=back 200=back
173 201
174=cut 202=cut
175 203
176BEGIN { 204BEGIN {
180 $msg .= "\n" 208 $msg .= "\n"
181 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
182 210
183 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184 212
185 utf8::encode $msg;
186 LOG llevError, $msg; 213 LOG llevError, $msg;
187 }; 214 };
188} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
189 231
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206)) { 248)) {
207 no strict 'refs'; 249 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 251}
210 252
211$Event::DIED = sub { 253$EV::DIED = sub {
212 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
213}; 255};
214 256
215############################################################################# 257#############################################################################
216 258
239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
240 $d 282 $d
241 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
242} 284}
243 285
244=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
245 287
246Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
247 289
248=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
249 291
250Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
251 293
252=cut 294=cut
253 295
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 297
256sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
258 300
259=item cf::lock_wait $string 301=item cf::lock_wait $string
260 302
261Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
262 304
265Wait until the given lock is available and then acquires it and returns 307Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
268returned. 310returned.
269 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
270Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
272 317
273=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
274 319
275Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
276 321
277=cut 322=cut
278 323
279our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
280 326
281sub lock_wait($) { 327sub lock_wait($) {
282 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
283 334
284 # wait for lock, if any 335 # wait for lock, if any
285 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 338 Coro::schedule;
293 344
294 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
295 lock_wait $key; 346 lock_wait $key;
296 347
297 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
298 350
299 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
302 } 355 }
303} 356}
304 357
307 360
308 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
309} 362}
310 363
311sub freeze_mainloop { 364sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
313 366
314 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
315 $TICK_WATCHER->start; 368}
369
370=item cf::periodic $interval, $cb
371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
383}
384
385=item cf::get_slot $time[, $priority[, $name]]
386
387Allocate $time seconds of blocking CPU time at priority C<$priority>:
388This call blocks and returns only when you have at least C<$time> seconds
389of cpu time till the next tick. The slot is only valid till the next cede.
390
391The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class.
393
394Useful for short background jobs.
395
396=cut
397
398our @SLOT_QUEUE;
399our $SLOT_QUEUE;
400
401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
405 my $signal = new Coro::Signal;
406
407 while () {
408 next_job:
409 my $avail = cf::till_tick;
410 if ($avail > 0.01) {
411 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) {
413 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send;
415 Coro::cede;
416 goto next_job;
417 }
418 }
419 }
420
421 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait;
425 } else {
426 Coro::schedule;
427 }
316 }; 428 }
317 $TICK_WATCHER->stop; 429};
318 $guard 430
431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
434 my ($time, $pri, $name) = @_;
435
436 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal;
438
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready;
442 $sig->wait;
319} 443}
320 444
321=item cf::async { BLOCK } 445=item cf::async { BLOCK }
322 446
323Currently the same as Coro::async_pool, meaning you cannot use 447Currently the same as Coro::async_pool, meaning you cannot use
328 452
329BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
330 454
331=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
332 456
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 460acceptable.
337 461
338If it must be done, put the blocking parts into C<sync_job>. This will run 462If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
344 468
345sub sync_job(&) { 469sub sync_job(&) {
346 my ($job) = @_; 470 my ($job) = @_;
347 471
348 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
349 my $time = Event::time; 473 my $time = EV::time;
350 474
351 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
353 477
354 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 479
356 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
357 481
358 my $busy = 1; 482 my $busy = 1;
359 my @res; 483 my @res;
360 484
361 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 487 @res = eval { $job->() };
363 warn $@ if $@; 488 warn $@ if $@;
364 undef $busy; 489 undef $busy;
365 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
366 491
367 while ($busy) { 492 while ($busy) {
368 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
369 } 497 }
498 }
370 499
371 $time = Event::time - $time; 500 my $time = EV::time - $time;
372 501
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
377 503
378 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
379 } else { 505 } else {
380 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
381 507
406=item fork_call { }, $args 532=item fork_call { }, $args
407 533
408Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
412 538
413=cut 539=cut
414
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423 540
424sub fork_call(&@) { 541sub fork_call(&@) {
425 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
426 543
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 544 # we seemingly have to make a local copy of the whole thing,
428# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 547
432 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 549 reset_signals;
446 local $SIG{__WARN__}; 550 &$cb
447 local $SIG{__DIE__}; 551 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 552
454 eval { 553 wantarray ? @res : $res[-1]
455 close $fh1; 554}
456 555
457 my @res = eval { $cb->(@args) }; 556=item $coin = coin_from_name $name
458 557
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 558=cut
460 close $fh2;
461 };
462 559
463 warn $@ if $@; 560our %coin_alias = (
464 _exit 0; 561 "silver" => "silvercoin",
465 } 562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
466} 581}
467 582
468=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
469 584
470Returns a single value from the environment database. 585Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
473 588
474Stores the given C<$value> in the family. It can currently store binary 589Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 590data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476 591
592=item $db = cf::db_table "name"
593
594Create and/or open a new database table. The string must not be "db" and must be unique
595within each server.
596
477=cut 597=cut
598
599sub db_table($) {
600 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV;
602
603 eval {
604 $db->set_flags (BDB::CHKSUM);
605
606 utf8::encode $name;
607 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
608 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
609 cf::cleanup "db_open(db): $!" if $!;
610 };
611 cf::cleanup "db_open(db): $@" if $@;
612
613 $db
614}
478 615
479our $DB; 616our $DB;
480 617
481sub db_init { 618sub db_init {
482 unless ($DB) {
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job { 619 cf::sync_job {
486 eval { 620 $DB ||= db_table "db";
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 } 621 };
496} 622}
497 623
498sub db_get($$) { 624sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
500 626
550 if (1) { 676 if (1) {
551 $md5 = 677 $md5 =
552 join "\x00", 678 join "\x00",
553 $processversion, 679 $processversion,
554 map { 680 map {
555 Coro::cede; 681 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 683 } 0.. $#$src;
558 684
559 685
560 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
604attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
606 732
607In the following description, CLASS can be any of C<global>, C<object> 733In the following description, CLASS can be any of C<global>, C<object>
608C<player>, C<client> or C<map> (i.e. the attachable objects in 734C<player>, C<client> or C<map> (i.e. the attachable objects in
609Crossfire TRT). 735Deliantra).
610 736
611=over 4 737=over 4
612 738
613=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
614 740
866 "; 992 ";
867 die if $@; 993 die if $@;
868} 994}
869 995
870our $override; 996our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 997our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 998
873sub override { 999sub override {
874 $override = 1; 1000 $override = 1;
875 @invoke_results = (); 1001 @INVOKE_RESULTS = (@_);
876} 1002}
877 1003
878sub do_invoke { 1004sub do_invoke {
879 my $event = shift; 1005 my $event = shift;
880 my $callbacks = shift; 1006 my $callbacks = shift;
881 1007
882 @invoke_results = (); 1008 @INVOKE_RESULTS = ();
883 1009
884 local $override; 1010 local $override;
885 1011
886 for (@$callbacks) { 1012 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1013 eval { &{$_->[1]} };
896 } 1022 }
897 1023
898 0 1024 0
899} 1025}
900 1026
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1028
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1030
905Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
906 1032
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1033This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 1034removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 1035results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1036
911=back 1037=back
912 1038
913=cut 1039=cut
914 1040
915############################################################################# 1041#############################################################################
916# object support 1042# object support
1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
1077sub _can_merge {
1078 my ($ob1, $ob2) = @_;
1079
1080 ++$SLOW_MERGES;#d#
1081
1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
1084}
917 1085
918sub reattach { 1086sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1088 my ($obj) = @_;
921 1089
942cf::attachable->attach ( 1110cf::attachable->attach (
943 prio => -1000000, 1111 prio => -1000000,
944 on_instantiate => sub { 1112 on_instantiate => sub {
945 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
946 1114
947 $data = from_json $data; 1115 $data = decode_json $data;
948 1116
949 for (@$data) { 1117 for (@$data) {
950 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
951 1119
952 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1136sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
970 1138
971 sync_job { 1139 sync_job {
972 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
975 1144
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
980 close $fh; 1149 aio_close $fh;
981 1150
982 if (@$objs) { 1151 if (@$objs) {
983 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
988 close $fh; 1157 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
990 } 1159 }
991 } else { 1160 } else {
992 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
993 } 1162 }
998 } 1167 }
999 } else { 1168 } else {
1000 aio_unlink $filename; 1169 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1002 } 1171 }
1003 } 1172 };
1004} 1173}
1005 1174
1006sub object_freezer_as_string { 1175sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1008 1177
1020 or return; 1189 or return;
1021 1190
1022 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1193 or return;
1194
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1026 } 1197 }
1027 1198
1199 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1030 return ($data, $av); 1203 ($data, $av)
1031} 1204}
1032 1205
1033=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1034 1207
1035=over 4 1208=over 4
1108 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1109 1282
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1284
1112 if (ref $msg) { 1285 if (ref $msg) {
1286 my ($type, $reply, @payload) =
1287 "ARRAY" eq ref $msg
1288 ? @$msg
1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1290
1291 my @reply;
1292
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1118 } else { 1300 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1302 }
1121 1303
1122 cf::override; 1304 cf::override;
1175 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1176 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1177 1359
1178 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1179 warn $msg; 1361 warn $msg;
1180 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1181 exit 1;
1182 } 1363 }
1183 1364
1184 warn $msg; 1365 warn $msg;
1185 } 1366 }
1186 1367
1211use Coro::AIO; 1392use Coro::AIO;
1212 1393
1213=head3 cf::player 1394=head3 cf::player
1214 1395
1215=over 4 1396=over 4
1397
1398=item cf::player::num_playing
1399
1400Returns the official number of playing players, as per the Crossfire metaserver rules.
1401
1402=cut
1403
1404sub num_playing {
1405 scalar grep
1406 $_->ob->map
1407 && !$_->hidden
1408 && !$_->ob->flag (cf::FLAG_WIZ),
1409 cf::player::list
1410}
1216 1411
1217=item cf::player::find $login 1412=item cf::player::find $login
1218 1413
1219Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1220 1415
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1455
1261 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1457 or return;
1458
1459 my $pl = cf::player::load_pl $f
1460 or return;
1461
1462 local $cf::PLAYER_LOADING{$login} = $pl;
1463 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1264 } 1465 }
1265 } 1466 }
1266} 1467}
1267 1468
1276 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1277 1478
1278 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1280 1481
1482 cf::get_slot 0.01;
1483
1281 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1282 Coro::cede; 1485 cf::cede_to_tick;
1283} 1486}
1284 1487
1285sub new($) { 1488sub new($) {
1286 my ($login) = @_; 1489 my ($login) = @_;
1287 1490
1293 $cf::PLAYER{$login} = $self; 1496 $cf::PLAYER{$login} = $self;
1294 1497
1295 $self 1498 $self
1296} 1499}
1297 1500
1501=item $player->send_msg ($channel, $msg, $color, [extra...])
1502
1503=cut
1504
1505sub send_msg {
1506 my $ns = shift->ns
1507 or return;
1508 $ns->send_msg (@_);
1509}
1510
1298=item $pl->quit_character 1511=item $pl->quit_character
1299 1512
1300Nukes the player without looking back. If logged in, the connection will 1513Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1514be destroyed. May block for a long time.
1302 1515
1310 $pl->{deny_save} = 1; 1523 $pl->{deny_save} = 1;
1311 $pl->password ("*"); # this should lock out the player until we nuked the dir 1524 $pl->password ("*"); # this should lock out the player until we nuked the dir
1312 1525
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1314 $pl->deactivate; 1527 $pl->deactivate;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1530 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1316 $pl->ns->destroy if $pl->ns; 1531 $pl->ns->destroy if $pl->ns;
1317 1532
1318 my $path = playerdir $pl; 1533 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1534 my $temp = "$path~$cf::RUNTIME~deleting~";
1355 or return []; 1570 or return [];
1356 1571
1357 my @logins; 1572 my @logins;
1358 1573
1359 for my $login (@$dirs) { 1574 for my $login (@$dirs) {
1575 my $path = path $login;
1576
1577 # a .pst is a dead give-away for a valid player
1578 # if no pst file found, open and chekc for blocked users
1579 if (aio_stat "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1580 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1581 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1582 $buf !~ /^password -------------$/m or next; # official not-valid tag
1583 }
1363 1584
1364 utf8::decode $login; 1585 utf8::decode $login;
1365 push @logins, $login; 1586 push @logins, $login;
1366 } 1587 }
1367 1588
1400 1621
1401Expand crossfire pod fragments into protocol xml. 1622Expand crossfire pod fragments into protocol xml.
1402 1623
1403=cut 1624=cut
1404 1625
1626use re 'eval';
1627
1628my $group;
1629my $interior; $interior = qr{
1630 # match a pod interior sequence sans C<< >>
1631 (?:
1632 \ (.*?)\ (?{ $group = $^N })
1633 | < (??{$interior}) >
1634 )
1635}x;
1636
1405sub expand_cfpod { 1637sub expand_cfpod {
1406 ((my $self), (local $_)) = @_; 1638 my ($self, $pod) = @_;
1407 1639
1408 # escape & and < 1640 my $xml;
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411 1641
1412 # this is buggy, it needs to properly take care of nested <'s 1642 while () {
1643 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1644 $group = $1;
1413 1645
1414 1 while 1646 $group =~ s/&/&amp;/g;
1415 # replace B<>, I<>, U<> etc. 1647 $group =~ s/</&lt;/g;
1416 s/B<([^\>]*)>/<b>$1<\/b>/ 1648
1417 || s/I<([^\>]*)>/<i>$1<\/i>/ 1649 $xml .= $group;
1418 || s/U<([^\>]*)>/<u>$1<\/u>/ 1650 } elsif ($pod =~ m%\G
1419 # replace G<male|female> tags 1651 ([BCGHITU])
1420 || s{G<([^>|]*)\|([^>]*)>}{ 1652 <
1421 $self->gender ? $2 : $1 1653 (?:
1422 }ge 1654 ([^<>]*) (?{ $group = $^N })
1423 # replace H<hint text> 1655 | < $interior >
1424 || s{H<([^\>]*)>} 1656 )
1657 >
1658 %gcsx
1425 { 1659 ) {
1660 my ($code, $data) = ($1, $group);
1661
1662 if ($code eq "B") {
1663 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1664 } elsif ($code eq "I") {
1665 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1666 } elsif ($code eq "U") {
1667 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1668 } elsif ($code eq "C") {
1669 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1670 } elsif ($code eq "T") {
1671 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1672 } elsif ($code eq "G") {
1673 my ($male, $female) = split /\|/, $data;
1674 $data = $self->gender ? $female : $male;
1675 $xml .= expand_cfpod ($self, $data);
1676 } elsif ($code eq "H") {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1677 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1678 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "") 1679 "")
1429 [$self->{hintmode}] 1680 [$self->{hintmode}];
1681 } else {
1682 $xml .= "error processing '$code($data)' directive";
1430 }ge; 1683 }
1684 } else {
1685 if ($pod =~ /\G(.+)/) {
1686 warn "parse error while expanding $pod (at $1)";
1687 }
1688 last;
1689 }
1690 }
1431 1691
1692 for ($xml) {
1432 # create single paragraphs (very hackish) 1693 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g; 1694 s/(?<=\S)\n(?=\w)/ /g;
1434 1695
1435 # compress some whitespace 1696 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends 1697 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines 1698 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines 1699 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines 1700 s/\n+$//; # ending lines
1701 }
1440 1702
1441 $_ 1703 $xml
1442} 1704}
1705
1706no re 'eval';
1443 1707
1444sub hintmode { 1708sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1709 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1710 $_[0]{hintmode}
1447} 1711}
1448 1712
1449=item $player->ext_reply ($msgid, %msg) 1713=item $player->ext_reply ($msgid, @msg)
1450 1714
1451Sends an ext reply to the player. 1715Sends an ext reply to the player.
1452 1716
1453=cut 1717=cut
1454 1718
1455sub ext_reply($$%) { 1719sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1720 my ($self, $id, @msg) = @_;
1457 1721
1458 $msg{msgid} = $id; 1722 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1723}
1461 1724
1462=item $player->ext_event ($type, %msg) 1725=item $player->ext_msg ($type, @msg)
1463 1726
1464Sends an ext event to the client. 1727Sends an ext event to the client.
1465 1728
1466=cut 1729=cut
1467 1730
1468sub ext_event($$%) { 1731sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1732 my ($self, $type, @msg) = @_;
1470 1733
1471 $self->ns->ext_event ($type, %msg); 1734 $self->ns->ext_msg ($type, @msg);
1472} 1735}
1473 1736
1474=head3 cf::region 1737=head3 cf::region
1475 1738
1476=over 4 1739=over 4
1520our $MAX_RESET = 3600; 1783our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1784our $DEFAULT_RESET = 3000;
1522 1785
1523sub generate_random_map { 1786sub generate_random_map {
1524 my ($self, $rmp) = @_; 1787 my ($self, $rmp) = @_;
1788
1789 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1790
1525 # mit "rum" bekleckern, nicht 1791 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1792 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1793 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1794 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1795 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1619 $self->init; # pass $1 etc. 1885 $self->init; # pass $1 etc.
1620 return $self; 1886 return $self;
1621 } 1887 }
1622 } 1888 }
1623 1889
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1890 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1891 ()
1626} 1892}
1627 1893
1628sub init { 1894sub init {
1629 my ($self) = @_; 1895 my ($self) = @_;
1651 1917
1652# the temporary/swap location 1918# the temporary/swap location
1653sub save_path { 1919sub save_path {
1654 my ($self) = @_; 1920 my ($self) = @_;
1655 1921
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1923 "$TMPDIR/$path.map"
1658} 1924}
1659 1925
1660# the unique path, undef == no special unique path 1926# the unique path, undef == no special unique path
1661sub uniq_path { 1927sub uniq_path {
1662 my ($self) = @_; 1928 my ($self) = @_;
1663 1929
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1931 "$UNIQUEDIR/$path"
1666} 1932}
1667 1933
1668# and all this just because we cannot iterate over 1934# and all this just because we cannot iterate over
1669# all maps in C++... 1935# all maps in C++...
1692 1958
1693sub load_header_from($) { 1959sub load_header_from($) {
1694 my ($self, $path) = @_; 1960 my ($self, $path) = @_;
1695 1961
1696 utf8::encode $path; 1962 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1963 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1964 or return;
1965
1966 $self->_load_header ($f)
1967 or return;
1968
1969 local $MAP_LOADING{$self->{path}} = $self;
1970 $f->resolve_delayed_derefs;
1702 1971
1703 $self->{load_path} = $path; 1972 $self->{load_path} = $path;
1704 1973
1705 1 1974 1
1706} 1975}
1760sub find { 2029sub find {
1761 my ($path, $origin) = @_; 2030 my ($path, $origin) = @_;
1762 2031
1763 $path = normalise $path, $origin && $origin->path; 2032 $path = normalise $path, $origin && $origin->path;
1764 2033
2034 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 2035 cf::lock_wait "map_find:$path";
1766 2036
1767 $cf::MAP{$path} || do { 2037 $cf::MAP{$path} || do {
2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1768 my $guard = cf::lock_acquire "map_find:$path"; 2039 my $guard2 = cf::lock_acquire "map_find:$path";
2040
1769 my $map = new_from_path cf::map $path 2041 my $map = new_from_path cf::map $path
1770 or return; 2042 or return;
1771 2043
1772 $map->{last_save} = $cf::RUNTIME; 2044 $map->{last_save} = $cf::RUNTIME;
1773 2045
1775 or return; 2047 or return;
1776 2048
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2049 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2050 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2051 #$cf::WAIT_FOR_TICK->wait;
2052 undef $guard2;
2053 undef $guard1;
1780 $map->reset; 2054 $map->reset;
1781 undef $guard;
1782 return find $path; 2055 return find $path;
1783 } 2056 }
1784 2057
1785 $cf::MAP{$path} = $map 2058 $cf::MAP{$path} = $map
1786 } 2059 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 2068 local $self->{deny_reset} = 1; # loading can take a long time
1796 2069
1797 my $path = $self->{path}; 2070 my $path = $self->{path};
1798 2071
1799 { 2072 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2073 my $guard = cf::lock_acquire "map_data:$path";
1801 2074
2075 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2076 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2077
1804 $self->in_memory (cf::MAP_LOADING); 2078 $self->in_memory (cf::MAP_LOADING);
1805 2079
1806 $self->alloc; 2080 $self->alloc;
1807 2081
1808 $self->pre_load; 2082 $self->pre_load;
1809 Coro::cede; 2083 cf::cede_to_tick;
1810 2084
2085 my $f = new_from_file cf::object::thawer $self->{load_path};
2086 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2087 $self->_load_objects ($f)
1812 or return; 2088 or return;
1813 2089
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2090 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1815 if delete $self->{load_original}; 2091 if delete $self->{load_original};
1816 2092
1817 if (my $uniq = $self->uniq_path) { 2093 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2094 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2095 unless (aio_stat $uniq) {
2096 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2097 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2098 $self->_load_objects ($f);
2099 $f->resolve_delayed_derefs;
2100 }
1822 } 2101 }
1823 } 2102 }
1824 2103
1825 Coro::cede; 2104 $f->resolve_delayed_derefs;
2105
2106 cf::cede_to_tick;
1826 # now do the right thing for maps 2107 # now do the right thing for maps
1827 $self->link_multipart_objects; 2108 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2109 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2110 unless $self->difficulty;
1830 Coro::cede; 2111 cf::cede_to_tick;
1831 2112
1832 unless ($self->{deny_activate}) { 2113 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2114 $self->decay_objects;
1834 $self->fix_auto_apply; 2115 $self->fix_auto_apply;
1835 $self->update_buttons; 2116 $self->update_buttons;
1836 Coro::cede; 2117 cf::cede_to_tick;
1837 $self->set_darkness_map; 2118 $self->set_darkness_map;
1838 Coro::cede; 2119 cf::cede_to_tick;
1839 $self->activate; 2120 $self->activate;
1840 } 2121 }
1841 2122
2123 $self->{last_save} = $cf::RUNTIME;
2124 $self->last_access ($cf::RUNTIME);
2125
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2126 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2127 }
1844 2128
1845 $self->post_load; 2129 $self->post_load;
1846} 2130}
1847 2131
1856 2140
1857 $self 2141 $self
1858} 2142}
1859 2143
1860# find and load all maps in the 3x3 area around a map 2144# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2145sub load_neighbours {
1862 my ($map) = @_; 2146 my ($map) = @_;
1863 2147
1864 my @diag; # diagonal neighbours 2148 my @neigh; # diagonal neighbours
1865 2149
1866 for (0 .. 3) { 2150 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2151 my $neigh = $map->tile_path ($_)
1868 or next; 2152 or next;
1869 $neigh = find $neigh, $map 2153 $neigh = find $neigh, $map
1870 or next; 2154 or next;
1871 $neigh->load; 2155 $neigh->load;
1872 2156
2157 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2158 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2159 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2160 }
1876 2161
1877 for (@diag) { 2162 for (grep defined $_->[0], @neigh) {
2163 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2164 my $neigh = find $path, $origin
1879 or next; 2165 or next;
1880 $neigh->load; 2166 $neigh->load;
1881 } 2167 }
1882} 2168}
1883 2169
1888} 2174}
1889 2175
1890sub do_load_sync { 2176sub do_load_sync {
1891 my ($map) = @_; 2177 my ($map) = @_;
1892 2178
2179 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2180 if $Coro::current == $Coro::main;
2181
1893 cf::sync_job { $map->load }; 2182 cf::sync_job { $map->load };
1894} 2183}
1895 2184
1896our %MAP_PREFETCH; 2185our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2186our $MAP_PREFETCHER = undef;
1898 2187
1899sub find_async { 2188sub find_async {
1900 my ($path, $origin) = @_; 2189 my ($path, $origin, $load) = @_;
1901 2190
1902 $path = normalise $path, $origin && $origin->{path}; 2191 $path = normalise $path, $origin && $origin->{path};
1903 2192
1904 if (my $map = $cf::MAP{$path}) { 2193 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2194 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2195 }
1907 2196
1908 undef $MAP_PREFETCH{$path}; 2197 $MAP_PREFETCH{$path} |= $load;
2198
1909 $MAP_PREFETCHER ||= cf::async { 2199 $MAP_PREFETCHER ||= cf::async {
2200 $Coro::current->{desc} = "map prefetcher";
2201
1910 while (%MAP_PREFETCH) { 2202 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2203 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2204 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2205 $map->load if $v;
2206 }
1915 2207
1916 delete $MAP_PREFETCH{$path}; 2208 delete $MAP_PREFETCH{$k};
1917 } 2209 }
1918 } 2210 }
1919 undef $MAP_PREFETCHER; 2211 undef $MAP_PREFETCHER;
1920 }; 2212 };
1921 $MAP_PREFETCHER->prio (6); 2213 $MAP_PREFETCHER->prio (6);
1924} 2216}
1925 2217
1926sub save { 2218sub save {
1927 my ($self) = @_; 2219 my ($self) = @_;
1928 2220
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2222
1931 $self->{last_save} = $cf::RUNTIME; 2223 $self->{last_save} = $cf::RUNTIME;
1932 2224
1933 return unless $self->dirty; 2225 return unless $self->dirty;
1934 2226
1940 return if $self->{deny_save}; 2232 return if $self->{deny_save};
1941 2233
1942 local $self->{last_access} = $self->last_access;#d# 2234 local $self->{last_access} = $self->last_access;#d#
1943 2235
1944 cf::async { 2236 cf::async {
2237 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2238 $_->contr->save for $self->players;
1946 }; 2239 };
2240
2241 cf::get_slot 0.02;
1947 2242
1948 if ($uniq) { 2243 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2244 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2245 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2246 } else {
1957 my ($self) = @_; 2252 my ($self) = @_;
1958 2253
1959 # save first because save cedes 2254 # save first because save cedes
1960 $self->save; 2255 $self->save;
1961 2256
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2258
1964 return if $self->players; 2259 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2260 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2261 return if $self->{deny_save};
1967 2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 $self->deactivate;
2266 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2267 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2268}
1971 2269
1972sub reset_at { 2270sub reset_at {
1973 my ($self) = @_; 2271 my ($self) = @_;
1974 2272
2006 if $uniq; 2304 if $uniq;
2007 } 2305 }
2008 2306
2009 delete $cf::MAP{$self->path}; 2307 delete $cf::MAP{$self->path};
2010 2308
2309 $self->deactivate;
2310 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2311 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2312
2015 $self->unlink_save; 2313 $self->unlink_save;
2016 $self->destroy; 2314 $self->destroy;
2017} 2315}
2018 2316
2019my $nuke_counter = "aaaa"; 2317my $nuke_counter = "aaaa";
2020 2318
2021sub nuke { 2319sub nuke {
2022 my ($self) = @_; 2320 my ($self) = @_;
2023 2321
2322 {
2323 my $lock = cf::lock_acquire "map_data:$self->{path}";
2324
2024 delete $cf::MAP{$self->path}; 2325 delete $cf::MAP{$self->path};
2025 2326
2026 $self->unlink_save; 2327 $self->unlink_save;
2027 2328
2028 bless $self, "cf::map"; 2329 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2330 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2331 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2332 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2333 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2334
2034 $cf::MAP{$self->path} = $self; 2335 $cf::MAP{$self->path} = $self;
2336 }
2035 2337
2036 $self->reset; # polite request, might not happen 2338 $self->reset; # polite request, might not happen
2037} 2339}
2038 2340
2039=item $maps = cf::map::tmp_maps 2341=item $maps = cf::map::tmp_maps
2081 2383
2082sub unique_maps() { 2384sub unique_maps() {
2083 [ 2385 [
2084 map { 2386 map {
2085 utf8::decode $_; 2387 utf8::decode $_;
2086 /\.map$/ 2388 s/\.map$//; # TODO future compatibility hack
2389 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2390 ? ()
2087 ? normalise $_ 2391 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2392 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2393 ]
2091} 2394}
2092 2395
2093package cf;
2094
2095=back 2396=back
2096 2397
2097=head3 cf::object 2398=head3 cf::object
2098 2399
2099=cut 2400=cut
2102 2403
2103=over 4 2404=over 4
2104 2405
2105=item $ob->inv_recursive 2406=item $ob->inv_recursive
2106 2407
2107Returns the inventory of the object _and_ their inventories, recursively. 2408Returns the inventory of the object I<and> their inventories, recursively,
2409but I<not> the object itself.
2108 2410
2109=cut 2411=cut
2110 2412
2111sub inv_recursive_; 2413sub inv_recursive_;
2112sub inv_recursive_ { 2414sub inv_recursive_ {
2115 2417
2116sub inv_recursive { 2418sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2419 inv_recursive_ inv $_[0]
2118} 2420}
2119 2421
2422=item $ref = $ob->ref
2423
2424Creates and returns a persistent reference to an object that can be stored as a string.
2425
2426=item $ob = cf::object::deref ($refstring)
2427
2428returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2429even if the object actually exists. May block.
2430
2431=cut
2432
2433sub deref {
2434 my ($ref) = @_;
2435
2436 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2437 my ($uuid, $name) = ($1, $2);
2438 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2439 or return;
2440 $pl->ob->uuid eq $uuid
2441 or return;
2442
2443 $pl->ob
2444 } else {
2445 warn "$ref: cannot resolve object reference\n";
2446 undef
2447 }
2448}
2449
2120package cf; 2450package cf;
2121 2451
2122=back 2452=back
2123 2453
2124=head3 cf::object::player 2454=head3 cf::object::player
2130Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2460Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2131can be C<undef>. Does the right thing when the player is currently in a 2461can be C<undef>. Does the right thing when the player is currently in a
2132dialogue with the given NPC character. 2462dialogue with the given NPC character.
2133 2463
2134=cut 2464=cut
2465
2466our $SAY_CHANNEL = {
2467 id => "say",
2468 title => "Map",
2469 reply => "say ",
2470 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2471};
2472
2473our $CHAT_CHANNEL = {
2474 id => "chat",
2475 title => "Chat",
2476 reply => "chat ",
2477 tooltip => "Player chat and shouts, global to the server.",
2478};
2135 2479
2136# rough implementation of a future "reply" method that works 2480# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2481# with dialog boxes.
2138#TODO: the first argument must go, split into a $npc->reply_to ( method 2482#TODO: the first argument must go, split into a $npc->reply_to ( method
2139sub cf::object::player::reply($$$;$) { 2483sub cf::object::player::reply($$$;$) {
2146 2490
2147 } else { 2491 } else {
2148 my $pl = $self->contr; 2492 my $pl = $self->contr;
2149 2493
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2494 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2495 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2496 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2497
2159 } else { 2498 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2499 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2500 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2501 }
2163 } 2502 }
2503}
2504
2505=item $object->send_msg ($channel, $msg, $color, [extra...])
2506
2507=cut
2508
2509sub cf::object::send_msg {
2510 my $pl = shift->contr
2511 or return;
2512 $pl->send_msg (@_);
2164} 2513}
2165 2514
2166=item $player_object->may ("access") 2515=item $player_object->may ("access")
2167 2516
2168Returns wether the given player is authorized to access resource "access" 2517Returns wether the given player is authorized to access resource "access"
2247 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2598 if $x <=0 && $y <= 0;
2250 2599
2251 $map->load; 2600 $map->load;
2252 $map->load_diag; 2601 $map->load_neighbours;
2253 2602
2254 return unless $self->contr->active; 2603 return unless $self->contr->active;
2255 $self->activate_recursive; 2604 $self->activate_recursive;
2256 2605
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2606 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2607 $self->enter_map ($map, $x, $y);
2259} 2608}
2260 2609
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2610=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2611
2263Moves the player to the given map-path and coordinates by first freezing 2612Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2613her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2614that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2615the new (success) or old (failed) map position. In either case, $done will
2616be called at the end of this process.
2267 2617
2268=cut 2618=cut
2269 2619
2270our $GOTOGEN; 2620our $GOTOGEN;
2271 2621
2272sub cf::object::player::goto { 2622sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2623 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2624
2275 # do generation counting so two concurrent goto's will be executed in-order 2625 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2626 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2627
2278 $self->enter_link; 2628 $self->enter_link;
2279 2629
2280 (async { 2630 (async {
2631 $Coro::current->{desc} = "player::goto $path $x $y";
2632
2633 # *tag paths override both path and x|y
2634 if ($path =~ /^\*(.*)$/) {
2635 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2636 my $ob = $obs[rand @obs];
2637
2638 # see if we actually can go there
2639 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2640 $ob = $obs[rand @obs];
2641 } else {
2642 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2643 }
2644 # else put us there anyways for now #d#
2645
2646 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2647 } else {
2648 ($path, $x, $y) = (undef, undef, undef);
2649 }
2650 }
2651
2281 my $map = eval { 2652 my $map = eval {
2282 my $map = cf::map::find $path; 2653 my $map = defined $path ? cf::map::find $path : undef;
2283 2654
2284 if ($map) { 2655 if ($map) {
2285 $map = $map->customise_for ($self); 2656 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2657 $map = $check->($map) if $check && $map;
2287 } else { 2658 } else {
2288 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2659 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2289 } 2660 }
2290 2661
2291 $map 2662 $map
2292 }; 2663 };
2293 2664
2298 2669
2299 if ($gen == $self->{_goto_generation}) { 2670 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2671 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2672 $self->leave_link ($map, $x, $y);
2302 } 2673 }
2674
2675 $done->() if $done;
2303 })->prio (1); 2676 })->prio (1);
2304} 2677}
2305 2678
2306=item $player_object->enter_exit ($exit_object) 2679=item $player_object->enter_exit ($exit_object)
2307 2680
2327} 2700}
2328 2701
2329sub prepare_random_map { 2702sub prepare_random_map {
2330 my ($exit) = @_; 2703 my ($exit) = @_;
2331 2704
2332 my $guard = cf::lock_acquire "exit_prepare:$exit";
2333
2334 # all this does is basically replace the /! path by 2705 # all this does is basically replace the /! path by
2335 # a new random map path (?random/...) with a seed 2706 # a new random map path (?random/...) with a seed
2336 # that depends on the exit object 2707 # that depends on the exit object
2337 2708
2338 my $rmp = parse_random_map_params $exit->msg; 2709 my $rmp = parse_random_map_params $exit->msg;
2340 if ($exit->map) { 2711 if ($exit->map) {
2341 $rmp->{region} = $exit->region->name; 2712 $rmp->{region} = $exit->region->name;
2342 $rmp->{origin_map} = $exit->map->path; 2713 $rmp->{origin_map} = $exit->map->path;
2343 $rmp->{origin_x} = $exit->x; 2714 $rmp->{origin_x} = $exit->x;
2344 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2716
2717 $exit->map->touch;
2345 } 2718 }
2346 2719
2347 $rmp->{random_seed} ||= $exit->random_seed; 2720 $rmp->{random_seed} ||= $exit->random_seed;
2348 2721
2349 my $data = cf::to_json $rmp; 2722 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2350 my $md5 = Digest::MD5::md5_hex $data; 2723 my $md5 = Digest::MD5::md5_hex $data;
2351 my $meta = "$RANDOMDIR/$md5.meta"; 2724 my $meta = "$RANDOMDIR/$md5.meta";
2352 2725
2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2726 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2354 aio_write $fh, 0, (length $data), $data, 0; 2727 aio_write $fh, 0, (length $data), $data, 0;
2355 undef $fh; 2728 undef $fh;
2356 aio_rename "$meta~", $meta; 2729 aio_rename "$meta~", $meta;
2357 2730
2731 my $slaying = "?random/$md5";
2732
2733 if ($exit->valid) {
2358 $exit->slaying ("?random/$md5"); 2734 $exit->slaying ("?random/$md5");
2359 $exit->msg (undef); 2735 $exit->msg (undef);
2736 }
2360 } 2737 }
2361} 2738}
2362 2739
2363sub cf::object::player::enter_exit { 2740sub cf::object::player::enter_exit {
2364 my ($self, $exit) = @_; 2741 my ($self, $exit) = @_;
2365 2742
2366 return unless $self->type == cf::PLAYER; 2743 return unless $self->type == cf::PLAYER;
2367 2744
2368 if ($exit->slaying eq "/!") {
2369 #TODO: this should de-fi-ni-te-ly not be a sync-job
2370 # the problem is that $exit might not survive long enough
2371 # so it needs to be done right now, right here
2372 cf::sync_job { prepare_random_map $exit };
2373 }
2374
2375 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2376 my $hp = $exit->stats->hp;
2377 my $sp = $exit->stats->sp;
2378
2379 $self->enter_link; 2745 $self->enter_link;
2380 2746
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
2384
2385 (async { 2747 (async {
2386 $self->deactivate_recursive; # just to be sure 2748 $Coro::current->{desc} = "enter_exit";
2749
2387 unless (eval { 2750 unless (eval {
2751 $self->deactivate_recursive; # just to be sure
2752
2753 # random map handling
2754 {
2755 my $guard = cf::lock_acquire "exit_prepare:$exit";
2756
2757 prepare_random_map $exit
2758 if $exit->slaying eq "/!";
2759 }
2760
2761 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2762 my $x = $exit->stats->hp;
2763 my $y = $exit->stats->sp;
2764
2388 $self->goto ($slaying, $hp, $sp); 2765 $self->goto ($map, $x, $y);
2389 2766
2767 # if exit is damned, update players death & WoR home-position
2768 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED);
2770
2390 1; 2771 1
2391 }) { 2772 }) {
2392 $self->message ("Something went wrong deep within the crossfire server. " 2773 $self->message ("Something went wrong deep within the crossfire server. "
2393 . "I'll try to bring you back to the map you were before. " 2774 . "I'll try to bring you back to the map you were before. "
2394 . "Please report this to the dungeon master!", 2775 . "Please report this to the dungeon master!",
2395 cf::NDI_UNIQUE | cf::NDI_RED); 2776 cf::NDI_UNIQUE | cf::NDI_RED);
2416 2797
2417 utf8::encode $text; 2798 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2799 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2800}
2420 2801
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2802=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2803
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2804Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 2805client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 2806the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2807the message unless the client supports the msg packet.
2427 2808
2428=cut 2809=cut
2429 2810
2811# non-persistent channels (usually the info channel)
2812our %CHANNEL = (
2813 "c/identify" => {
2814 id => "infobox",
2815 title => "Identify",
2816 reply => undef,
2817 tooltip => "Items recently identified",
2818 },
2819 "c/examine" => {
2820 id => "infobox",
2821 title => "Examine",
2822 reply => undef,
2823 tooltip => "Signs and other items you examined",
2824 },
2825 "c/book" => {
2826 id => "infobox",
2827 title => "Book",
2828 reply => undef,
2829 tooltip => "The contents of a note or book",
2830 },
2831 "c/lookat" => {
2832 id => "infobox",
2833 title => "Look",
2834 reply => undef,
2835 tooltip => "What you saw there",
2836 },
2837 "c/who" => {
2838 id => "infobox",
2839 title => "Players",
2840 reply => undef,
2841 tooltip => "Shows players who are currently online",
2842 },
2843 "c/body" => {
2844 id => "infobox",
2845 title => "Body Parts",
2846 reply => undef,
2847 tooltip => "Shows which body parts you posess and are available",
2848 },
2849 "c/uptime" => {
2850 id => "infobox",
2851 title => "Uptime",
2852 reply => undef,
2853 tooltip => "How long the server has been running since last restart",
2854 },
2855 "c/mapinfo" => {
2856 id => "infobox",
2857 title => "Map Info",
2858 reply => undef,
2859 tooltip => "Information related to the maps",
2860 },
2861 "c/party" => {
2862 id => "party",
2863 title => "Party",
2864 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party",
2866 },
2867);
2868
2430sub cf::client::send_msg { 2869sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2871
2433 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg);
2434 2873
2874 $color &= cf::NDI_CLIENT_MASK; # just in case...
2875
2876 # check predefined channels, for the benefit of C
2877 if ($CHANNEL{$channel}) {
2878 $channel = $CHANNEL{$channel};
2879
2880 $self->ext_msg (channel_info => $channel)
2881 if $self->can_msg;
2882
2883 $channel = $channel->{id};
2884
2885 } elsif (ref $channel) {
2886 # send meta info to client, if not yet sent
2887 unless (exists $self->{channel}{$channel->{id}}) {
2888 $self->{channel}{$channel->{id}} = $channel;
2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2891 }
2892
2893 $channel = $channel->{id};
2894 }
2895
2435 return unless @extra || length $msg; 2896 return unless @extra || length $msg;
2436 2897
2437 if ($self->can_msg) { 2898 if ($self->can_msg) {
2899 # default colour, mask it out
2900 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2901 if $color & cf::NDI_DEF;
2902
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2903 $self->send_packet ("msg " . $self->{json_coder}->encode (
2904 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439 } else { 2905 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) { 2906 if ($color >= 0) {
2907 # replace some tags by gcfclient-compatible ones
2908 for ($msg) {
2909 1 while
2910 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2911 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2912 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2913 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2914 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2915 }
2916
2917 $color &= cf::NDI_COLOR_MASK;
2918
2919 utf8::encode $msg;
2920
2451 if (0 && $msg =~ /\[/) { 2921 if (0 && $msg =~ /\[/) {
2922 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2923 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2924 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2925 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2926 $self->send_packet ("drawinfo $color $msg")
2456 } 2927 }
2457 } 2928 }
2458 } 2929 }
2459} 2930}
2460 2931
2461=item $client->ext_event ($type, %msg) 2932=item $client->ext_msg ($type, @msg)
2462 2933
2463Sends an ext event to the client. 2934Sends an ext event to the client.
2464 2935
2465=cut 2936=cut
2466 2937
2467sub cf::client::ext_event($$%) { 2938sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2939 my ($self, $type, @msg) = @_;
2469 2940
2941 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2943 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2944 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2945 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2946 }
2947}
2948
2949=item $client->ext_reply ($msgid, @msg)
2950
2951Sends an ext reply to the client.
2952
2953=cut
2954
2955sub cf::client::ext_reply($$@) {
2956 my ($self, $id, @msg) = @_;
2957
2958 if ($self->extcmd == 2) {
2959 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2960 } elsif ($self->extcmd == 1) {
2961 #TODO: version 1, remove
2962 unshift @msg, msgtype => "reply", msgid => $id;
2963 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2964 }
2472} 2965}
2473 2966
2474=item $success = $client->query ($flags, "text", \&cb) 2967=item $success = $client->query ($flags, "text", \&cb)
2475 2968
2476Queues a query to the client, calling the given callback with 2969Queues a query to the client, calling the given callback with
2531 my ($ns, $buf) = @_; 3024 my ($ns, $buf) = @_;
2532 3025
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3026 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 3027
2535 if (ref $msg) { 3028 if (ref $msg) {
3029 my ($type, $reply, @payload) =
3030 "ARRAY" eq ref $msg
3031 ? @$msg
3032 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3033
3034 my @reply;
3035
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3036 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 3037 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 3038 }
3039
3040 $ns->ext_reply ($reply, @reply)
3041 if $reply;
3042
2542 } else { 3043 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3044 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 3045 }
2545 3046
2546 cf::override; 3047 cf::override;
2593our $safe = new Safe "safe"; 3094our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 3095our $safe_hole = new Safe::Hole;
2595 3096
2596$SIG{FPE} = 'IGNORE'; 3097$SIG{FPE} = 'IGNORE';
2597 3098
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3099$safe->permit_only (Opcode::opset qw(
3100 :base_core :base_mem :base_orig :base_math
3101 grepstart grepwhile mapstart mapwhile
3102 sort time
3103));
2599 3104
2600# here we export the classes and methods available to script code 3105# here we export the classes and methods available to script code
2601 3106
2602=pod 3107=pod
2603 3108
2604The following functions and methods are available within a safe environment: 3109The following functions and methods are available within a safe environment:
2605 3110
2606 cf::object 3111 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 3112 contr pay_amount pay_player map x y force_find force_add destroy
2608 insert remove 3113 insert remove name archname title slaying race decrease split
2609 3114
2610 cf::object::player 3115 cf::object::player
2611 player 3116 player
2612 3117
2613 cf::player 3118 cf::player
2618 3123
2619=cut 3124=cut
2620 3125
2621for ( 3126for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)], 3128 insert remove inv nrof name archname title slaying race
3129 decrease split destroy)],
2624 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful)],
2626 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
2627) { 3133) {
2628 no strict 'refs'; 3134 no strict 'refs';
2704# the server's init and main functions 3210# the server's init and main functions
2705 3211
2706sub load_facedata($) { 3212sub load_facedata($) {
2707 my ($path) = @_; 3213 my ($path) = @_;
2708 3214
3215 # HACK to clear player env face cache, we need some signal framework
3216 # for this (global event?)
3217 %ext::player_env::MUSIC_FACE_CACHE = ();
3218
3219 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3220
2709 warn "loading facedata from $path\n"; 3221 warn "loading facedata from $path\n";
2710 3222
2711 my $facedata; 3223 my $facedata;
2712 0 < aio_load $path, $facedata 3224 0 < aio_load $path, $facedata
2713 or die "$path: $!"; 3225 or die "$path: $!";
2715 $facedata = Coro::Storable::thaw $facedata; 3227 $facedata = Coro::Storable::thaw $facedata;
2716 3228
2717 $facedata->{version} == 2 3229 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 3230 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 3231
3232 # patch in the exptable
3233 $facedata->{resource}{"res/exp_table"} = {
3234 type => FT_RSRC,
3235 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3236 };
3237 cf::cede_to_tick;
3238
2720 { 3239 {
2721 my $faces = $facedata->{faceinfo}; 3240 my $faces = $facedata->{faceinfo};
2722 3241
2723 while (my ($face, $info) = each %$faces) { 3242 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3243 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3244
2725 cf::face::set_visibility $idx, $info->{visibility}; 3245 cf::face::set_visibility $idx, $info->{visibility};
2726 cf::face::set_magicmap $idx, $info->{magicmap}; 3246 cf::face::set_magicmap $idx, $info->{magicmap};
2727 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3247 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2728 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3248 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2729 3249
2730 cf::cede_to_tick; 3250 cf::cede_to_tick;
2731 } 3251 }
2732 3252
2733 while (my ($face, $info) = each %$faces) { 3253 while (my ($face, $info) = each %$faces) {
2734 next unless $info->{smooth}; 3254 next unless $info->{smooth};
3255
2735 my $idx = cf::face::find $face 3256 my $idx = cf::face::find $face
2736 or next; 3257 or next;
3258
2737 if (my $smooth = cf::face::find $info->{smooth}) { 3259 if (my $smooth = cf::face::find $info->{smooth}) {
2738 cf::face::set_smooth $idx, $smooth; 3260 cf::face::set_smooth $idx, $smooth;
2739 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3261 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2740 } else { 3262 } else {
2741 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3263 warn "smooth face '$info->{smooth}' not found for face '$face'";
2758 3280
2759 { 3281 {
2760 # TODO: for gcfclient pleasure, we should give resources 3282 # TODO: for gcfclient pleasure, we should give resources
2761 # that gcfclient doesn't grok a >10000 face index. 3283 # that gcfclient doesn't grok a >10000 face index.
2762 my $res = $facedata->{resource}; 3284 my $res = $facedata->{resource};
2763 my $enc = JSON::XS->new->utf8->canonical;
2764 3285
2765 while (my ($name, $info) = each %$res) { 3286 while (my ($name, $info) = each %$res) {
2766 my $meta = $enc->encode ({ 3287 if (defined $info->{type}) {
2767 name => $name,
2768 type => $info->{type},
2769 copyright => $info->{copyright}, #TODO#
2770 });
2771 my $data = pack "(w/a*)*", $meta, $info->{data};
2772 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2773
2774 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3288 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3289 my $data;
3290
3291 if ($info->{type} & 1) {
3292 # prepend meta info
3293
3294 my $meta = $enc->encode ({
3295 name => $name,
3296 %{ $info->{meta} || {} },
3297 });
3298
3299 $data = pack "(w/a*)*", $meta, $info->{data};
3300 } else {
3301 $data = $info->{data};
3302 }
3303
3304 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2775 cf::face::set_type $idx, 1; 3305 cf::face::set_type $idx, $info->{type};
2776 cf::face::set_data $idx, 0, $data, $chk; 3306 } else {
3307 $RESOURCE{$name} = $info;
3308 }
2777 3309
2778 cf::cede_to_tick; 3310 cf::cede_to_tick;
2779 } 3311 }
2780 } 3312 }
2781 3313
3314 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3315
2782 1 3316 1
2783} 3317}
2784 3318
3319cf::global->attach (on_resource_update => sub {
3320 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3321 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3322
3323 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3324 my $sound = $soundconf->{compat}[$_]
3325 or next;
3326
3327 my $face = cf::face::find "sound/$sound->[1]";
3328 cf::sound::set $sound->[0] => $face;
3329 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3330 }
3331
3332 while (my ($k, $v) = each %{$soundconf->{event}}) {
3333 my $face = cf::face::find "sound/$v";
3334 cf::sound::set $k => $face;
3335 }
3336 }
3337});
3338
3339register_exticmd fx_want => sub {
3340 my ($ns, $want) = @_;
3341
3342 while (my ($k, $v) = each %$want) {
3343 $ns->fx_want ($k, $v);
3344 }
3345};
3346
3347sub load_resource_file($) {
3348 my $guard = lock_acquire "load_resource_file";
3349
3350 my $status = load_resource_file_ $_[0];
3351 get_slot 0.1, 100;
3352 cf::arch::commit_load;
3353
3354 $status
3355}
3356
2785sub reload_regions { 3357sub reload_regions {
3358 # HACK to clear player env face cache, we need some signal framework
3359 # for this (global event?)
3360 %ext::player_env::MUSIC_FACE_CACHE = ();
3361
2786 load_resource_file "$MAPDIR/regions" 3362 load_resource_file "$MAPDIR/regions"
2787 or die "unable to load regions file\n"; 3363 or die "unable to load regions file\n";
2788 3364
2789 for (cf::region::list) { 3365 for (cf::region::list) {
2790 $_->{match} = qr/$_->{match}/ 3366 $_->{match} = qr/$_->{match}/
2798} 3374}
2799 3375
2800sub reload_archetypes { 3376sub reload_archetypes {
2801 load_resource_file "$DATADIR/archetypes" 3377 load_resource_file "$DATADIR/archetypes"
2802 or die "unable to load archetypes\n"; 3378 or die "unable to load archetypes\n";
2803 #d# NEED to laod twice to resolve forward references
2804 # this really needs to be done in an extra post-pass
2805 # (which needs to be synchronous, so solve it differently)
2806 load_resource_file "$DATADIR/archetypes"
2807 or die "unable to load archetypes\n";
2808} 3379}
2809 3380
2810sub reload_treasures { 3381sub reload_treasures {
2811 load_resource_file "$DATADIR/treasures" 3382 load_resource_file "$DATADIR/treasures"
2812 or die "unable to load treasurelists\n"; 3383 or die "unable to load treasurelists\n";
2813} 3384}
2814 3385
2815sub reload_resources { 3386sub reload_resources {
2816 warn "reloading resource files...\n"; 3387 warn "reloading resource files...\n";
2817 3388
3389 reload_facedata;
3390 reload_archetypes;
2818 reload_regions; 3391 reload_regions;
2819 reload_facedata;
2820 #reload_archetypes;#d#
2821 reload_archetypes;
2822 reload_treasures; 3392 reload_treasures;
2823 3393
2824 warn "finished reloading resource files\n"; 3394 warn "finished reloading resource files\n";
2825} 3395}
2826 3396
2827sub init { 3397sub init {
3398 my $guard = freeze_mainloop;
3399
2828 reload_resources; 3400 reload_resources;
2829} 3401}
2830 3402
2831sub cfg_load { 3403sub reload_config {
2832 open my $fh, "<:utf8", "$CONFDIR/config" 3404 open my $fh, "<:utf8", "$CONFDIR/config"
2833 or return; 3405 or return;
2834 3406
2835 local $/; 3407 local $/;
2836 *CFG = YAML::Syck::Load <$fh>; 3408 *CFG = YAML::Load <$fh>;
2837 3409
2838 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3410 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2839 3411
2840 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3412 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2841 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3413 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2852sub main { 3424sub main {
2853 # we must not ever block the main coroutine 3425 # we must not ever block the main coroutine
2854 local $Coro::idle = sub { 3426 local $Coro::idle = sub {
2855 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3427 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2856 (async { 3428 (async {
2857 Event::one_event; 3429 $Coro::current->{desc} = "IDLE BUG HANDLER";
3430 EV::loop EV::LOOP_ONESHOT;
2858 })->prio (Coro::PRIO_MAX); 3431 })->prio (Coro::PRIO_MAX);
2859 }; 3432 };
2860 3433
2861 cfg_load; 3434 {
3435 my $guard = freeze_mainloop;
3436 reload_config;
2862 db_init; 3437 db_init;
2863 load_extensions; 3438 load_extensions;
2864 3439
2865 $TICK_WATCHER->start; 3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3441 evthread_start IO::AIO::poll_fileno;
3442 }
3443
2866 Event::loop; 3444 EV::loop;
2867} 3445}
2868 3446
2869############################################################################# 3447#############################################################################
2870# initialisation and cleanup 3448# initialisation and cleanup
2871 3449
2872# install some emergency cleanup handlers 3450# install some emergency cleanup handlers
2873BEGIN { 3451BEGIN {
3452 our %SIGWATCHER = ();
2874 for my $signal (qw(INT HUP TERM)) { 3453 for my $signal (qw(INT HUP TERM)) {
2875 Event->signal ( 3454 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2876 reentrant => 0,
2877 data => WF_AUTOCANCEL,
2878 signal => $signal,
2879 prio => 0,
2880 cb => sub {
2881 cf::cleanup "SIG$signal"; 3455 cf::cleanup "SIG$signal";
2882 },
2883 ); 3456 };
2884 } 3457 }
2885} 3458}
2886 3459
2887sub write_runtime { 3460sub write_runtime_sync {
2888 my $runtime = "$LOCALDIR/runtime"; 3461 my $runtime = "$LOCALDIR/runtime";
2889 3462
2890 # first touch the runtime file to show we are still running: 3463 # first touch the runtime file to show we are still running:
2891 # the fsync below can take a very very long time. 3464 # the fsync below can take a very very long time.
2892 3465
2918 and return; 3491 and return;
2919 3492
2920 warn "runtime file written.\n"; 3493 warn "runtime file written.\n";
2921 3494
2922 1 3495 1
3496}
3497
3498our $uuid_lock;
3499our $uuid_skip;
3500
3501sub write_uuid_sync($) {
3502 $uuid_skip ||= $_[0];
3503
3504 return if $uuid_lock;
3505 local $uuid_lock = 1;
3506
3507 my $uuid = "$LOCALDIR/uuid";
3508
3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3510 or return;
3511
3512 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3513 $uuid_skip = 0;
3514
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return;
3517
3518 # always fsync - this file is important
3519 aio_fsync $fh
3520 and return;
3521
3522 close $fh
3523 or return;
3524
3525 aio_rename "$uuid~", $uuid
3526 and return;
3527
3528 warn "uuid file written ($value).\n";
3529
3530 1
3531
3532}
3533
3534sub write_uuid($$) {
3535 my ($skip, $sync) = @_;
3536
3537 $sync ? write_uuid_sync $skip
3538 : async { write_uuid_sync $skip };
2923} 3539}
2924 3540
2925sub emergency_save() { 3541sub emergency_save() {
2926 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
2927 3543
2933 # and maps saved/destroyed asynchronously. 3549 # and maps saved/destroyed asynchronously.
2934 warn "begin emergency player save\n"; 3550 warn "begin emergency player save\n";
2935 for my $login (keys %cf::PLAYER) { 3551 for my $login (keys %cf::PLAYER) {
2936 my $pl = $cf::PLAYER{$login} or next; 3552 my $pl = $cf::PLAYER{$login} or next;
2937 $pl->valid or next; 3553 $pl->valid or next;
3554 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2938 $pl->save; 3555 $pl->save;
2939 } 3556 }
2940 warn "end emergency player save\n"; 3557 warn "end emergency player save\n";
2941 3558
2942 warn "begin emergency map save\n"; 3559 warn "begin emergency map save\n";
2948 warn "end emergency map save\n"; 3565 warn "end emergency map save\n";
2949 3566
2950 warn "begin emergency database checkpoint\n"; 3567 warn "begin emergency database checkpoint\n";
2951 BDB::db_env_txn_checkpoint $DB_ENV; 3568 BDB::db_env_txn_checkpoint $DB_ENV;
2952 warn "end emergency database checkpoint\n"; 3569 warn "end emergency database checkpoint\n";
3570
3571 warn "begin write uuid\n";
3572 write_uuid_sync 1;
3573 warn "end write uuid\n";
2953 }; 3574 };
2954 3575
2955 warn "leave emergency perl save\n"; 3576 warn "leave emergency perl save\n";
2956} 3577}
2957 3578
2972 warn "reloading..."; 3593 warn "reloading...";
2973 3594
2974 warn "entering sync_job"; 3595 warn "entering sync_job";
2975 3596
2976 cf::sync_job { 3597 cf::sync_job {
2977 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
2978 cf::emergency_save; 3599 cf::emergency_save;
2979 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
2980 3601
2981 warn "syncing database to disk"; 3602 warn "syncing database to disk";
2982 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
2983 3604
2984 # if anything goes wrong in here, we should simply crash as we already saved 3605 # if anything goes wrong in here, we should simply crash as we already saved
2985
2986 warn "cancelling all WF_AUTOCANCEL watchers";
2987 for (Event::all_watchers) {
2988 $_->cancel if $_->data & WF_AUTOCANCEL;
2989 }
2990 3606
2991 warn "flushing outstanding aio requests"; 3607 warn "flushing outstanding aio requests";
2992 for (;;) { 3608 for (;;) {
2993 BDB::flush; 3609 BDB::flush;
2994 IO::AIO::flush; 3610 IO::AIO::flush;
2995 Coro::cede; 3611 Coro::cede_notself;
2996 last unless IO::AIO::nreqs || BDB::nreqs; 3612 last unless IO::AIO::nreqs || BDB::nreqs;
2997 warn "iterate..."; 3613 warn "iterate...";
2998 } 3614 }
2999 3615
3000 ++$RELOAD; 3616 ++$RELOAD;
3059 warn "reloading cf.pm"; 3675 warn "reloading cf.pm";
3060 require cf; 3676 require cf;
3061 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3062 3678
3063 warn "loading config and database again"; 3679 warn "loading config and database again";
3064 cf::cfg_load; 3680 cf::reload_config;
3065 3681
3066 warn "loading extensions"; 3682 warn "loading extensions";
3067 cf::load_extensions; 3683 cf::load_extensions;
3068 3684
3069 warn "reattaching attachments to objects/players"; 3685 warn "reattaching attachments to objects/players";
3076 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3077 3693
3078 1 3694 1
3079 } or do { 3695 } or do {
3080 warn $@; 3696 warn $@;
3081 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3082 exit 1;
3083 }; 3698 };
3084 3699
3085 warn "reloaded"; 3700 warn "reloaded";
3086}; 3701};
3087 3702
3089 3704
3090sub reload_perl() { 3705sub reload_perl() {
3091 # doing reload synchronously and two reloads happen back-to-back, 3706 # doing reload synchronously and two reloads happen back-to-back,
3092 # coro crashes during coro_state_free->destroy here. 3707 # coro crashes during coro_state_free->destroy here.
3093 3708
3094 $RELOAD_WATCHER ||= Event->timer ( 3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3095 reentrant => 0,
3096 after => 0,
3097 data => WF_AUTOCANCEL,
3098 cb => sub {
3099 do_reload_perl; 3710 do_reload_perl;
3100 undef $RELOAD_WATCHER; 3711 undef $RELOAD_WATCHER;
3101 },
3102 ); 3712 };
3103} 3713}
3104 3714
3105register_command "reload" => sub { 3715register_command "reload" => sub {
3106 my ($who, $arg) = @_; 3716 my ($who, $arg) = @_;
3107 3717
3108 if ($who->flag (FLAG_WIZ)) { 3718 if ($who->flag (FLAG_WIZ)) {
3109 $who->message ("reloading server."); 3719 $who->message ("reloading server.");
3720 async {
3721 $Coro::current->{desc} = "perl_reload";
3110 async { reload_perl }; 3722 reload_perl;
3723 };
3111 } 3724 }
3112}; 3725};
3113 3726
3114unshift @INC, $LIBDIR; 3727unshift @INC, $LIBDIR;
3115 3728
3117 3730
3118our @WAIT_FOR_TICK; 3731our @WAIT_FOR_TICK;
3119our @WAIT_FOR_TICK_BEGIN; 3732our @WAIT_FOR_TICK_BEGIN;
3120 3733
3121sub wait_for_tick { 3734sub wait_for_tick {
3122 return unless $TICK_WATCHER->is_active;
3123 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3124 3736
3125 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3126 push @WAIT_FOR_TICK, $signal; 3738 push @WAIT_FOR_TICK, $signal;
3127 $signal->wait; 3739 $signal->wait;
3128} 3740}
3129 3741
3130sub wait_for_tick_begin { 3742sub wait_for_tick_begin {
3131 return unless $TICK_WATCHER->is_active;
3132 return if $Coro::current == $Coro::main; 3743 return if tick_inhibit || $Coro::current == $Coro::main;
3133 3744
3134 my $signal = new Coro::Signal; 3745 my $signal = new Coro::Signal;
3135 push @WAIT_FOR_TICK_BEGIN, $signal; 3746 push @WAIT_FOR_TICK_BEGIN, $signal;
3136 $signal->wait; 3747 $signal->wait;
3137} 3748}
3138 3749
3139 my $min = 1e6;#d# 3750sub tick {
3140 my $avg = 10;
3141$TICK_WATCHER = Event->timer (
3142 reentrant => 0,
3143 parked => 1,
3144 prio => 0,
3145 at => $NEXT_TICK || $TICK,
3146 data => WF_AUTOCANCEL,
3147 cb => sub {
3148 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
3149 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3752 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3150 unless ++$bug_warning > 10; 3753 unless ++$bug_warning > 10;
3151 return; 3754 return;
3152 } 3755 }
3153 3756
3154 $NOW = $tick_start = Event::time;
3155
3156 cf::server_tick; # one server iteration 3757 cf::server_tick; # one server iteration
3157 3758
3158 0 && sync_job {#d# 3759 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3159 for(1..10) { 3760 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3160 my $t = Event::time; 3761 Coro::async_pool {
3161 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3762 $Coro::current->{desc} = "runtime saver";
3162 or die; 3763 write_runtime_sync
3163 3764 or warn "ERROR: unable to write runtime file: $!";
3164 $map->width (50);
3165 $map->height (50);
3166 $map->alloc;
3167 $map->_load_objects ("/tmp/x.map", 1);
3168 my $t = Event::time - $t;
3169
3170 #next unless $t < 0.0013;#d#
3171 if ($t < $min) {
3172 $min = $t;
3173 }
3174 $avg = $avg * 0.99 + $t * 0.01;
3175 }
3176 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3177 exit 0;
3178 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3179 }; 3765 };
3766 }
3180 3767
3181 $RUNTIME += $TICK;
3182 $NEXT_TICK += $TICK;
3183
3184 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3185 $NEXT_RUNTIME_WRITE = $NOW + 10;
3186 Coro::async_pool {
3187 write_runtime
3188 or warn "ERROR: unable to write runtime file: $!";
3189 };
3190 }
3191
3192# my $AFTER = Event::time;
3193# warn $AFTER - $NOW;#d#
3194
3195 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3196 $sig->send; 3769 $sig->send;
3197 } 3770 }
3198 while (my $sig = shift @WAIT_FOR_TICK) { 3771 while (my $sig = shift @WAIT_FOR_TICK) {
3199 $sig->send; 3772 $sig->send;
3200 } 3773 }
3201 3774
3202 $NOW = Event::time; 3775 $LOAD = ($NOW - $TICK_START) / $TICK;
3203
3204 # if we are delayed by four ticks or more, skip them all
3205 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3206
3207 $TICK_WATCHER->at ($NEXT_TICK);
3208 $TICK_WATCHER->start;
3209
3210 $LOAD = ($NOW - $tick_start) / $TICK;
3211 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3776 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3212 3777
3213 _post_tick; 3778 if (0) {
3214 3779 if ($NEXT_TICK) {
3215 3780 my $jitter = $TICK_START - $NEXT_TICK;
3781 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3782 warn "jitter $JITTER\n";#d#
3783 }
3216 }, 3784 }
3217); 3785}
3218 3786
3219{ 3787{
3220 BDB::max_poll_time $TICK * 0.1; 3788 # configure BDB
3221 $BDB_POLL_WATCHER = Event->io ( 3789
3222 reentrant => 0,
3223 fd => BDB::poll_fileno,
3224 poll => 'r',
3225 prio => 0,
3226 data => WF_AUTOCANCEL,
3227 cb => \&BDB::poll_cb,
3228 );
3229 BDB::min_parallel 8; 3790 BDB::min_parallel 8;
3230 3791 BDB::max_poll_reqs $TICK * 0.1;
3231 BDB::set_sync_prepare { 3792 $Coro::BDB::WATCHER->priority (1);
3232 my $status;
3233 my $current = $Coro::current;
3234 (
3235 sub {
3236 $status = $!;
3237 $current->ready; undef $current;
3238 },
3239 sub {
3240 Coro::schedule while defined $current;
3241 $! = $status;
3242 },
3243 )
3244 };
3245 3793
3246 unless ($DB_ENV) { 3794 unless ($DB_ENV) {
3247 $DB_ENV = BDB::db_env_create; 3795 $DB_ENV = BDB::db_env_create;
3796 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3797 | BDB::LOG_AUTOREMOVE, 1);
3798 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3799 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3248 3800
3249 cf::sync_job { 3801 cf::sync_job {
3250 eval { 3802 eval {
3251 BDB::db_env_open 3803 BDB::db_env_open
3252 $DB_ENV, 3804 $DB_ENV,
3254 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3806 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3255 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3807 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3256 0666; 3808 0666;
3257 3809
3258 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3810 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3259
3260 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3261 $DB_ENV->set_lk_detect;
3262 }; 3811 };
3263 3812
3264 cf::cleanup "db_env_open(db): $@" if $@; 3813 cf::cleanup "db_env_open(db): $@" if $@;
3265 }; 3814 };
3266 } 3815 }
3816
3817 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3818 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3819 };
3820 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3821 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3822 };
3823 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3824 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3825 };
3267} 3826}
3268 3827
3269{ 3828{
3829 # configure IO::AIO
3830
3270 IO::AIO::min_parallel 8; 3831 IO::AIO::min_parallel 8;
3271
3272 undef $Coro::AIO::WATCHER;
3273 IO::AIO::max_poll_time $TICK * 0.1; 3832 IO::AIO::max_poll_time $TICK * 0.1;
3274 $AIO_POLL_WATCHER = Event->io ( 3833 $Coro::AIO::WATCHER->priority (1);
3275 reentrant => 0,
3276 data => WF_AUTOCANCEL,
3277 fd => IO::AIO::poll_fileno,
3278 poll => 'r',
3279 prio => 6,
3280 cb => \&IO::AIO::poll_cb,
3281 );
3282} 3834}
3283 3835
3284my $_log_backtrace; 3836my $_log_backtrace;
3285 3837
3286sub _log_backtrace { 3838sub _log_backtrace {
3290 3842
3291 # limit the # of concurrent backtraces 3843 # limit the # of concurrent backtraces
3292 if ($_log_backtrace < 2) { 3844 if ($_log_backtrace < 2) {
3293 ++$_log_backtrace; 3845 ++$_log_backtrace;
3294 async { 3846 async {
3847 $Coro::current->{desc} = "abt $msg";
3848
3295 my @bt = fork_call { 3849 my @bt = fork_call {
3296 @addr = map { sprintf "%x", $_ } @addr; 3850 @addr = map { sprintf "%x", $_ } @addr;
3297 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3851 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3298 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3852 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3299 or die "addr2line: $!"; 3853 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines