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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.439 by root, Mon Jul 14 16:42:49 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines