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.177 by root, Sun Jan 14 22:54:18 2007 UTC vs.
Revision 1.418 by root, Fri Apr 11 21:09:53 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines