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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines