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.271 by root, Fri Jun 1 06:04:08 2007 UTC vs.
Revision 1.536 by root, Thu Apr 29 08:26:38 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines