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.324 by root, Sat Jul 28 14:23:17 2007 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines