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.144 by root, Sun Jan 7 18:01:10 2007 UTC vs.
Revision 1.285 by root, Sun Jun 24 04:21:42 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.3 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
25use BDB ();
26use Data::Dumper;
20use Digest::MD5; 27use Digest::MD5;
21use Fcntl; 28use Fcntl;
22use IO::AIO 2.31 ();
23use YAML::Syck (); 29use YAML::Syck ();
30use IO::AIO 2.32 ();
24use Time::HiRes; 31use Time::HiRes;
32use Compress::LZF;
25 33
34# configure various modules to our taste
35#
36$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
27 41
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 43$YAML::Syck::ImplicitUnicode = 1;
30 44
31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 46
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 48
35our %COMMAND = (); 49our %COMMAND = ();
36our %COMMAND_TIME = (); 50our %COMMAND_TIME = ();
51
52our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 53our %EXTCMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps
38 56
57our $RELOAD; # number of reloads so far
39our @EVENT; 58our @EVENT;
40our $LIBDIR = datadir . "/ext";
41 59
42our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
43our $TICK_WATCHER; 73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
44our $NEXT_TICK; 76our $NEXT_TICK;
45our $NOW; 77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off
79
80our $BDB_POLL_WATCHER;
81our $DB_ENV;
46 82
47our %CFG; 83our %CFG;
48 84
49our $UPTIME; $UPTIME ||= time; 85our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 86our $RUNTIME;
51 87
52our %PLAYER; # all users 88our %PLAYER; # all users
53our %MAP; # all maps 89our %MAP; # all maps
54our $LINK_MAP; # the special {link} map 90our $LINK_MAP; # the special {link} map, which is always available
55our $RANDOM_MAPS = cf::localdir . "/random"; 91
56our %EXT_CORO; # coroutines bound to extensions 92# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
57 98
58binmode STDOUT; 99binmode STDOUT;
59binmode STDERR; 100binmode STDERR;
60 101
61# read virtual server time, if available 102# read virtual server time, if available
62unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
63 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
64 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
65 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
66} 107}
67 108
68mkdir cf::localdir; 109mkdir $_
69mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
70mkdir cf::localdir . "/" . cf::tmpdir;
71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS;
73 111
74# a special map that is always available
75our $LINK_MAP;
76our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
113
114sub cf::map::normalise;
77 115
78############################################################################# 116#############################################################################
79 117
80=head2 GLOBAL VARIABLES 118=head2 GLOBAL VARIABLES
81 119
88=item $cf::RUNTIME 126=item $cf::RUNTIME
89 127
90The time this server has run, starts at 0 and is increased by $cf::TICK on 128The time this server has run, starts at 0 and is increased by $cf::TICK on
91every server tick. 129every server tick.
92 130
93=item $cf::LIBDIR 131=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
132$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
133$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
94 134
95The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
96be found. It will be added to C<@INC> automatically. 136directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and
138database environment.
97 139
98=item $cf::NOW 140=item $cf::NOW
99 141
100The time of the last (current) server tick. 142The time of the last (current) server tick.
101 143
102=item $cf::TICK 144=item $cf::TICK
103 145
104The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
105 157
106=item %cf::CFG 158=item %cf::CFG
107 159
108Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
109from wherever your confdir points to. 161from wherever your confdir points to.
162
163=item cf::wait_for_tick, cf::wait_for_tick_begin
164
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
110 168
111=back 169=back
112 170
113=cut 171=cut
114 172
115BEGIN { 173BEGIN {
116 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
117 my $msg = join "", @_; 175 my $msg = join "", @_;
118 utf8::encode $msg;
119 176
120 $msg .= "\n" 177 $msg .= "\n"
121 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
122 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
123 LOG llevError, "cfperl: $msg"; 183 LOG llevError, $msg;
124 }; 184 };
125} 185}
126 186
127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
129@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
130@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
131@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
132@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
133 194
134# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
135# within the Safe compartment. 196# within the Safe compartment.
136for my $pkg (qw( 197for my $pkg (qw(
137 cf::global cf::attachable 198 cf::global cf::attachable
146 207
147$Event::DIED = sub { 208$Event::DIED = sub {
148 warn "error in event callback: @_"; 209 warn "error in event callback: @_";
149}; 210};
150 211
151my %ext_pkg; 212#############################################################################
152my @exts;
153my @hook;
154 213
155=head2 UTILITY FUNCTIONS 214=head2 UTILITY FUNCTIONS
156 215
157=over 4 216=over 4
158 217
159=cut 218=item dumpval $ref
160 219
220=cut
221
222sub dumpval {
223 eval {
224 local $SIG{__DIE__};
225 my $d;
226 if (1) {
227 $d = new Data::Dumper([$_[0]], ["*var"]);
228 $d->Terse(1);
229 $d->Indent(2);
230 $d->Quotekeys(0);
231 $d->Useqq(1);
232 #$d->Bless(...);
233 $d->Seen($_[1]) if @_ > 1;
234 $d = $d->Dump();
235 }
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d
238 } || "[unable to dump $_[0]: '$@']";
239}
240
161use JSON::Syck (); # TODO# replace by JSON::PC once working 241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
162 242
163=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
164 244
165Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
166 246
167=cut
168
169sub from_json($) {
170 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
171 JSON::Syck::Load $_[0]
172}
173
174=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
175 248
176Converts a perl data structure into its JSON representation. 249Converts a perl data structure into its JSON representation.
177
178=cut
179
180sub to_json($) {
181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
182 JSON::Syck::Dump $_[0]
183}
184 250
185=item cf::lock_wait $string 251=item cf::lock_wait $string
186 252
187Wait until the given lock is available. See cf::lock_acquire. 253Wait until the given lock is available. See cf::lock_acquire.
188 254
194returned. 260returned.
195 261
196Lock names should begin with a unique identifier (for example, cf::map::find 262Lock names should begin with a unique identifier (for example, cf::map::find
197uses map_find and cf::map::load uses map_load). 263uses map_find and cf::map::load uses map_load).
198 264
265=item $locked = cf::lock_active $string
266
267Return true if the lock is currently active, i.e. somebody has locked it.
268
199=cut 269=cut
200 270
201our %LOCK; 271our %LOCK;
202 272
203sub lock_wait($) { 273sub lock_wait($) {
222 # wake up all waiters, to be on the safe side 292 # wake up all waiters, to be on the safe side
223 $_->ready for @{ delete $LOCK{$key} }; 293 $_->ready for @{ delete $LOCK{$key} };
224 } 294 }
225} 295}
226 296
297sub lock_active($) {
298 my ($key) = @_;
299
300 ! ! $LOCK{$key}
301}
302
227sub freeze_mainloop { 303sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active; 304 return unless $TICK_WATCHER->is_active;
229 305
230 my $guard = Coro::guard { $TICK_WATCHER->start }; 306 my $guard = Coro::guard {
307 $TICK_WATCHER->start;
308 };
231 $TICK_WATCHER->stop; 309 $TICK_WATCHER->stop;
232 $guard 310 $guard
233} 311}
234 312
235=item cf::async { BLOCK } 313=item cf::async { BLOCK }
242 320
243BEGIN { *async = \&Coro::async_pool } 321BEGIN { *async = \&Coro::async_pool }
244 322
245=item cf::sync_job { BLOCK } 323=item cf::sync_job { BLOCK }
246 324
247The design of crossfire+ requires that the main coro ($Coro::main) is 325The design of Crossfire TRT requires that the main coroutine ($Coro::main)
248always able to handle events or runnable, as crossfire+ is only partly 326is always able to handle events or runnable, as Crossfire TRT is only
249reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable.
250 329
251If it must be done, put the blocking parts into C<sync_job>. This will run 330If it must be done, put the blocking parts into C<sync_job>. This will run
252the given BLOCK in another coroutine while waiting for the result. The 331the given BLOCK in another coroutine while waiting for the result. The
253server will be frozen during this time, so the block should either finish 332server will be frozen during this time, so the block should either finish
254fast or be very important. 333fast or be very important.
257 336
258sub sync_job(&) { 337sub sync_job(&) {
259 my ($job) = @_; 338 my ($job) = @_;
260 339
261 if ($Coro::current == $Coro::main) { 340 if ($Coro::current == $Coro::main) {
341 my $time = Event::time;
342
262 # this is the main coro, too bad, we have to block 343 # this is the main coro, too bad, we have to block
263 # till the operation succeeds, freezing the server :/ 344 # till the operation succeeds, freezing the server :/
264 345
265 # TODO: use suspend/resume instead 346 # TODO: use suspend/resume instead
266 # (but this is cancel-safe) 347 # (but this is cancel-safe)
277 358
278 while ($busy) { 359 while ($busy) {
279 Coro::cede or Event::one_event; 360 Coro::cede or Event::one_event;
280 } 361 }
281 362
363 $time = Event::time - $time;
364
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load
369
282 wantarray ? @res : $res[0] 370 wantarray ? @res : $res[0]
283 } else { 371 } else {
284 # we are in another coroutine, how wonderful, everything just works 372 # we are in another coroutine, how wonderful, everything just works
285 373
286 $job->() 374 $job->()
287 } 375 }
288} 376}
289 377
290=item $coro = cf::async_ext { BLOCK } 378=item $coro = cf::async_ext { BLOCK }
291 379
292Like async, but this coro is automcatially being canceled when the 380Like async, but this coro is automatically being canceled when the
293extension calling this is being unloaded. 381extension calling this is being unloaded.
294 382
295=cut 383=cut
296 384
297sub async_ext(&) { 385sub async_ext(&) {
305 $EXT_CORO{$coro+0} = $coro; 393 $EXT_CORO{$coro+0} = $coro;
306 394
307 $coro 395 $coro
308} 396}
309 397
310sub write_runtime { 398=item fork_call { }, $args
311 my $runtime = cf::localdir . "/runtime";
312 399
313 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 400Executes the given code block with the given arguments in a seperate
314 or return; 401process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling.
315 404
316 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 405=cut
317 (aio_write $fh, 0, (length $value), $value, 0) <= 0
318 and return;
319 406
320 aio_fsync $fh 407sub fork_call(&@) {
321 and return; 408 my ($cb, @args) = @_;
322 409
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
411# or die "socketpair: $!";
412 pipe my $fh1, my $fh2
413 or die "pipe: $!";
414
415 if (my $pid = fork) {
323 close $fh 416 close $fh2;
324 or return;
325 417
326 aio_rename "$runtime~", $runtime 418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
327 and return; 419 $res = Coro::Storable::thaw $res;
328 420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals;
428 local $SIG{__WARN__};
429 local $SIG{__DIE__};
430 eval {
431 close $fh1;
432
433 my @res = eval { $cb->(@args) };
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
329 1 439 }
440}
441
442=item $value = cf::db_get $family => $key
443
444Returns a single value from the environment database.
445
446=item cf::db_put $family => $key => $value
447
448Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450
451=cut
452
453our $DB;
454
455sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job {
460 eval {
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 }
470}
471
472sub db_get($$) {
473 my $key = "$_[0]/$_[1]";
474
475 cf::sync_job {
476 BDB::db_get $DB, undef, $key, my $data;
477
478 $! ? ()
479 : $data
480 }
481}
482
483sub db_put($$$) {
484 BDB::dbreq_pri 4;
485 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
486}
487
488=item cf::cache $id => [$paths...], $processversion => $process
489
490Generic caching function that returns the value of the resource $id,
491caching and regenerating as required.
492
493This function can block.
494
495=cut
496
497sub cache {
498 my ($id, $src, $processversion, $process) = @_;
499
500 my $meta =
501 join "\x00",
502 $processversion,
503 map {
504 aio_stat $_
505 and Carp::croak "$_: $!";
506
507 ($_, (stat _)[7,9])
508 } @$src;
509
510 my $dbmeta = db_get cache => "$id/meta";
511 if ($dbmeta ne $meta) {
512 # changed, we may need to process
513
514 my @data;
515 my $md5;
516
517 for (0 .. $#$src) {
518 0 <= aio_load $src->[$_], $data[$_]
519 or Carp::croak "$src->[$_]: $!";
520 }
521
522 # if processing is expensive, check
523 # checksum first
524 if (1) {
525 $md5 =
526 join "\x00",
527 $processversion,
528 map {
529 Coro::cede;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src;
532
533
534 my $dbmd5 = db_get cache => "$id/md5";
535 if ($dbmd5 eq $md5) {
536 db_put cache => "$id/meta", $meta;
537
538 return db_get cache => "$id/data";
539 }
540 }
541
542 my $t1 = Time::HiRes::time;
543 my $data = $process->(\@data);
544 my $t2 = Time::HiRes::time;
545
546 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
547
548 db_put cache => "$id/data", $data;
549 db_put cache => "$id/md5" , $md5;
550 db_put cache => "$id/meta", $meta;
551
552 return $data;
553 }
554
555 db_get cache => "$id/data"
556}
557
558=item cf::datalog type => key => value, ...
559
560Log a datalog packet of the given type with the given key-value pairs.
561
562=cut
563
564sub datalog($@) {
565 my ($type, %kv) = @_;
566 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
330} 567}
331 568
332=back 569=back
333 570
334=cut 571=cut
335
336#############################################################################
337
338package cf::path;
339
340sub new {
341 my ($class, $path, $base) = @_;
342
343 $path = $path->as_string if ref $path;
344
345 my $self = bless { }, $class;
346
347 # {... are special paths that are not touched
348 # ?xxx/... are special absolute paths
349 # ?random/... random maps
350 # /! non-realised random map exit
351 # /... normal maps
352 # ~/... per-player maps without a specific player (DO NOT USE)
353 # ~user/... per-player map of a specific user
354
355 if ($path =~ /^{/) {
356 # fine as it is
357 } elsif ($path =~ s{^\?random/}{}) {
358 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
359 $self->{random} = cf::from_json $data;
360 } else {
361 if ($path =~ s{^~([^/]+)?}{}) {
362 $self->{user_rel} = 1;
363
364 if (defined $1) {
365 $self->{user} = $1;
366 } elsif ($base =~ m{^~([^/]+)/}) {
367 $self->{user} = $1;
368 } else {
369 warn "cannot resolve user-relative path without user <$path,$base>\n";
370 }
371 } elsif ($path =~ /^\//) {
372 # already absolute
373 } else {
374 $base =~ s{[^/]+/?$}{};
375 return $class->new ("$base/$path");
376 }
377
378 for ($path) {
379 redo if s{/\.?/}{/};
380 redo if s{/[^/]+/\.\./}{/};
381 }
382 }
383
384 $self->{path} = $path;
385
386 $self
387}
388
389# the name / primary key / in-game path
390sub as_string {
391 my ($self) = @_;
392
393 $self->{user_rel} ? "~$self->{user}$self->{path}"
394 : $self->{random} ? "?random/$self->{path}"
395 : $self->{path}
396}
397
398# the displayed name, this is a one way mapping
399sub visible_name {
400 my ($self) = @_;
401
402# if (my $rmp = $self->{random}) {
403# # todo: be more intelligent about this
404# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
405# } else {
406 $self->as_string
407# }
408}
409
410# escape the /'s in the path
411sub _escaped_path {
412 # ∕ is U+2215
413 (my $path = $_[0]{path}) =~ s/\//∕/g;
414 $path
415}
416
417# the original (read-only) location
418sub load_path {
419 my ($self) = @_;
420
421 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
422}
423
424# the temporary/swap location
425sub save_path {
426 my ($self) = @_;
427
428 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
429 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
430 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
431}
432
433# the unique path, might be eq to save_path
434sub uniq_path {
435 my ($self) = @_;
436
437 $self->{user_rel} || $self->{random}
438 ? undef
439 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
440}
441
442# return random map parameters, or undef
443sub random_map_params {
444 my ($self) = @_;
445
446 $self->{random}
447}
448
449# this is somewhat ugly, but style maps do need special treatment
450sub is_style_map {
451 $_[0]{path} =~ m{^/styles/}
452}
453
454package cf;
455 572
456############################################################################# 573#############################################################################
457 574
458=head2 ATTACHABLE OBJECTS 575=head2 ATTACHABLE OBJECTS
459 576
461attach callbacks/event handlers (a collection of which is called an "attachment") 578attach callbacks/event handlers (a collection of which is called an "attachment")
462to it. All such attachable objects support the following methods. 579to it. All such attachable objects support the following methods.
463 580
464In the following description, CLASS can be any of C<global>, C<object> 581In the following description, CLASS can be any of C<global>, C<object>
465C<player>, C<client> or C<map> (i.e. the attachable objects in 582C<player>, C<client> or C<map> (i.e. the attachable objects in
466crossfire+). 583Crossfire TRT).
467 584
468=over 4 585=over 4
469 586
470=item $attachable->attach ($attachment, key => $value...) 587=item $attachable->attach ($attachment, key => $value...)
471 588
585our @CB_TYPE = (); # registry for type (cf-object class) based events 702our @CB_TYPE = (); # registry for type (cf-object class) based events
586our @CB_MAP = (); 703our @CB_MAP = ();
587 704
588my %attachment; 705my %attachment;
589 706
707sub cf::attachable::thawer_merge {
708 # simply override everything except _meta
709 local $_[0]{_meta};
710 %{$_[0]} = %{$_[1]};
711}
712
590sub _attach_cb($$$$) { 713sub _attach_cb($$$$) {
591 my ($registry, $event, $prio, $cb) = @_; 714 my ($registry, $event, $prio, $cb) = @_;
592 715
593 use sort 'stable'; 716 use sort 'stable';
594 717
628 $registry = $CB_TYPE[$object_type] ||= []; 751 $registry = $CB_TYPE[$object_type] ||= [];
629 752
630 } elsif ($type eq "subtype") { 753 } elsif ($type eq "subtype") {
631 defined $object_type or Carp::croak "subtype specified without type"; 754 defined $object_type or Carp::croak "subtype specified without type";
632 my $object_subtype = shift @arg; 755 my $object_subtype = shift @arg;
633 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 756 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
634 757
635 } elsif ($type eq "package") { 758 } elsif ($type eq "package") {
636 my $pkg = shift @arg; 759 my $pkg = shift @arg;
637 760
638 while (my ($name, $id) = each %cb_id) { 761 while (my ($name, $id) = each %cb_id) {
667 _attach $registry, $klass, @attach; 790 _attach $registry, $klass, @attach;
668 } 791 }
669 792
670 $obj->{$name} = \%arg; 793 $obj->{$name} = \%arg;
671 } else { 794 } else {
672 warn "object uses attachment '$name' that is not available, postponing.\n"; 795 warn "object uses attachment '$name' which is not available, postponing.\n";
673 } 796 }
674 797
675 $obj->{_attachment}{$name} = undef; 798 $obj->{_attachment}{$name} = undef;
676} 799}
677 800
679 if (ref $_[0]) { 802 if (ref $_[0]) {
680 _object_attach @_; 803 _object_attach @_;
681 } else { 804 } else {
682 _attach shift->_attach_registry, @_; 805 _attach shift->_attach_registry, @_;
683 } 806 }
807 _recalc_want;
684}; 808};
685 809
686# all those should be optimised 810# all those should be optimised
687sub cf::attachable::detach { 811sub cf::attachable::detach {
688 my ($obj, $name) = @_; 812 my ($obj, $name) = @_;
691 delete $obj->{_attachment}{$name}; 815 delete $obj->{_attachment}{$name};
692 reattach ($obj); 816 reattach ($obj);
693 } else { 817 } else {
694 Carp::croak "cannot, currently, detach class attachments"; 818 Carp::croak "cannot, currently, detach class attachments";
695 } 819 }
820 _recalc_want;
696}; 821};
697 822
698sub cf::attachable::attached { 823sub cf::attachable::attached {
699 my ($obj, $name) = @_; 824 my ($obj, $name) = @_;
700 825
765# object support 890# object support
766 891
767sub reattach { 892sub reattach {
768 # basically do the same as instantiate, without calling instantiate 893 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 894 my ($obj) = @_;
895
896 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
770 897
771 my $registry = $obj->registry; 898 my $registry = $obj->registry;
772 899
773 @$registry = (); 900 @$registry = ();
774 901
821 $filename, length $$rdata, scalar @$objs; 948 $filename, length $$rdata, scalar @$objs;
822 949
823 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
824 chmod SAVE_MODE, $fh; 951 chmod SAVE_MODE, $fh;
825 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 952 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
826 aio_fsync $fh; 953 aio_fsync $fh if $cf::USE_FSYNC;
827 close $fh; 954 close $fh;
828 955
829 if (@$objs) { 956 if (@$objs) {
830 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
831 chmod SAVE_MODE, $fh; 958 chmod SAVE_MODE, $fh;
832 my $data = Storable::nfreeze { version => 1, objs => $objs }; 959 my $data = Storable::nfreeze { version => 1, objs => $objs };
833 aio_write $fh, 0, (length $data), $data, 0; 960 aio_write $fh, 0, (length $data), $data, 0;
834 aio_fsync $fh; 961 aio_fsync $fh if $cf::USE_FSYNC;
835 close $fh; 962 close $fh;
836 aio_rename "$filename.pst~", "$filename.pst"; 963 aio_rename "$filename.pst~", "$filename.pst";
837 } 964 }
838 } else { 965 } else {
839 aio_unlink "$filename.pst"; 966 aio_unlink "$filename.pst";
871 or return; 998 or return;
872 $av = eval { (Storable::thaw $av)->{objs} }; 999 $av = eval { (Storable::thaw $av)->{objs} };
873 } 1000 }
874 1001
875 warn sprintf "loading %s (%d)\n", 1002 warn sprintf "loading %s (%d)\n",
876 $filename, length $data, scalar @{$av || []};#d# 1003 $filename, length $data, scalar @{$av || []};
877 return ($data, $av); 1004 return ($data, $av);
878} 1005}
1006
1007=head2 COMMAND CALLBACKS
1008
1009=over 4
1010
1011=cut
879 1012
880############################################################################# 1013#############################################################################
881# command handling &c 1014# command handling &c
882 1015
883=item cf::register_command $name => \&callback($ob,$args); 1016=item cf::register_command $name => \&callback($ob,$args);
896 push @{ $COMMAND{$name} }, [$caller, $cb]; 1029 push @{ $COMMAND{$name} }, [$caller, $cb];
897} 1030}
898 1031
899=item cf::register_extcmd $name => \&callback($pl,$packet); 1032=item cf::register_extcmd $name => \&callback($pl,$packet);
900 1033
901Register a callbackf ro execution when the client sends an extcmd packet. 1034Register a callback fro execution when the client sends an extcmd packet.
902 1035
903If the callback returns something, it is sent back as if reply was being 1036If the callback returns something, it is sent back as if reply was being
904called. 1037called.
905 1038
906=cut 1039=cut
907 1040
908sub register_extcmd { 1041sub register_extcmd {
909 my ($name, $cb) = @_; 1042 my ($name, $cb) = @_;
910 1043
911 my $caller = caller;
912 #warn "registering extcmd '$name' to '$caller'";
913
914 $EXTCMD{$name} = [$cb, $caller]; 1044 $EXTCMD{$name} = $cb;
915} 1045}
916 1046
917cf::player->attach ( 1047cf::player->attach (
918 on_command => sub { 1048 on_command => sub {
919 my ($pl, $name, $params) = @_; 1049 my ($pl, $name, $params) = @_;
932 1062
933 my $msg = eval { from_json $buf }; 1063 my $msg = eval { from_json $buf };
934 1064
935 if (ref $msg) { 1065 if (ref $msg) {
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
937 if (my %reply = $cb->[0]->($pl, $msg)) { 1067 if (my %reply = $cb->($pl, $msg)) {
938 $pl->ext_reply ($msg->{msgid}, %reply); 1068 $pl->ext_reply ($msg->{msgid}, %reply);
939 } 1069 }
940 } 1070 }
941 } else { 1071 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
944 1074
945 cf::override; 1075 cf::override;
946 }, 1076 },
947); 1077);
948 1078
949sub register {
950 my ($base, $pkg) = @_;
951
952 #TODO
953}
954
955sub load_extension {
956 my ($path) = @_;
957
958 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
959 my $base = $1;
960 my $pkg = $1;
961 $pkg =~ s/[^[:word:]]/_/g;
962 $pkg = "ext::$pkg";
963
964 warn "loading '$path' into '$pkg'\n";
965
966 open my $fh, "<:utf8", $path
967 or die "$path: $!";
968
969 my $source =
970 "package $pkg; use strict; use utf8;\n"
971 . "#line 1 \"$path\"\n{\n"
972 . (do { local $/; <$fh> })
973 . "\n};\n1";
974
975 eval $source
976 or die $@ ? "$path: $@\n"
977 : "extension disabled.\n";
978
979 push @exts, $pkg;
980 $ext_pkg{$base} = $pkg;
981
982# no strict 'refs';
983# @{"$pkg\::ISA"} = ext::;
984
985 register $base, $pkg;
986}
987
988sub unload_extension {
989 my ($pkg) = @_;
990
991 warn "removing extension $pkg\n";
992
993 # remove hooks
994 #TODO
995# for my $idx (0 .. $#PLUGIN_EVENT) {
996# delete $hook[$idx]{$pkg};
997# }
998
999 # remove commands
1000 for my $name (keys %COMMAND) {
1001 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1002
1003 if (@cb) {
1004 $COMMAND{$name} = \@cb;
1005 } else {
1006 delete $COMMAND{$name};
1007 }
1008 }
1009
1010 # remove extcmds
1011 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1012 delete $EXTCMD{$name};
1013 }
1014
1015 if (my $cb = $pkg->can ("unload")) {
1016 eval {
1017 $cb->($pkg);
1018 1
1019 } or warn "$pkg unloaded, but with errors: $@";
1020 }
1021
1022 Symbol::delete_package $pkg;
1023}
1024
1025sub load_extensions { 1079sub load_extensions {
1080 cf::sync_job {
1081 my %todo;
1082
1026 for my $ext (<$LIBDIR/*.ext>) { 1083 for my $path (<$LIBDIR/*.ext>) {
1027 next unless -r $ext; 1084 next unless -r $path;
1028 eval { 1085
1029 load_extension $ext; 1086 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1087 my $base = $1;
1088 my $pkg = $1;
1089 $pkg =~ s/[^[:word:]]/_/g;
1090 $pkg = "ext::$pkg";
1091
1092 open my $fh, "<:utf8", $path
1093 or die "$path: $!";
1094
1095 my $source = do { local $/; <$fh> };
1096
1097 my %ext = (
1098 path => $path,
1099 base => $base,
1100 pkg => $pkg,
1101 );
1102
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105
1106 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n"
1109 . $source
1110 . "\n};\n1";
1111
1112 $todo{$base} = \%ext;
1113 }
1114
1115 my %done;
1116 while (%todo) {
1117 my $progress;
1118
1119 while (my ($k, $v) = each %todo) {
1120 for (split /,\s*/, $v->{meta}{depends}) {
1121 goto skip
1122 unless exists $done{$_};
1123 }
1124
1125 warn "... loading '$k' into '$v->{pkg}'\n";
1126
1127 unless (eval $v->{source}) {
1128 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n";
1130
1131 if (exists $v->{meta}{mandatory}) {
1132 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n";
1134 exit 1;
1135 }
1136
1137 warn $msg;
1138 }
1139
1140 $done{$k} = delete $todo{$k};
1141 push @EXTS, $v->{pkg};
1142 $progress = 1;
1030 1 1143 }
1031 } or warn "$ext not loaded: $@"; 1144
1145 skip:
1146 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1147 unless $progress;
1148 }
1032 } 1149 };
1033} 1150}
1034 1151
1035############################################################################# 1152#############################################################################
1036# load/save/clean perl data associated with a map
1037 1153
1038*cf::mapsupport::on_clean = sub { 1154=back
1039 my ($map) = @_;
1040
1041 my $path = $map->tmpname;
1042 defined $path or return;
1043
1044 unlink "$path.pst";
1045};
1046
1047cf::map->attach (prio => -10000, package => cf::mapsupport::);
1048
1049#############################################################################
1050# load/save perl data associated with player->ob objects
1051
1052sub all_objects(@) {
1053 @_, map all_objects ($_->inv), @_
1054}
1055
1056# TODO: compatibility cruft, remove when no longer needed
1057cf::player->attach (
1058 on_load => sub {
1059 my ($pl, $path) = @_;
1060
1061 for my $o (all_objects $pl->ob) {
1062 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1063 $o->set_ob_key_value ("_perl_data");
1064
1065 %$o = %{ Storable::thaw pack "H*", $value };
1066 }
1067 }
1068 },
1069);
1070
1071#############################################################################
1072 1155
1073=head2 CORE EXTENSIONS 1156=head2 CORE EXTENSIONS
1074 1157
1075Functions and methods that extend core crossfire objects. 1158Functions and methods that extend core crossfire objects.
1076 1159
1077=cut 1160=cut
1078 1161
1079package cf::player; 1162package cf::player;
1080 1163
1164use Coro::AIO;
1165
1081=head3 cf::player 1166=head3 cf::player
1082 1167
1083=over 4 1168=over 4
1084 1169
1085=item cf::player::find $login 1170=item cf::player::find $login
1086 1171
1087Returns the given player object, loading it if necessary (might block). 1172Returns the given player object, loading it if necessary (might block).
1088 1173
1089=cut 1174=cut
1090 1175
1176sub playerdir($) {
1177 "$PLAYERDIR/"
1178 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1179}
1180
1091sub path($) { 1181sub path($) {
1092 sprintf "%s/%s/%s/%s.pl", 1182 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1093 cf::localdir, cf::playerdir, 1183
1094 (ref $_[0] ? $_[0]->ob->name : $_[0]) x 2 1184 (playerdir $login) . "/playerdata"
1095} 1185}
1096 1186
1097sub find_active($) { 1187sub find_active($) {
1098 $cf::PLAYER{$_[0]} 1188 $cf::PLAYER{$_[0]}
1099 and $cf::PLAYER{$_[0]}->active 1189 and $cf::PLAYER{$_[0]}->active
1102 1192
1103sub exists($) { 1193sub exists($) {
1104 my ($login) = @_; 1194 my ($login) = @_;
1105 1195
1106 $cf::PLAYER{$login} 1196 $cf::PLAYER{$login}
1107 or cf::sync_job { !aio_stat $login } 1197 or cf::sync_job { !aio_stat path $login }
1108} 1198}
1109 1199
1110sub find($) { 1200sub find($) {
1111 return $cf::PLAYER{$_[0]} || do { 1201 return $cf::PLAYER{$_[0]} || do {
1112 my $login = $_[0]; 1202 my $login = $_[0];
1113 1203
1114 my $guard = cf::lock_acquire "user_find:$login"; 1204 my $guard = cf::lock_acquire "user_find:$login";
1115 1205
1116 $cf::PLAYER{$login} ||= (load_pl path $login or return); 1206 $cf::PLAYER{$_[0]} || do {
1207 # rename old playerfiles to new ones
1208 #TODO: remove when no longer required
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl";
1213
1214 my $pl = load_pl path $login
1215 or return;
1216 $cf::PLAYER{$login} = $pl
1217 }
1117 }; 1218 }
1118} 1219}
1119 1220
1120sub save($) { 1221sub save($) {
1121 my ($pl) = @_; 1222 my ($pl) = @_;
1122 1223
1124 1225
1125 my $path = path $pl; 1226 my $path = path $pl;
1126 my $guard = cf::lock_acquire "user_save:$path"; 1227 my $guard = cf::lock_acquire "user_save:$path";
1127 1228
1128 return if $pl->{deny_save}; 1229 return if $pl->{deny_save};
1230
1231 aio_mkdir playerdir $pl, 0770;
1129 $pl->{last_save} = $cf::RUNTIME; 1232 $pl->{last_save} = $cf::RUNTIME;
1130 1233
1131 Coro::cede;
1132 $pl->save_pl ($path); 1234 $pl->save_pl ($path);
1133 Coro::cede; 1235 Coro::cede;
1134} 1236}
1135 1237
1136sub new($) { 1238sub new($) {
1144 $cf::PLAYER{$login} = $self; 1246 $cf::PLAYER{$login} = $self;
1145 1247
1146 $self 1248 $self
1147} 1249}
1148 1250
1251=item $pl->quit_character
1252
1253Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time.
1255
1256=cut
1257
1258sub quit_character {
1259 my ($pl) = @_;
1260
1261 my $name = $pl->ob->name;
1262
1263 $pl->{deny_save} = 1;
1264 $pl->password ("*"); # this should lock out the player until we nuked the dir
1265
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns;
1270
1271 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~";
1273 aio_rename $path, $temp;
1274 delete $cf::PLAYER{$pl->ob->name};
1275 $pl->destroy;
1276
1277 my $prefix = qr<^~\Q$name\E/>;
1278
1279 # nuke player maps
1280 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1281
1282 IO::AIO::aio_rmtree $temp;
1283}
1284
1285=item $pl->kick
1286
1287Kicks a player out of the game. This destroys the connection.
1288
1289=cut
1290
1291sub kick {
1292 my ($pl, $kicker) = @_;
1293
1294 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1295 $pl->killer ("kicked");
1296 $pl->ns->destroy;
1297}
1298
1299=item cf::player::list_logins
1300
1301Returns am arrayref of all valid playernames in the system, can take a
1302while and may block, so not sync_job-capable, ever.
1303
1304=cut
1305
1306sub list_logins {
1307 my $dirs = aio_readdir $PLAYERDIR
1308 or return [];
1309
1310 my @logins;
1311
1312 for my $login (@$dirs) {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag
1316
1317 utf8::decode $login;
1318 push @logins, $login;
1319 }
1320
1321 \@logins
1322}
1323
1324=item $player->maps
1325
1326Returns an arrayref of map paths that are private for this
1327player. May block.
1328
1329=cut
1330
1331sub maps($) {
1332 my ($pl) = @_;
1333
1334 $pl = ref $pl ? $pl->ob->name : $pl;
1335
1336 my $files = aio_readdir playerdir $pl
1337 or return;
1338
1339 my @paths;
1340
1341 for (@$files) {
1342 utf8::decode $_;
1343 next if /\.(?:pl|pst)$/;
1344 next unless /^$PATH_SEP/o;
1345
1346 push @paths, cf::map::normalise "~$pl/$_";
1347 }
1348
1349 \@paths
1350}
1351
1352=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1353
1354Expand crossfire pod fragments into protocol xml.
1355
1356=cut
1357
1358sub expand_cfpod {
1359 ((my $self), (local $_)) = @_;
1360
1361 # escape & and <
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364
1365 # this is buggy, it needs to properly take care of nested <'s
1366
1367 1 while
1368 # replace B<>, I<>, U<> etc.
1369 s/B<([^\>]*)>/<b>$1<\/b>/
1370 || s/I<([^\>]*)>/<i>$1<\/i>/
1371 || s/U<([^\>]*)>/<u>$1<\/u>/
1372 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1
1375 }ge
1376 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378
1379 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g;
1381
1382 $_
1383}
1384
1149=item $player->ext_reply ($msgid, $msgtype, %msg) 1385=item $player->ext_reply ($msgid, %msg)
1150 1386
1151Sends an ext reply to the player. 1387Sends an ext reply to the player.
1152 1388
1153=cut 1389=cut
1154 1390
1155sub ext_reply($$$%) { 1391sub ext_reply($$%) {
1156 my ($self, $id, %msg) = @_; 1392 my ($self, $id, %msg) = @_;
1157 1393
1158 $msg{msgid} = $id; 1394 $msg{msgid} = $id;
1159 1395
1160 $self->send ("ext " . cf::to_json \%msg); 1396 $self->send ("ext " . cf::to_json \%msg);
1161} 1397}
1162 1398
1163package cf; 1399=item $player->ext_event ($type, %msg)
1400
1401Sends an ext event to the client.
1402
1403=cut
1404
1405sub ext_event($$%) {
1406 my ($self, $type, %msg) = @_;
1407
1408 $self->ns->ext_event ($type, %msg);
1409}
1410
1411=head3 cf::region
1412
1413=over 4
1414
1415=cut
1416
1417package cf::region;
1418
1419=item cf::region::find_by_path $path
1420
1421Tries to decuce the likely region for a map knowing only its path.
1422
1423=cut
1424
1425sub find_by_path($) {
1426 my ($path) = @_;
1427
1428 my ($match, $specificity);
1429
1430 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) {
1432 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity;
1434 }
1435 }
1436
1437 $match
1438}
1164 1439
1165=back 1440=back
1166
1167 1441
1168=head3 cf::map 1442=head3 cf::map
1169 1443
1170=over 4 1444=over 4
1171 1445
1174package cf::map; 1448package cf::map;
1175 1449
1176use Fcntl; 1450use Fcntl;
1177use Coro::AIO; 1451use Coro::AIO;
1178 1452
1453use overload
1454 '""' => \&as_string,
1455 fallback => 1;
1456
1179our $MAX_RESET = 3600; 1457our $MAX_RESET = 3600;
1180our $DEFAULT_RESET = 3000; 1458our $DEFAULT_RESET = 3000;
1181 1459
1182sub generate_random_map { 1460sub generate_random_map {
1183 my ($path, $rmp) = @_; 1461 my ($self, $rmp) = @_;
1184
1185 # mit "rum" bekleckern, nicht 1462 # mit "rum" bekleckern, nicht
1186 cf::map::_create_random_map 1463 $self->_create_random_map (
1187 $path,
1188 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1464 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1189 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1465 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1190 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1466 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1191 $rmp->{exit_on_final_map}, 1467 $rmp->{exit_on_final_map},
1192 $rmp->{xsize}, $rmp->{ysize}, 1468 $rmp->{xsize}, $rmp->{ysize},
1193 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1469 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1194 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1470 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1195 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1471 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1196 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1472 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1197 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1473 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1198 (cf::region::find $rmp->{region}) 1474 (cf::region::find $rmp->{region}), $rmp->{custom}
1475 )
1476}
1477
1478=item cf::map->register ($regex, $prio)
1479
1480Register a handler for the map path matching the given regex at the
1481givne priority (higher is better, built-in handlers have priority 0, the
1482default).
1483
1484=cut
1485
1486sub register {
1487 my (undef, $regex, $prio) = @_;
1488 my $pkg = caller;
1489
1490 no strict;
1491 push @{"$pkg\::ISA"}, __PACKAGE__;
1492
1493 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1494}
1495
1496# also paths starting with '/'
1497$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1498
1499sub thawer_merge {
1500 my ($self, $merge) = @_;
1501
1502 # we have to keep some variables in memory intact
1503 local $self->{path};
1504 local $self->{load_path};
1505
1506 $self->SUPER::thawer_merge ($merge);
1507}
1508
1509sub normalise {
1510 my ($path, $base) = @_;
1511
1512 $path = "$path"; # make sure its a string
1513
1514 $path =~ s/\.map$//;
1515
1516 # map plan:
1517 #
1518 # /! non-realised random map exit (special hack!)
1519 # {... are special paths that are not being touched
1520 # ?xxx/... are special absolute paths
1521 # ?random/... random maps
1522 # /... normal maps
1523 # ~user/... per-player map of a specific user
1524
1525 $path =~ s/$PATH_SEP/\//go;
1526
1527 # treat it as relative path if it starts with
1528 # something that looks reasonable
1529 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1530 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1531
1532 $base =~ s{[^/]+/?$}{};
1533 $path = "$base/$path";
1534 }
1535
1536 for ($path) {
1537 redo if s{//}{/};
1538 redo if s{/\.?/}{/};
1539 redo if s{/[^/]+/\.\./}{/};
1540 }
1541
1542 $path
1543}
1544
1545sub new_from_path {
1546 my (undef, $path, $base) = @_;
1547
1548 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1549
1550 $path = normalise $path, $base;
1551
1552 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1553 if ($path =~ $EXT_MAP{$pkg}[1]) {
1554 my $self = bless cf::map::new, $pkg;
1555 $self->{path} = $path; $self->path ($path);
1556 $self->init; # pass $1 etc.
1557 return $self;
1558 }
1559 }
1560
1561 Carp::carp "unable to resolve path '$path' (base '$base').";
1562 ()
1563}
1564
1565sub init {
1566 my ($self) = @_;
1567
1568 $self
1569}
1570
1571sub as_string {
1572 my ($self) = @_;
1573
1574 "$self->{path}"
1575}
1576
1577# the displayed name, this is a one way mapping
1578sub visible_name {
1579 &as_string
1580}
1581
1582# the original (read-only) location
1583sub load_path {
1584 my ($self) = @_;
1585
1586 "$MAPDIR/$self->{path}.map"
1587}
1588
1589# the temporary/swap location
1590sub save_path {
1591 my ($self) = @_;
1592
1593 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1594 "$TMPDIR/$path.map"
1595}
1596
1597# the unique path, undef == no special unique path
1598sub uniq_path {
1599 my ($self) = @_;
1600
1601 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1602 "$UNIQUEDIR/$path"
1199} 1603}
1200 1604
1201# and all this just because we cannot iterate over 1605# and all this just because we cannot iterate over
1202# all maps in C++... 1606# all maps in C++...
1203sub change_all_map_light { 1607sub change_all_map_light {
1205 1609
1206 $_->change_map_light ($change) 1610 $_->change_map_light ($change)
1207 for grep $_->outdoor, values %cf::MAP; 1611 for grep $_->outdoor, values %cf::MAP;
1208} 1612}
1209 1613
1614sub decay_objects {
1615 my ($self) = @_;
1616
1617 return if $self->{deny_reset};
1618
1619 $self->do_decay_objects;
1620}
1621
1622sub unlink_save {
1623 my ($self) = @_;
1624
1625 utf8::encode (my $save = $self->save_path);
1626 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1627 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1628}
1629
1210sub try_load_header($) { 1630sub load_header_from($) {
1211 my ($path) = @_; 1631 my ($self, $path) = @_;
1212 1632
1213 utf8::encode $path; 1633 utf8::encode $path;
1214 aio_open $path, O_RDONLY, 0 1634 #aio_open $path, O_RDONLY, 0
1635 # or return;
1636
1637 $self->_load_header ($path)
1215 or return; 1638 or return;
1216 1639
1217 my $map = cf::map::new 1640 $self->{load_path} = $path;
1641
1642 1
1643}
1644
1645sub load_header_orig {
1646 my ($self) = @_;
1647
1648 $self->load_header_from ($self->load_path)
1649}
1650
1651sub load_header_temp {
1652 my ($self) = @_;
1653
1654 $self->load_header_from ($self->save_path)
1655}
1656
1657sub prepare_temp {
1658 my ($self) = @_;
1659
1660 $self->last_access ((delete $self->{last_access})
1661 || $cf::RUNTIME); #d#
1662 # safety
1663 $self->{instantiate_time} = $cf::RUNTIME
1664 if $self->{instantiate_time} > $cf::RUNTIME;
1665}
1666
1667sub prepare_orig {
1668 my ($self) = @_;
1669
1670 $self->{load_original} = 1;
1671 $self->{instantiate_time} = $cf::RUNTIME;
1672 $self->last_access ($cf::RUNTIME);
1673 $self->instantiate;
1674}
1675
1676sub load_header {
1677 my ($self) = @_;
1678
1679 if ($self->load_header_temp) {
1680 $self->prepare_temp;
1681 } else {
1682 $self->load_header_orig
1218 or return; 1683 or return;
1684 $self->prepare_orig;
1685 }
1219 1686
1220 # for better error messages only, will be overwritten 1687 $self->{deny_reset} = 1
1221 $map->path ($path); 1688 if $self->no_reset;
1222 1689
1223 $map->load_header ($path) 1690 $self->default_region (cf::region::find_by_path $self->{path})
1224 or return; 1691 unless $self->default_region;
1225 1692
1226 $map->{load_path} = $path; 1693 1
1227
1228 $map
1229} 1694}
1230 1695
1231sub find; 1696sub find;
1232sub find { 1697sub find {
1233 my ($path, $origin) = @_; 1698 my ($path, $origin) = @_;
1234 1699
1235 #warn "find<$path,$origin>\n";#d#
1236
1237 $path = new cf::path $path, $origin && $origin->path; 1700 $path = normalise $path, $origin && $origin->path;
1238 my $key = $path->as_string;
1239 1701
1240 cf::lock_wait "map_find:$key"; 1702 cf::lock_wait "map_find:$path";
1241 1703
1242 $cf::MAP{$key} || do { 1704 $cf::MAP{$path} || do {
1243 my $guard = cf::lock_acquire "map_find:$key"; 1705 my $guard = cf::lock_acquire "map_find:$path";
1244 1706 my $map = new_from_path cf::map $path
1245 # do it the slow way
1246 my $map = try_load_header $path->save_path;
1247
1248 Coro::cede;
1249
1250 if ($map) {
1251 $map->last_access ((delete $map->{last_access})
1252 || $cf::RUNTIME); #d#
1253 # safety
1254 $map->{instantiate_time} = $cf::RUNTIME
1255 if $map->{instantiate_time} > $cf::RUNTIME;
1256 } else {
1257 if (my $rmp = $path->random_map_params) {
1258 $map = generate_random_map $key, $rmp;
1259 } else {
1260 $map = try_load_header $path->load_path;
1261 }
1262
1263 $map or return; 1707 or return;
1264 1708
1265 $map->{load_original} = 1;
1266 $map->{instantiate_time} = $cf::RUNTIME;
1267 $map->last_access ($cf::RUNTIME);
1268 $map->instantiate;
1269
1270 # per-player maps become, after loading, normal maps
1271 $map->per_player (0) if $path->{user_rel};
1272 }
1273
1274 $map->path ($key);
1275 $map->{path} = $path;
1276 $map->{last_save} = $cf::RUNTIME; 1709 $map->{last_save} = $cf::RUNTIME;
1277 1710
1278 Coro::cede; 1711 $map->load_header
1712 or return;
1279 1713
1280 if ($map->should_reset) { 1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait;
1281 $map->reset; 1717 $map->reset;
1282 undef $guard; 1718 undef $guard;
1283 $map = find $path 1719 return find $path;
1284 or return;
1285 } 1720 }
1286 1721
1287 $cf::MAP{$key} = $map 1722 $cf::MAP{$path} = $map
1288 } 1723 }
1289} 1724}
1725
1726sub pre_load { }
1727sub post_load { }
1290 1728
1291sub load { 1729sub load {
1292 my ($self) = @_; 1730 my ($self) = @_;
1293 1731
1732 local $self->{deny_reset} = 1; # loading can take a long time
1733
1294 my $path = $self->{path}; 1734 my $path = $self->{path};
1735
1736 {
1295 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1737 my $guard = cf::lock_acquire "map_load:$path";
1296 1738
1297 return if $self->in_memory != cf::MAP_SWAPPED; 1739 return if $self->in_memory != cf::MAP_SWAPPED;
1298 1740
1299 $self->in_memory (cf::MAP_LOADING); 1741 $self->in_memory (cf::MAP_LOADING);
1300 1742
1301 $self->alloc; 1743 $self->alloc;
1744
1745 $self->pre_load;
1746 Coro::cede;
1747
1302 $self->load_objects ($self->{load_path}, 1) 1748 $self->_load_objects ($self->{load_path}, 1)
1303 or return; 1749 or return;
1304 1750
1305 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1306 if delete $self->{load_original}; 1752 if delete $self->{load_original};
1307 1753
1308 if (my $uniq = $path->uniq_path) { 1754 if (my $uniq = $self->uniq_path) {
1309 utf8::encode $uniq; 1755 utf8::encode $uniq;
1310 if (aio_open $uniq, O_RDONLY, 0) { 1756 if (aio_open $uniq, O_RDONLY, 0) {
1311 $self->clear_unique_items; 1757 $self->clear_unique_items;
1312 $self->load_objects ($uniq, 0); 1758 $self->_load_objects ($uniq, 0);
1313 } 1759 }
1314 } 1760 }
1315 1761
1316 Coro::cede; 1762 Coro::cede;
1317
1318 # now do the right thing for maps 1763 # now do the right thing for maps
1319 $self->link_multipart_objects; 1764 $self->link_multipart_objects;
1320
1321 if ($self->{path}->is_style_map) {
1322 $self->{deny_save} = 1;
1323 $self->{deny_reset} = 1;
1324 } else {
1325 $self->fix_auto_apply;
1326 $self->decay_objects;
1327 $self->update_buttons;
1328 $self->set_darkness_map;
1329 $self->difficulty ($self->estimate_difficulty) 1765 $self->difficulty ($self->estimate_difficulty)
1330 unless $self->difficulty; 1766 unless $self->difficulty;
1767 Coro::cede;
1768
1769 unless ($self->{deny_activate}) {
1770 $self->decay_objects;
1771 $self->fix_auto_apply;
1772 $self->update_buttons;
1773 Coro::cede;
1774 $self->set_darkness_map;
1775 Coro::cede;
1331 $self->activate; 1776 $self->activate;
1332 } 1777 }
1333 1778
1334 Coro::cede;
1335
1336 $self->in_memory (cf::MAP_IN_MEMORY); 1779 $self->in_memory (cf::MAP_IN_MEMORY);
1780 }
1781
1782 $self->post_load;
1783}
1784
1785sub customise_for {
1786 my ($self, $ob) = @_;
1787
1788 return find "~" . $ob->name . "/" . $self->{path}
1789 if $self->per_player;
1790
1791# return find "?party/" . $ob->name . "/" . $self->{path}
1792# if $self->per_party;
1793
1794 $self
1795}
1796
1797# find and load all maps in the 3x3 area around a map
1798sub load_diag {
1799 my ($map) = @_;
1800
1801 my @diag; # diagonal neighbours
1802
1803 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_)
1805 or next;
1806 $neigh = find $neigh, $map
1807 or next;
1808 $neigh->load;
1809
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 }
1813
1814 for (@diag) {
1815 my $neigh = find @$_
1816 or next;
1817 $neigh->load;
1818 }
1337} 1819}
1338 1820
1339sub find_sync { 1821sub find_sync {
1340 my ($path, $origin) = @_; 1822 my ($path, $origin) = @_;
1341 1823
1342 cf::sync_job { cf::map::find $path, $origin } 1824 cf::sync_job { find $path, $origin }
1343} 1825}
1344 1826
1345sub do_load_sync { 1827sub do_load_sync {
1346 my ($map) = @_; 1828 my ($map) = @_;
1347 1829
1348 cf::sync_job { $map->load }; 1830 cf::sync_job { $map->load };
1349} 1831}
1350 1832
1833our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef;
1835
1836sub find_async {
1837 my ($path, $origin) = @_;
1838
1839 $path = normalise $path, $origin && $origin->{path};
1840
1841 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1843 }
1844
1845 undef $MAP_PREFETCH{$path};
1846 $MAP_PREFETCHER ||= cf::async {
1847 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) {
1849 my $map = find $path
1850 or next;
1851 $map->load;
1852
1853 delete $MAP_PREFETCH{$path};
1854 }
1855 }
1856 undef $MAP_PREFETCHER;
1857 };
1858 $MAP_PREFETCHER->prio (6);
1859
1860 ()
1861}
1862
1351sub save { 1863sub save {
1352 my ($self) = @_; 1864 my ($self) = @_;
1353 1865
1354 my $lock = cf::lock_acquire "map_data:" . $self->path; 1866 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355 1867
1356 $self->{last_save} = $cf::RUNTIME; 1868 $self->{last_save} = $cf::RUNTIME;
1357 1869
1358 return unless $self->dirty; 1870 return unless $self->dirty;
1359 1871
1360 my $save = $self->{path}->save_path; utf8::encode $save; 1872 my $save = $self->save_path; utf8::encode $save;
1361 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1873 my $uniq = $self->uniq_path; utf8::encode $uniq;
1362 1874
1363 $self->{load_path} = $save; 1875 $self->{load_path} = $save;
1364 1876
1365 return if $self->{deny_save}; 1877 return if $self->{deny_save};
1366 1878
1369 cf::async { 1881 cf::async {
1370 $_->contr->save for $self->players; 1882 $_->contr->save for $self->players;
1371 }; 1883 };
1372 1884
1373 if ($uniq) { 1885 if ($uniq) {
1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1375 $self->save_objects ($uniq, cf::IO_UNIQUES); 1887 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1376 } else { 1888 } else {
1377 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1889 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1378 } 1890 }
1379} 1891}
1380 1892
1381sub swap_out { 1893sub swap_out {
1382 my ($self) = @_; 1894 my ($self) = @_;
1396 1908
1397sub reset_at { 1909sub reset_at {
1398 my ($self) = @_; 1910 my ($self) = @_;
1399 1911
1400 # TODO: safety, remove and allow resettable per-player maps 1912 # TODO: safety, remove and allow resettable per-player maps
1401 return 1e99 if $self->{path}{user_rel};
1402 return 1e99 if $self->{deny_reset}; 1913 return 1e99 if $self->{deny_reset};
1403 1914
1404 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1915 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1405 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1916 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1406 1917
1411 my ($self) = @_; 1922 my ($self) = @_;
1412 1923
1413 $self->reset_at <= $cf::RUNTIME 1924 $self->reset_at <= $cf::RUNTIME
1414} 1925}
1415 1926
1416sub unlink_save {
1417 my ($self) = @_;
1418
1419 utf8::encode (my $save = $self->{path}->save_path);
1420 aioreq_pri 3; IO::AIO::aio_unlink $save;
1421 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1422}
1423
1424sub rename {
1425 my ($self, $new_path) = @_;
1426
1427 $self->unlink_save;
1428
1429 delete $cf::MAP{$self->path};
1430 $self->{path} = new cf::path $new_path;
1431 $self->path ($self->{path}->as_string);
1432 $cf::MAP{$self->path} = $self;
1433
1434 $self->save;
1435}
1436
1437sub reset { 1927sub reset {
1438 my ($self) = @_; 1928 my ($self) = @_;
1439 1929
1440 my $lock = cf::lock_acquire "map_data:" . $self->path; 1930 my $lock = cf::lock_acquire "map_data:$self->{path}";
1441 1931
1442 return if $self->players; 1932 return if $self->players;
1443 return if $self->{path}{user_rel};#d#
1444 1933
1445 warn "resetting map ", $self->path;#d# 1934 warn "resetting map ", $self->path;
1935
1936 $self->in_memory (cf::MAP_SWAPPED);
1937
1938 # need to save uniques path
1939 unless ($self->{deny_save}) {
1940 my $uniq = $self->uniq_path; utf8::encode $uniq;
1941
1942 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1943 if $uniq;
1944 }
1446 1945
1447 delete $cf::MAP{$self->path}; 1946 delete $cf::MAP{$self->path};
1947
1948 $self->clear;
1448 1949
1449 $_->clear_links_to ($self) for values %cf::MAP; 1950 $_->clear_links_to ($self) for values %cf::MAP;
1450 1951
1451 $self->unlink_save; 1952 $self->unlink_save;
1452 $self->destroy; 1953 $self->destroy;
1455my $nuke_counter = "aaaa"; 1956my $nuke_counter = "aaaa";
1456 1957
1457sub nuke { 1958sub nuke {
1458 my ($self) = @_; 1959 my ($self) = @_;
1459 1960
1961 delete $cf::MAP{$self->path};
1962
1963 $self->unlink_save;
1964
1965 bless $self, "cf::map";
1966 delete $self->{deny_reset};
1460 $self->{deny_save} = 1; 1967 $self->{deny_save} = 1;
1461 $self->reset_timeout (1); 1968 $self->reset_timeout (1);
1462 $self->rename ("{nuke}/" . ($nuke_counter++)); 1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970
1971 $cf::MAP{$self->path} = $self;
1972
1463 $self->reset; # polite request, might not happen 1973 $self->reset; # polite request, might not happen
1464} 1974}
1465 1975
1466sub customise_for { 1976=item $maps = cf::map::tmp_maps
1467 my ($map, $ob) = @_;
1468 1977
1469 if ($map->per_player) { 1978Returns an arrayref with all map paths of currently instantiated and saved
1470 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1979maps. May block.
1980
1981=cut
1982
1983sub tmp_maps() {
1471 } 1984 [
1472 1985 map {
1473 $map 1986 utf8::decode $_;
1987 /\.map$/
1988 ? normalise $_
1989 : ()
1990 } @{ aio_readdir $TMPDIR or [] }
1991 ]
1474} 1992}
1475 1993
1476sub emergency_save { 1994=item $maps = cf::map::random_maps
1477 my $freeze_guard = cf::freeze_mainloop;
1478 1995
1479 warn "enter emergency perl save\n"; 1996Returns an arrayref with all map paths of currently instantiated and saved
1997random maps. May block.
1480 1998
1481 cf::sync_job { 1999=cut
1482 warn "begin emergency player save\n";
1483 $_->save for values %cf::PLAYER;
1484 warn "end emergency player save\n";
1485 2000
1486 warn "begin emergency map save\n"; 2001sub random_maps() {
1487 $_->save for values %cf::MAP; 2002 [
1488 warn "end emergency map save\n"; 2003 map {
1489 }; 2004 utf8::decode $_;
2005 /\.map$/
2006 ? normalise "?random/$_"
2007 : ()
2008 } @{ aio_readdir $RANDOMDIR or [] }
2009 ]
2010}
1490 2011
1491 warn "leave emergency perl save\n"; 2012=item cf::map::unique_maps
2013
2014Returns an arrayref of paths of all shared maps that have
2015instantiated unique items. May block.
2016
2017=cut
2018
2019sub unique_maps() {
2020 [
2021 map {
2022 utf8::decode $_;
2023 /\.map$/
2024 ? normalise $_
2025 : ()
2026 } @{ aio_readdir $UNIQUEDIR or [] }
2027 ]
1492} 2028}
1493 2029
1494package cf; 2030package cf;
1495 2031
1496=back 2032=back
1497 2033
2034=head3 cf::object
2035
2036=cut
2037
2038package cf::object;
2039
2040=over 4
2041
2042=item $ob->inv_recursive
2043
2044Returns the inventory of the object _and_ their inventories, recursively.
2045
2046=cut
2047
2048sub inv_recursive_;
2049sub inv_recursive_ {
2050 map { $_, inv_recursive_ $_->inv } @_
2051}
2052
2053sub inv_recursive {
2054 inv_recursive_ inv $_[0]
2055}
2056
2057package cf;
2058
2059=back
1498 2060
1499=head3 cf::object::player 2061=head3 cf::object::player
1500 2062
1501=over 4 2063=over 4
1502 2064
1516 2078
1517 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2079 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1518 2080
1519 if ($self->{record_replies}) { 2081 if ($self->{record_replies}) {
1520 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2082 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2083
1521 } else { 2084 } else {
2085 my $pl = $self->contr;
2086
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply (
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095
2096 } else {
1522 $msg = $npc->name . " says: $msg" if $npc; 2097 $msg = $npc->name . " says: $msg" if $npc;
1523 $self->message ($msg, $flags); 2098 $self->message ($msg, $flags);
2099 }
1524 } 2100 }
1525} 2101}
1526 2102
1527=item $player_object->may ("access") 2103=item $player_object->may ("access")
1528 2104
1542 2118
1543=item $player_object->enter_link 2119=item $player_object->enter_link
1544 2120
1545Freezes the player and moves him/her to a special map (C<{link}>). 2121Freezes the player and moves him/her to a special map (C<{link}>).
1546 2122
1547The player should be reaosnably safe there for short amounts of time. You 2123The player should be reasonably safe there for short amounts of time. You
1548I<MUST> call C<leave_link> as soon as possible, though. 2124I<MUST> call C<leave_link> as soon as possible, though.
1549 2125
2126Will never block.
2127
1550=item $player_object->leave_link ($map, $x, $y) 2128=item $player_object->leave_link ($map, $x, $y)
1551 2129
1552Moves the player out of the specila link map onto the given map. If the 2130Moves the player out of the special C<{link}> map onto the specified
1553map is not valid (or omitted), the player will be moved back to the 2131map. If the map is not valid (or omitted), the player will be moved back
1554location he/she was before the call to C<enter_link>, or, if that fails, 2132to the location he/she was before the call to C<enter_link>, or, if that
1555to the emergency map position. 2133fails, to the emergency map position.
1556 2134
1557Might block. 2135Might block.
1558 2136
1559=cut 2137=cut
2138
2139sub link_map {
2140 unless ($LINK_MAP) {
2141 $LINK_MAP = cf::map::find "{link}"
2142 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
2143 $LINK_MAP->load;
2144 }
2145
2146 $LINK_MAP
2147}
1560 2148
1561sub cf::object::player::enter_link { 2149sub cf::object::player::enter_link {
1562 my ($self) = @_; 2150 my ($self) = @_;
1563 2151
1564 $self->deactivate_recursive; 2152 $self->deactivate_recursive;
1565 2153
1566 return if $self->map == $LINK_MAP; 2154 return if UNIVERSAL::isa $self->map, "ext::map_link";
1567 2155
1568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2156 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1569 if $self->map; 2157 if $self->map && $self->map->{path} ne "{link}";
1570 2158
1571 $self->enter_map ($LINK_MAP, 20, 20); 2159 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1572} 2160}
1573 2161
1574sub cf::object::player::leave_link { 2162sub cf::object::player::leave_link {
1575 my ($self, $map, $x, $y) = @_; 2163 my ($self, $map, $x, $y) = @_;
2164
2165 return unless $self->contr->active;
1576 2166
1577 my $link_pos = delete $self->{_link_pos}; 2167 my $link_pos = delete $self->{_link_pos};
1578 2168
1579 unless ($map) { 2169 unless ($map) {
1580 # restore original map position 2170 # restore original map position
1594 # use -1 or undef as default coordinates, not 0, 0 2184 # use -1 or undef as default coordinates, not 0, 0
1595 ($x, $y) = ($map->enter_x, $map->enter_y) 2185 ($x, $y) = ($map->enter_x, $map->enter_y)
1596 if $x <=0 && $y <= 0; 2186 if $x <=0 && $y <= 0;
1597 2187
1598 $map->load; 2188 $map->load;
2189 $map->load_diag;
1599 2190
1600 return unless $self->contr->active; 2191 return unless $self->contr->active;
1601 $self->activate_recursive; 2192 $self->activate_recursive;
2193
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1602 $self->enter_map ($map, $x, $y); 2195 $self->enter_map ($map, $x, $y);
1603} 2196}
1604 2197
1605cf::player->attach (
1606 on_logout => sub {
1607 my ($pl) = @_;
1608
1609 # abort map switching before logout
1610 if ($pl->ob->{_link_pos}) {
1611 cf::sync_job {
1612 $pl->ob->leave_link
1613 };
1614 }
1615 },
1616 on_login => sub {
1617 my ($pl) = @_;
1618
1619 # try to abort aborted map switching on player login :)
1620 # should happen only on crashes
1621 if ($pl->ob->{_link_pos}) {
1622 $pl->ob->enter_link;
1623 (async {
1624 # we need this sleep as the login has a concurrent enter_exit running
1625 # and this sleep increases chances of the player not ending up in scorn
1626 $pl->ob->reply (undef,
1627 "There was an internal problem at your last logout, "
1628 . "the server will try to bring you to your intended destination in a second.",
1629 cf::NDI_RED);
1630 Coro::Timer::sleep 1;
1631 $pl->ob->leave_link;
1632 })->prio (2);
1633 }
1634 },
1635);
1636
1637=item $player_object->goto ($path, $x, $y) 2198=item $player_object->goto ($path, $x, $y[, $check->($map)])
1638 2199
2200Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position.
2204
1639=cut 2205=cut
2206
2207our $GOTOGEN;
1640 2208
1641sub cf::object::player::goto { 2209sub cf::object::player::goto {
1642 my ($self, $path, $x, $y) = @_; 2210 my ($self, $path, $x, $y, $check) = @_;
2211
2212 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1643 2214
1644 $self->enter_link; 2215 $self->enter_link;
1645 2216
1646 (async { 2217 (async {
1647 $path = new cf::path $path; 2218 my $map = eval {
1648
1649 my $map = cf::map::find $path->as_string; 2219 my $map = cf::map::find $path;
2220
2221 if ($map) {
1650 $map = $map->customise_for ($self) if $map; 2222 $map = $map->customise_for ($self);
1651 2223 $map = $check->($map) if $check && $map;
1652# warn "entering ", $map->path, " at ($x, $y)\n" 2224 } else {
1653# if $map;
1654
1655 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2226 }
1656 2227
2228 $map
2229 };
2230
2231 if ($@) {
2232 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2233 LOG llevError | logBacktrace, Carp::longmess $@;
2234 }
2235
2236 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation};
1657 $self->leave_link ($map, $x, $y); 2238 $self->leave_link ($map, $x, $y);
2239 }
1658 })->prio (1); 2240 })->prio (1);
1659} 2241}
1660 2242
1661=item $player_object->enter_exit ($exit_object) 2243=item $player_object->enter_exit ($exit_object)
1662 2244
1664 2246
1665sub parse_random_map_params { 2247sub parse_random_map_params {
1666 my ($spec) = @_; 2248 my ($spec) = @_;
1667 2249
1668 my $rmp = { # defaults 2250 my $rmp = { # defaults
1669 xsize => 10, 2251 xsize => (cf::rndm 15, 40),
1670 ysize => 10, 2252 ysize => (cf::rndm 15, 40),
2253 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2254 #layout => string,
1671 }; 2255 };
1672 2256
1673 for (split /\n/, $spec) { 2257 for (split /\n/, $spec) {
1674 my ($k, $v) = split /\s+/, $_, 2; 2258 my ($k, $v) = split /\s+/, $_, 2;
1675 2259
1679 $rmp 2263 $rmp
1680} 2264}
1681 2265
1682sub prepare_random_map { 2266sub prepare_random_map {
1683 my ($exit) = @_; 2267 my ($exit) = @_;
2268
2269 my $guard = cf::lock_acquire "exit_prepare:$exit";
1684 2270
1685 # all this does is basically replace the /! path by 2271 # all this does is basically replace the /! path by
1686 # a new random map path (?random/...) with a seed 2272 # a new random map path (?random/...) with a seed
1687 # that depends on the exit object 2273 # that depends on the exit object
1688 2274
1689 my $rmp = parse_random_map_params $exit->msg; 2275 my $rmp = parse_random_map_params $exit->msg;
1690 2276
1691 if ($exit->map) { 2277 if ($exit->map) {
1692 $rmp->{region} = $exit->map->region_name; 2278 $rmp->{region} = $exit->region->name;
1693 $rmp->{origin_map} = $exit->map->path; 2279 $rmp->{origin_map} = $exit->map->path;
1694 $rmp->{origin_x} = $exit->x; 2280 $rmp->{origin_x} = $exit->x;
1695 $rmp->{origin_y} = $exit->y; 2281 $rmp->{origin_y} = $exit->y;
1696 } 2282 }
1697 2283
1698 $rmp->{random_seed} ||= $exit->random_seed; 2284 $rmp->{random_seed} ||= $exit->random_seed;
1699 2285
1700 my $data = cf::to_json $rmp; 2286 my $data = cf::to_json $rmp;
1701 my $md5 = Digest::MD5::md5_hex $data; 2287 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta";
1702 2289
1703 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1704 aio_write $fh, 0, (length $data), $data, 0; 2291 aio_write $fh, 0, (length $data), $data, 0;
2292 undef $fh;
2293 aio_rename "$meta~", $meta;
1705 2294
1706 $exit->slaying ("?random/$md5"); 2295 $exit->slaying ("?random/$md5");
1707 $exit->msg (undef); 2296 $exit->msg (undef);
1708 } 2297 }
1709} 2298}
1710 2299
1711sub cf::object::player::enter_exit { 2300sub cf::object::player::enter_exit {
1712 my ($self, $exit) = @_; 2301 my ($self, $exit) = @_;
1713 2302
1714 return unless $self->type == cf::PLAYER; 2303 return unless $self->type == cf::PLAYER;
2304
2305 if ($exit->slaying eq "/!") {
2306 #TODO: this should de-fi-ni-te-ly not be a sync-job
2307 # the problem is that $exit might not survive long enough
2308 # so it needs to be done right now, right here
2309 cf::sync_job { prepare_random_map $exit };
2310 }
2311
2312 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2313 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp;
1715 2315
1716 $self->enter_link; 2316 $self->enter_link;
1717 2317
1718 (async { 2318 (async {
1719 $self->deactivate_recursive; # just to be sure 2319 $self->deactivate_recursive; # just to be sure
1720 unless (eval { 2320 unless (eval {
1721 prepare_random_map $exit 2321 $self->goto ($slaying, $hp, $sp);
1722 if $exit->slaying eq "/!";
1723
1724 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1725 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1726 2322
1727 1; 2323 1;
1728 }) { 2324 }) {
1729 $self->message ("Something went wrong deep within the crossfire server. " 2325 $self->message ("Something went wrong deep within the crossfire server. "
1730 . "I'll try to bring you back to the map you were before. " 2326 . "I'll try to bring you back to the map you were before. "
1731 . "Please report this to the dungeon master", 2327 . "Please report this to the dungeon master!",
1732 cf::NDI_UNIQUE | cf::NDI_RED); 2328 cf::NDI_UNIQUE | cf::NDI_RED);
1733 2329
1734 warn "ERROR in enter_exit: $@"; 2330 warn "ERROR in enter_exit: $@";
1735 $self->leave_link; 2331 $self->leave_link;
1736 } 2332 }
1737 })->prio (1); 2333 })->prio (1);
1750 2346
1751sub cf::client::send_drawinfo { 2347sub cf::client::send_drawinfo {
1752 my ($self, $text, $flags) = @_; 2348 my ($self, $text, $flags) = @_;
1753 2349
1754 utf8::encode $text; 2350 utf8::encode $text;
1755 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1756} 2352}
1757 2353
2354=item $client->send_msg ($color, $type, $msg, [extra...])
2355
2356Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet.
2360
2361=cut
2362
2363sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_;
2365
2366 $msg = $self->pl->expand_cfpod ($msg);
2367
2368 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2370 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 }
2380
2381 if ($color >= 0) {
2382 if (0 && $msg =~ /\[/) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg")
2384 } else {
2385 s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg")
2387 }
2388 }
2389 }
2390}
2391
2392=item $client->ext_event ($type, %msg)
2393
2394Sends an exti event to the client.
2395
2396=cut
2397
2398sub cf::client::ext_event($$%) {
2399 my ($self, $type, %msg) = @_;
2400
2401 $msg{msgtype} = "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg);
2403}
1758 2404
1759=item $success = $client->query ($flags, "text", \&cb) 2405=item $success = $client->query ($flags, "text", \&cb)
1760 2406
1761Queues a query to the client, calling the given callback with 2407Queues a query to the client, calling the given callback with
1762the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1791 # get handled first 2437 # get handled first
1792 my $queue = delete $ns->{query_queue} 2438 my $queue = delete $ns->{query_queue}
1793 or return; # be conservative, not sure how that can happen, but we saw a crash here 2439 or return; # be conservative, not sure how that can happen, but we saw a crash here
1794 2440
1795 (shift @$queue)->[1]->($msg); 2441 (shift @$queue)->[1]->($msg);
2442 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1796 2443
1797 push @{ $ns->{query_queue} }, @$queue; 2444 push @{ $ns->{query_queue} }, @$queue;
1798 2445
1799 if (@{ $ns->{query_queue} } == @$queue) { 2446 if (@{ $ns->{query_queue} } == @$queue) {
1800 if (@$queue) { 2447 if (@$queue) {
1858 2505
1859# here we export the classes and methods available to script code 2506# here we export the classes and methods available to script code
1860 2507
1861=pod 2508=pod
1862 2509
1863The following fucntions and emthods are available within a safe environment: 2510The following functions and methods are available within a safe environment:
1864 2511
1865 cf::object contr pay_amount pay_player map 2512 cf::object contr pay_amount pay_player map
1866 cf::object::player player 2513 cf::object::player player
1867 cf::player peaceful 2514 cf::player peaceful
1868 cf::map trigger 2515 cf::map trigger
1949=back 2596=back
1950 2597
1951=cut 2598=cut
1952 2599
1953############################################################################# 2600#############################################################################
2601# the server's init and main functions
1954 2602
1955=head2 EXTENSION DATABASE SUPPORT 2603sub load_facedata($) {
2604 my ($path) = @_;
1956 2605
1957Crossfire maintains a very simple database for extension use. It can 2606 warn "loading facedata from $path\n";
1958currently store anything that can be serialised using Storable, which
1959excludes objects.
1960 2607
1961The parameter C<$family> should best start with the name of the extension 2608 my $facedata;
1962using it, it should be unique. 2609 0 < aio_load $path, $facedata
2610 or die "$path: $!";
1963 2611
1964=over 4 2612 $facedata = Coro::Storable::thaw $facedata;
1965 2613
1966=item $hashref = cf::db_get $family 2614 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed.";
1967 2616
1968Return a hashref for use by the extension C<$family>, which can be
1969modified. After modifications, you have to call C<cf::db_dirty> or
1970C<cf::db_sync>.
1971
1972=item $value = cf::db_get $family => $key
1973
1974Returns a single value from the database
1975
1976=item cf::db_put $family => $hashref
1977
1978Stores the given family hashref into the database. Updates are delayed, if
1979you want the data to be synced to disk immediately, use C<cf::db_sync>.
1980
1981=item cf::db_put $family => $key => $value
1982
1983Stores the given C<$value> in the family hash. Updates are delayed, if you
1984want the data to be synced to disk immediately, use C<cf::db_sync>.
1985
1986=item cf::db_dirty
1987
1988Marks the database as dirty, to be updated at a later time.
1989
1990=item cf::db_sync
1991
1992Immediately write the database to disk I<if it is dirty>.
1993
1994=cut
1995
1996our $DB;
1997
1998{
1999 my $path = cf::localdir . "/database.pst";
2000
2001 sub db_load() {
2002 $DB = stat $path ? Storable::retrieve $path : { };
2003 } 2617 {
2618 my $faces = $facedata->{faceinfo};
2004 2619
2005 my $pid; 2620 while (my ($face, $info) = each %$faces) {
2006 2621 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2007 sub db_save() { 2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2008 waitpid $pid, 0 if $pid; 2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2009 if (0 == ($pid = fork)) { 2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2010 $DB->{_meta}{version} = 1; 2625 Coro::cede;
2011 Storable::nstore $DB, "$path~";
2012 rename "$path~", $path;
2013 cf::_exit 0 if defined $pid;
2014 }
2015 }
2016
2017 my $dirty;
2018
2019 sub db_sync() {
2020 db_save if $dirty;
2021 undef $dirty;
2022 }
2023
2024 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2025 db_sync;
2026 });
2027
2028 sub db_dirty() {
2029 $dirty = 1;
2030 $idle->start;
2031 }
2032
2033 sub db_get($;$) {
2034 @_ >= 2
2035 ? $DB->{$_[0]}{$_[1]}
2036 : ($DB->{$_[0]} ||= { })
2037 }
2038
2039 sub db_put($$;$) {
2040 if (@_ >= 3) {
2041 $DB->{$_[0]}{$_[1]} = $_[2];
2042 } else {
2043 $DB->{$_[0]} = $_[1];
2044 }
2045 db_dirty;
2046 }
2047
2048 cf::global->attach (
2049 prio => 10000,
2050 on_cleanup => sub {
2051 db_sync;
2052 }, 2626 }
2053 );
2054}
2055 2627
2056############################################################################# 2628 while (my ($face, $info) = each %$faces) {
2057# the server's main() 2629 next unless $info->{smooth};
2630 my $idx = cf::face::find $face
2631 or next;
2632 if (my $smooth = cf::face::find $info->{smooth}) {
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2634 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 }
2637 Coro::cede;
2638 }
2639 }
2640
2641 {
2642 my $anims = $facedata->{animinfo};
2643
2644 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede;
2647 }
2648
2649 cf::anim::invalidate_all; # d'oh
2650 }
2651
2652 1
2653}
2654
2655sub reload_regions {
2656 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n";
2658}
2659
2660sub reload_facedata {
2661 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n";
2663}
2664
2665sub reload_archetypes {
2666 load_resource_file "$DATADIR/archetypes"
2667 or die "unable to load archetypes\n";
2668}
2669
2670sub reload_treasures {
2671 load_resource_file "$DATADIR/treasures"
2672 or die "unable to load treasurelists\n";
2673}
2674
2675sub reload_resources {
2676 warn "reloading resource files...\n";
2677
2678 reload_regions;
2679 reload_facedata;
2680 #reload_archetypes;#d#
2681 reload_archetypes;
2682 reload_treasures;
2683
2684 warn "finished reloading resource files\n";
2685}
2686
2687sub init {
2688 reload_resources;
2689}
2058 2690
2059sub cfg_load { 2691sub cfg_load {
2060 open my $fh, "<:utf8", cf::confdir . "/config" 2692 open my $fh, "<:utf8", "$CONFDIR/config"
2061 or return; 2693 or return;
2062 2694
2063 local $/; 2695 local $/;
2064 *CFG = YAML::Syck::Load <$fh>; 2696 *CFG = YAML::Syck::Load <$fh>;
2065 2697
2068 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2700 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2069 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2701 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2070 2702
2071 if (exists $CFG{mlockall}) { 2703 if (exists $CFG{mlockall}) {
2072 eval { 2704 eval {
2073 $CFG{mlockall} ? &mlockall : &munlockall 2705 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2074 and die "WARNING: m(un)lockall failed: $!\n"; 2706 and die "WARNING: m(un)lockall failed: $!\n";
2075 }; 2707 };
2076 warn $@ if $@; 2708 warn $@ if $@;
2077 } 2709 }
2078} 2710}
2079 2711
2080sub main { 2712sub main {
2081 # we must not ever block the main coroutine 2713 # we must not ever block the main coroutine
2082 local $Coro::idle = sub { 2714 local $Coro::idle = sub {
2083 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2715 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716 (async {
2084 async { Event::one_event }; 2717 Event::one_event;
2718 })->prio (Coro::PRIO_MAX);
2085 }; 2719 };
2086 2720
2087 cfg_load; 2721 cfg_load;
2088 db_load; 2722 db_init;
2089 load_extensions; 2723 load_extensions;
2724
2725 $TICK_WATCHER->start;
2090 Event::loop; 2726 Event::loop;
2091} 2727}
2092 2728
2093############################################################################# 2729#############################################################################
2094# initialisation 2730# initialisation and cleanup
2095 2731
2732# install some emergency cleanup handlers
2733BEGIN {
2734 for my $signal (qw(INT HUP TERM)) {
2735 Event->signal (
2736 reentrant => 0,
2737 data => WF_AUTOCANCEL,
2738 signal => $signal,
2739 prio => 0,
2740 cb => sub {
2741 cf::cleanup "SIG$signal";
2742 },
2743 );
2744 }
2745}
2746
2747sub write_runtime {
2748 my $runtime = "$LOCALDIR/runtime";
2749
2750 # first touch the runtime file to show we are still running:
2751 # the fsync below can take a very very long time.
2752
2753 IO::AIO::aio_utime $runtime, undef, undef;
2754
2755 my $guard = cf::lock_acquire "write_runtime";
2756
2757 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2758 or return;
2759
2760 my $value = $cf::RUNTIME + 90 + 10;
2761 # 10 is the runtime save interval, for a monotonic clock
2762 # 60 allows for the watchdog to kill the server.
2763
2764 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2765 and return;
2766
2767 # always fsync - this file is important
2768 aio_fsync $fh
2769 and return;
2770
2771 # touch it again to show we are up-to-date
2772 aio_utime $fh, undef, undef;
2773
2774 close $fh
2775 or return;
2776
2777 aio_rename "$runtime~", $runtime
2778 and return;
2779
2780 warn "runtime file written.\n";
2781
2782 1
2783}
2784
2785sub emergency_save() {
2786 my $freeze_guard = cf::freeze_mainloop;
2787
2788 warn "enter emergency perl save\n";
2789
2790 cf::sync_job {
2791 # use a peculiar iteration method to avoid tripping on perl
2792 # refcount bugs in for. also avoids problems with players
2793 # and maps saved/destroyed asynchronously.
2794 warn "begin emergency player save\n";
2795 for my $login (keys %cf::PLAYER) {
2796 my $pl = $cf::PLAYER{$login} or next;
2797 $pl->valid or next;
2798 $pl->save;
2799 }
2800 warn "end emergency player save\n";
2801
2802 warn "begin emergency map save\n";
2803 for my $path (keys %cf::MAP) {
2804 my $map = $cf::MAP{$path} or next;
2805 $map->valid or next;
2806 $map->save;
2807 }
2808 warn "end emergency map save\n";
2809
2810 warn "begin emergency database checkpoint\n";
2811 BDB::db_env_txn_checkpoint $DB_ENV;
2812 warn "end emergency database checkpoint\n";
2813 };
2814
2815 warn "leave emergency perl save\n";
2816}
2817
2818sub post_cleanup {
2819 my ($make_core) = @_;
2820
2821 warn Carp::longmess "post_cleanup backtrace"
2822 if $make_core;
2823}
2824
2096sub reload() { 2825sub do_reload_perl() {
2097 # can/must only be called in main 2826 # can/must only be called in main
2098 if ($Coro::current != $Coro::main) { 2827 if ($Coro::current != $Coro::main) {
2099 warn "can only reload from main coroutine\n"; 2828 warn "can only reload from main coroutine";
2100 return; 2829 return;
2101 } 2830 }
2102 2831
2103 warn "reloading..."; 2832 warn "reloading...";
2104 2833
2105 my $guard = freeze_mainloop; 2834 warn "entering sync_job";
2835
2836 cf::sync_job {
2837 cf::write_runtime; # external watchdog should not bark
2106 cf::emergency_save; 2838 cf::emergency_save;
2839 cf::write_runtime; # external watchdog should not bark
2107 2840
2108 eval { 2841 warn "syncing database to disk";
2842 BDB::db_env_txn_checkpoint $DB_ENV;
2843
2109 # if anything goes wrong in here, we should simply crash as we already saved 2844 # if anything goes wrong in here, we should simply crash as we already saved
2110 2845
2111 # cancel all watchers 2846 warn "cancelling all WF_AUTOCANCEL watchers";
2112 for (Event::all_watchers) { 2847 for (Event::all_watchers) {
2113 $_->cancel if $_->data & WF_AUTOCANCEL; 2848 $_->cancel if $_->data & WF_AUTOCANCEL;
2114 } 2849 }
2115 2850
2851 warn "flushing outstanding aio requests";
2852 for (;;) {
2853 BDB::flush;
2854 IO::AIO::flush;
2855 Coro::cede;
2856 last unless IO::AIO::nreqs || BDB::nreqs;
2857 warn "iterate...";
2858 }
2859
2860 ++$RELOAD;
2861
2116 # cancel all extension coros 2862 warn "cancelling all extension coros";
2117 $_->cancel for values %EXT_CORO; 2863 $_->cancel for values %EXT_CORO;
2118 %EXT_CORO = (); 2864 %EXT_CORO = ();
2119 2865
2120 # unload all extensions 2866 warn "removing commands";
2121 for (@exts) { 2867 %COMMAND = ();
2868
2869 warn "removing ext commands";
2870 %EXTCMD = ();
2871
2872 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) {
2122 warn "unloading <$_>"; 2874 warn "... unloading $pkg";
2123 unload_extension $_; 2875
2876 if (my $cb = $pkg->can ("unload")) {
2877 eval {
2878 $cb->($pkg);
2879 1
2880 } or warn "$pkg unloaded, but with errors: $@";
2124 } 2881 }
2125 2882
2883 warn "... nuking $pkg";
2884 Symbol::delete_package $pkg;
2885 }
2886
2126 # unload all modules loaded from $LIBDIR 2887 warn "unloading all perl modules loaded from $LIBDIR";
2127 while (my ($k, $v) = each %INC) { 2888 while (my ($k, $v) = each %INC) {
2128 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2129 2890
2130 warn "removing <$k>"; 2891 warn "... unloading $k";
2131 delete $INC{$k}; 2892 delete $INC{$k};
2132 2893
2133 $k =~ s/\.pm$//; 2894 $k =~ s/\.pm$//;
2134 $k =~ s/\//::/g; 2895 $k =~ s/\//::/g;
2135 2896
2138 } 2899 }
2139 2900
2140 Symbol::delete_package $k; 2901 Symbol::delete_package $k;
2141 } 2902 }
2142 2903
2143 # sync database to disk
2144 cf::db_sync;
2145 IO::AIO::flush;
2146
2147 # get rid of safe::, as good as possible 2904 warn "getting rid of safe::, as good as possible";
2148 Symbol::delete_package "safe::$_" 2905 Symbol::delete_package "safe::$_"
2149 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2150 2907
2151 # remove register_script_function callbacks
2152 # TODO
2153
2154 # unload cf.pm "a bit" 2908 warn "unloading cf.pm \"a bit\"";
2155 delete $INC{"cf.pm"}; 2909 delete $INC{"cf.pm"};
2910 delete $INC{"cf/pod.pm"};
2156 2911
2157 # don't, removes xs symbols, too, 2912 # don't, removes xs symbols, too,
2158 # and global variables created in xs 2913 # and global variables created in xs
2159 #Symbol::delete_package __PACKAGE__; 2914 #Symbol::delete_package __PACKAGE__;
2160 2915
2161 # reload cf.pm 2916 warn "unload completed, starting to reload now";
2917
2162 warn "reloading cf.pm"; 2918 warn "reloading cf.pm";
2163 require cf; 2919 require cf;
2164 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2165 2921
2166 # load config and database again 2922 warn "loading config and database again";
2167 cf::cfg_load; 2923 cf::cfg_load;
2168 cf::db_load;
2169 2924
2170 # load extensions
2171 warn "load extensions"; 2925 warn "loading extensions";
2172 cf::load_extensions; 2926 cf::load_extensions;
2173 2927
2174 # reattach attachments to objects 2928 warn "reattaching attachments to objects/players";
2175 warn "reattach"; 2929 _global_reattach; # objects, sockets
2176 _global_reattach; 2930 warn "reattaching attachments to maps";
2177 reattach $_ for values %MAP; 2931 reattach $_ for values %MAP;
2178 }; 2932 warn "reattaching attachments to players";
2933 reattach $_ for values %PLAYER;
2179 2934
2180 if ($@) { 2935 warn "leaving sync_job";
2936
2937 1
2938 } or do {
2181 warn $@; 2939 warn $@;
2182 warn "error while reloading, exiting."; 2940 warn "error while reloading, exiting.";
2183 exit 1; 2941 exit 1;
2184 } 2942 };
2185 2943
2186 warn "reloaded successfully"; 2944 warn "reloaded";
2187}; 2945};
2188 2946
2189############################################################################# 2947our $RELOAD_WATCHER; # used only during reload
2190 2948
2191unless ($LINK_MAP) { 2949sub reload_perl() {
2192 $LINK_MAP = cf::map::new; 2950 # doing reload synchronously and two reloads happen back-to-back,
2951 # coro crashes during coro_state_free->destroy here.
2193 2952
2194 $LINK_MAP->width (41); 2953 $RELOAD_WATCHER ||= Event->timer (
2195 $LINK_MAP->height (41); 2954 reentrant => 0,
2196 $LINK_MAP->alloc;
2197 $LINK_MAP->path ("{link}");
2198 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2199 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2200
2201 # dirty hack because... archetypes are not yet loaded
2202 Event->timer (
2203 after => 10, 2955 after => 0,
2956 data => WF_AUTOCANCEL,
2204 cb => sub { 2957 cb => sub {
2205 $_[0]->w->cancel; 2958 do_reload_perl;
2206 2959 undef $RELOAD_WATCHER;
2207 # provide some exits "home"
2208 my $exit = cf::object::new "exit";
2209
2210 $exit->slaying ($EMERGENCY_POSITION->[0]);
2211 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2212 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2213
2214 $LINK_MAP->insert ($exit->clone, 19, 19);
2215 $LINK_MAP->insert ($exit->clone, 19, 20);
2216 $LINK_MAP->insert ($exit->clone, 19, 21);
2217 $LINK_MAP->insert ($exit->clone, 20, 19);
2218 $LINK_MAP->insert ($exit->clone, 20, 21);
2219 $LINK_MAP->insert ($exit->clone, 21, 19);
2220 $LINK_MAP->insert ($exit->clone, 21, 20);
2221 $LINK_MAP->insert ($exit->clone, 21, 21);
2222
2223 $exit->destroy;
2224 }); 2960 },
2225 2961 );
2226 $LINK_MAP->{deny_save} = 1;
2227 $LINK_MAP->{deny_reset} = 1;
2228
2229 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2230} 2962}
2231
2232register "<global>", __PACKAGE__;
2233 2963
2234register_command "reload" => sub { 2964register_command "reload" => sub {
2235 my ($who, $arg) = @_; 2965 my ($who, $arg) = @_;
2236 2966
2237 if ($who->flag (FLAG_WIZ)) { 2967 if ($who->flag (FLAG_WIZ)) {
2238 $who->message ("start of reload.");
2239 reload;
2240 $who->message ("end of reload."); 2968 $who->message ("reloading server.");
2969 async { reload_perl };
2241 } 2970 }
2242}; 2971};
2243 2972
2244unshift @INC, $LIBDIR; 2973unshift @INC, $LIBDIR;
2245 2974
2975my $bug_warning = 0;
2976
2977our @WAIT_FOR_TICK;
2978our @WAIT_FOR_TICK_BEGIN;
2979
2980sub wait_for_tick {
2981 return unless $TICK_WATCHER->is_active;
2982 return if $Coro::current == $Coro::main;
2983
2984 my $signal = new Coro::Signal;
2985 push @WAIT_FOR_TICK, $signal;
2986 $signal->wait;
2987}
2988
2989sub wait_for_tick_begin {
2990 return unless $TICK_WATCHER->is_active;
2991 return if $Coro::current == $Coro::main;
2992
2993 my $signal = new Coro::Signal;
2994 push @WAIT_FOR_TICK_BEGIN, $signal;
2995 $signal->wait;
2996}
2997
2998 my $min = 1e6;#d#
2999 my $avg = 10;
2246$TICK_WATCHER = Event->timer ( 3000$TICK_WATCHER = Event->timer (
2247 reentrant => 0, 3001 reentrant => 0,
3002 parked => 1,
2248 prio => 0, 3003 prio => 0,
2249 at => $NEXT_TICK || $TICK, 3004 at => $NEXT_TICK || $TICK,
2250 data => WF_AUTOCANCEL, 3005 data => WF_AUTOCANCEL,
2251 cb => sub { 3006 cb => sub {
3007 if ($Coro::current != $Coro::main) {
3008 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3009 unless ++$bug_warning > 10;
3010 return;
3011 }
3012
3013 $NOW = $tick_start = Event::time;
3014
2252 cf::server_tick; # one server iteration 3015 cf::server_tick; # one server iteration
3016
3017 0 && sync_job {#d#
3018 for(1..10) {
3019 my $t = Event::time;
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3021 or die;
3022
3023 $map->width (50);
3024 $map->height (50);
3025 $map->alloc;
3026 $map->_load_objects ("/tmp/x.map", 1);
3027 my $t = Event::time - $t;
3028
3029 #next unless $t < 0.0013;#d#
3030 if ($t < $min) {
3031 $min = $t;
3032 }
3033 $avg = $avg * 0.99 + $t * 0.01;
3034 }
3035 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036 exit 0;
3037 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038 };
3039
2253 $RUNTIME += $TICK; 3040 $RUNTIME += $TICK;
2254 $NEXT_TICK += $TICK; 3041 $NEXT_TICK += $TICK;
2255 3042
3043 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044 $NEXT_RUNTIME_WRITE = $NOW + 10;
3045 Coro::async_pool {
3046 write_runtime
3047 or warn "ERROR: unable to write runtime file: $!";
3048 };
3049 }
3050
3051# my $AFTER = Event::time;
3052# warn $AFTER - $NOW;#d#
3053
3054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send;
3056 }
3057 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send;
3059 }
3060
3061 $NOW = Event::time;
3062
2256 # if we are delayed by four ticks or more, skip them all 3063 # if we are delayed by four ticks or more, skip them all
2257 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3064 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2258 3065
2259 $TICK_WATCHER->at ($NEXT_TICK); 3066 $TICK_WATCHER->at ($NEXT_TICK);
2260 $TICK_WATCHER->start; 3067 $TICK_WATCHER->start;
3068
3069 $LOAD = ($NOW - $tick_start) / $TICK;
3070 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071
3072 _post_tick;
3073
3074
2261 }, 3075 },
2262); 3076);
2263 3077
3078{
2264IO::AIO::max_poll_time $TICK * 0.2; 3079 BDB::max_poll_time $TICK * 0.1;
2265 3080 $BDB_POLL_WATCHER = Event->io (
2266Event->io ( 3081 reentrant => 0,
2267 fd => IO::AIO::poll_fileno, 3082 fd => BDB::poll_fileno,
2268 poll => 'r', 3083 poll => 'r',
2269 prio => 5, 3084 prio => 0,
2270 data => WF_AUTOCANCEL,
2271 cb => \&IO::AIO::poll_cb,
2272);
2273
2274Event->timer (
2275 data => WF_AUTOCANCEL, 3085 data => WF_AUTOCANCEL,
2276 after => 0, 3086 cb => \&BDB::poll_cb,
2277 interval => 10, 3087 );
2278 cb => sub { 3088 BDB::min_parallel 8;
2279 (Coro::unblock_sub { 3089
2280 write_runtime 3090 BDB::set_sync_prepare {
2281 or warn "ERROR: unable to write runtime file: $!"; 3091 my $status;
3092 my $current = $Coro::current;
3093 (
3094 sub {
3095 $status = $!;
3096 $current->ready; undef $current;
3097 },
3098 sub {
3099 Coro::schedule while defined $current;
3100 $! = $status;
3101 },
3102 )
3103 };
3104
3105 unless ($DB_ENV) {
3106 $DB_ENV = BDB::db_env_create;
3107
3108 cf::sync_job {
3109 eval {
3110 BDB::db_env_open
3111 $DB_ENV,
3112 $BDBDIR,
3113 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115 0666;
3116
3117 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120 $DB_ENV->set_lk_detect;
3121 };
3122
3123 cf::cleanup "db_env_open(db): $@" if $@;
2282 })->(); 3124 };
2283 }, 3125 }
2284); 3126}
3127
3128{
3129 IO::AIO::min_parallel 8;
3130
3131 undef $Coro::AIO::WATCHER;
3132 IO::AIO::max_poll_time $TICK * 0.1;
3133 $AIO_POLL_WATCHER = Event->io (
3134 reentrant => 0,
3135 data => WF_AUTOCANCEL,
3136 fd => IO::AIO::poll_fileno,
3137 poll => 'r',
3138 prio => 6,
3139 cb => \&IO::AIO::poll_cb,
3140 );
3141}
3142
3143my $_log_backtrace;
3144
3145sub _log_backtrace {
3146 my ($msg, @addr) = @_;
3147
3148 $msg =~ s/\n//;
3149
3150 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) {
3152 ++$_log_backtrace;
3153 async {
3154 my @bt = fork_call {
3155 @addr = map { sprintf "%x", $_ } @addr;
3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158 or die "addr2line: $!";
3159
3160 my @funcs;
3161 my @res = <$fh>;
3162 chomp for @res;
3163 while (@res) {
3164 my ($func, $line) = splice @res, 0, 2, ();
3165 push @funcs, "[$func] $line";
3166 }
3167
3168 @funcs
3169 };
3170
3171 LOG llevInfo, "[ABT] $msg\n";
3172 LOG llevInfo, "[ABT] $_\n" for @bt;
3173 --$_log_backtrace;
3174 };
3175 } else {
3176 LOG llevInfo, "[ABT] $msg\n";
3177 LOG llevInfo, "[ABT] [suppressed]\n";
3178 }
3179}
3180
3181# load additional modules
3182use cf::pod;
2285 3183
2286END { cf::emergency_save } 3184END { cf::emergency_save }
2287 3185
22881 31861
2289 3187

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines