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.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.423 by root, Sun Apr 20 00:44:13 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 64
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
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
49our %COMMAND = (); 69our %COMMAND = ();
50our %COMMAND_TIME = (); 70our %COMMAND_TIME = ();
51 71
52our @EXTS = (); # list of extension package names 72our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 73our %EXTCMD = ();
74our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 75our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 76our %EXT_MAP = (); # pluggable maps
56 77
57our $RELOAD; # number of reloads so far 78our $RELOAD; # number of reloads so far
58our @EVENT; 79our @EVENT;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
71 93
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 97our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
79 99
80our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 104our $DB_ENV;
82 105
83our %CFG; 106our %CFG;
84 107
85our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 109our $RUNTIME;
110our $NOW;
87 111
88our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
91 115
92# 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 ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 118
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
98 123
99binmode STDOUT; 124binmode STDOUT;
100binmode STDERR; 125binmode STDERR;
101 126
102# read virtual server time, if available 127# read virtual server time, if available
155 180
156The raw value load value from the last tick. 181The raw value load value from the last tick.
157 182
158=item %cf::CFG 183=item %cf::CFG
159 184
160Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 186from wherever your confdir points to.
162 187
163=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
164 189
165These 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
166returns 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
167per 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.
168 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
169=back 200=back
170 201
171=cut 202=cut
172 203
173BEGIN { 204BEGIN {
177 $msg .= "\n" 208 $msg .= "\n"
178 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
179 210
180 $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;
181 212
182 utf8::encode $msg;
183 LOG llevError, $msg; 213 LOG llevError, $msg;
184 }; 214 };
185} 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#?
186 231
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
203)) { 248)) {
204 no strict 'refs'; 249 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 251}
207 252
208$Event::DIED = sub { 253$EV::DIED = sub {
209 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
210}; 255};
211 256
212############################################################################# 257#############################################################################
213 258
236 $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;
237 $d 282 $d
238 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
239} 284}
240 285
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
244 287
245Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
246 289
247=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
248 291
249Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
293
294=cut
295
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297
298sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) }
250 300
251=item cf::lock_wait $string 301=item cf::lock_wait $string
252 302
253Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
254 304
257Wait 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
258a 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,
259for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
260returned. 310returned.
261 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
262Lock 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
263uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
264 317
265=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
266 319
267Return 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.
268 321
269=cut 322=cut
270 323
271our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
272 326
273sub lock_wait($) { 327sub lock_wait($) {
274 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#
275 334
276 # wait for lock, if any 335 # wait for lock, if any
277 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 338 Coro::schedule;
285 344
286 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
287 lock_wait $key; 346 lock_wait $key;
288 347
289 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
290 350
291 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
294 } 355 }
295} 356}
296 357
299 360
300 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
301} 362}
302 363
303sub freeze_mainloop { 364sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
305 366
306 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
307 $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 }
308 }; 428 }
309 $TICK_WATCHER->stop; 429};
310 $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;
311} 443}
312 444
313=item cf::async { BLOCK } 445=item cf::async { BLOCK }
314 446
315Currently the same as Coro::async_pool, meaning you cannot use 447Currently the same as Coro::async_pool, meaning you cannot use
320 452
321BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
322 454
323=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
324 456
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
327partly 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
328acceptable. 460acceptable.
329 461
330If 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
331the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
336 468
337sub sync_job(&) { 469sub sync_job(&) {
338 my ($job) = @_; 470 my ($job) = @_;
339 471
340 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 473 my $time = EV::time;
342 474
343 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
345 477
346 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 479
348 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
349 481
350 my $busy = 1; 482 my $busy = 1;
351 my @res; 483 my @res;
352 484
353 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 487 @res = eval { $job->() };
355 warn $@ if $@; 488 warn $@ if $@;
356 undef $busy; 489 undef $busy;
357 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
358 491
359 while ($busy) { 492 while ($busy) {
360 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
361 } 497 }
498 }
362 499
363 $time = Event::time - $time; 500 my $time = EV::time - $time;
364 501
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
369 503
370 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
371 } else { 505 } else {
372 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
373 507
398=item fork_call { }, $args 532=item fork_call { }, $args
399 533
400Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
404 538
405=cut 539=cut
406 540
407sub fork_call(&@) { 541sub fork_call(&@) {
408 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
409 543
410# 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,
411# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 547
415 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 549 reset_signals;
428 local $SIG{__WARN__}; 550 &$cb
429 local $SIG{__DIE__}; 551 }, @args;
430 eval {
431 close $fh1;
432 552
433 my @res = eval { $cb->(@args) }; 553 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 554}
435 };
436 555
437 warn $@ if $@; 556=item $coin = coin_from_name $name
438 _exit 0; 557
439 } 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
440} 581}
441 582
442=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
443 584
444Returns a single value from the environment database. 585Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
447 588
448Stores 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
449data 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).
450 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
451=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}
452 615
453our $DB; 616our $DB;
454 617
455sub db_init { 618sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 619 cf::sync_job {
460 eval { 620 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 621 };
470} 622}
471 623
472sub db_get($$) { 624sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
474 626
524 if (1) { 676 if (1) {
525 $md5 = 677 $md5 =
526 join "\x00", 678 join "\x00",
527 $processversion, 679 $processversion,
528 map { 680 map {
529 Coro::cede; 681 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 683 } 0.. $#$src;
532 684
533 685
534 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
578attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
580 732
581In 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>
582C<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
583Crossfire TRT). 735Deliantra).
584 736
585=over 4 737=over 4
586 738
587=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
588 740
840 "; 992 ";
841 die if $@; 993 die if $@;
842} 994}
843 995
844our $override; 996our $override;
845our @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?
846 998
847sub override { 999sub override {
848 $override = 1; 1000 $override = 1;
849 @invoke_results = (); 1001 @INVOKE_RESULTS = (@_);
850} 1002}
851 1003
852sub do_invoke { 1004sub do_invoke {
853 my $event = shift; 1005 my $event = shift;
854 my $callbacks = shift; 1006 my $callbacks = shift;
855 1007
856 @invoke_results = (); 1008 @INVOKE_RESULTS = ();
857 1009
858 local $override; 1010 local $override;
859 1011
860 for (@$callbacks) { 1012 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1013 eval { &{$_->[1]} };
870 } 1022 }
871 1023
872 0 1024 0
873} 1025}
874 1026
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1028
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1030
879Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
880 1032
881This 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
882removed 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
883results (if you must, access C<@cf::invoke_results> directly). 1035results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1036
885=back 1037=back
886 1038
887=cut 1039=cut
888 1040
889############################################################################# 1041#############################################################################
890# 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}
891 1085
892sub reattach { 1086sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1088 my ($obj) = @_;
895 1089
916cf::attachable->attach ( 1110cf::attachable->attach (
917 prio => -1000000, 1111 prio => -1000000,
918 on_instantiate => sub { 1112 on_instantiate => sub {
919 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
920 1114
921 $data = from_json $data; 1115 $data = decode_json $data;
922 1116
923 for (@$data) { 1117 for (@$data) {
924 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
925 1119
926 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1136sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
944 1138
945 sync_job { 1139 sync_job {
946 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
949 1144
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1146 chmod SAVE_MODE, $fh;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1149 close $fh;
955 1150
956 if (@$objs) { 1151 if (@$objs) {
957 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) {
958 chmod SAVE_MODE, $fh; 1153 chmod SAVE_MODE, $fh;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1157 close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
964 } 1159 }
972 } 1167 }
973 } else { 1168 } else {
974 aio_unlink $filename; 1169 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
976 } 1171 }
977 } 1172 };
978} 1173}
979 1174
980sub object_freezer_as_string { 1175sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
982 1177
994 or return; 1189 or return;
995 1190
996 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
998 or return; 1193 or return;
1194
999 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1000 } 1197 }
1001 1198
1199 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1004 return ($data, $av); 1203 ($data, $av)
1005} 1204}
1006 1205
1007=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1008 1207
1009=over 4 1208=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1228 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1229}
1031 1230
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1231=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1232
1034Register a callback fro execution when the client sends an extcmd packet. 1233Register a callback for execution when the client sends an (synchronous)
1234extcmd packet. Ext commands will be processed in the order they are
1235received by the server, like other user commands. The first argument is
1236the logged-in player. Ext commands can only be processed after a player
1237has logged in successfully.
1035 1238
1036If the callback returns something, it is sent back as if reply was being 1239If the callback returns something, it is sent back as if reply was being
1037called. 1240called.
1038 1241
1242=item cf::register_exticmd $name => \&callback($ns,$packet);
1243
1244Register a callback for execution when the client sends an (asynchronous)
1245exticmd packet. Exti commands are processed by the server as soon as they
1246are received, i.e. out of order w.r.t. other commands. The first argument
1247is a client socket. Exti commands can be received anytime, even before
1248log-in.
1249
1250If the callback returns something, it is sent back as if reply was being
1251called.
1252
1039=cut 1253=cut
1040 1254
1041sub register_extcmd { 1255sub register_extcmd {
1042 my ($name, $cb) = @_; 1256 my ($name, $cb) = @_;
1043 1257
1044 $EXTCMD{$name} = $cb; 1258 $EXTCMD{$name} = $cb;
1259}
1260
1261sub register_exticmd {
1262 my ($name, $cb) = @_;
1263
1264 $EXTICMD{$name} = $cb;
1045} 1265}
1046 1266
1047cf::player->attach ( 1267cf::player->attach (
1048 on_command => sub { 1268 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1269 my ($pl, $name, $params) = @_;
1058 cf::override; 1278 cf::override;
1059 }, 1279 },
1060 on_extcmd => sub { 1280 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1062 1282
1063 my $msg = eval { from_json $buf }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1284
1065 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
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1071 } else { 1300 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1302 }
1074 1303
1075 cf::override; 1304 cf::override;
1128 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1130 1359
1131 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1361 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1363 }
1136 1364
1137 warn $msg; 1365 warn $msg;
1138 } 1366 }
1139 1367
1164use Coro::AIO; 1392use Coro::AIO;
1165 1393
1166=head3 cf::player 1394=head3 cf::player
1167 1395
1168=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}
1169 1411
1170=item cf::player::find $login 1412=item cf::player::find $login
1171 1413
1172Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1173 1415
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1455
1214 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1215 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;
1216 $cf::PLAYER{$login} = $pl 1463 $cf::PLAYER{$login} = $pl
1217 } 1464 }
1218 } 1465 }
1219} 1466}
1220 1467
1229 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1230 1477
1231 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1233 1480
1481 cf::get_slot 0.01;
1482
1234 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1235 Coro::cede; 1484 cf::cede_to_tick;
1236} 1485}
1237 1486
1238sub new($) { 1487sub new($) {
1239 my ($login) = @_; 1488 my ($login) = @_;
1240 1489
1244 $self->{deny_save} = 1; 1493 $self->{deny_save} = 1;
1245 1494
1246 $cf::PLAYER{$login} = $self; 1495 $cf::PLAYER{$login} = $self;
1247 1496
1248 $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 (@_);
1249} 1508}
1250 1509
1251=item $pl->quit_character 1510=item $pl->quit_character
1252 1511
1253Nukes the player without looking back. If logged in, the connection will 1512Nukes the player without looking back. If logged in, the connection will
1308 or return []; 1567 or return [];
1309 1568
1310 my @logins; 1569 my @logins;
1311 1570
1312 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") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1577 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1578 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 }
1316 1580
1317 utf8::decode $login; 1581 utf8::decode $login;
1318 push @logins, $login; 1582 push @logins, $login;
1319 } 1583 }
1320 1584
1353 1617
1354Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1355 1619
1356=cut 1620=cut
1357 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
1358sub expand_cfpod { 1633sub expand_cfpod {
1359 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1360 1635
1361 # escape & and < 1636 my $xml;
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364 1637
1365 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1366 1641
1367 1 while 1642 $group =~ s/&/&amp;/g;
1368 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1369 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1370 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1371 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1372 # replace G<male|female> tags 1647 ([BCGHITU])
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1648 <
1374 $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;
1375 }ge 1685 }
1376 # replace H<hint text> 1686 }
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378 1687
1688 for ($xml) {
1379 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1381 1691
1382 $_ 1692 # compress some whitespace
1383} 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 }
1384 1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708
1385=item $player->ext_reply ($msgid, %msg) 1709=item $player->ext_reply ($msgid, @msg)
1386 1710
1387Sends an ext reply to the player. 1711Sends an ext reply to the player.
1388 1712
1389=cut 1713=cut
1390 1714
1391sub ext_reply($$%) { 1715sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1716 my ($self, $id, @msg) = @_;
1393 1717
1394 $msg{msgid} = $id; 1718 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1719}
1398 1720
1399=item $player->ext_event ($type, %msg) 1721=item $player->ext_msg ($type, @msg)
1400 1722
1401Sends an ext event to the client. 1723Sends an ext event to the client.
1402 1724
1403=cut 1725=cut
1404 1726
1405sub ext_event($$%) { 1727sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1728 my ($self, $type, @msg) = @_;
1407 1729
1408 $self->ns->ext_event ($type, %msg); 1730 $self->ns->ext_msg ($type, @msg);
1409} 1731}
1410 1732
1411=head3 cf::region 1733=head3 cf::region
1412 1734
1413=over 4 1735=over 4
1426 my ($path) = @_; 1748 my ($path) = @_;
1427 1749
1428 my ($match, $specificity); 1750 my ($match, $specificity);
1429 1751
1430 for my $region (list) { 1752 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1753 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1754 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1755 if $region->specificity > $specificity;
1434 } 1756 }
1435 } 1757 }
1436 1758
1457our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1458our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1459 1781
1460sub generate_random_map { 1782sub generate_random_map {
1461 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
1462 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1463 $self->_create_random_map ( 1788 $self->_create_random_map (
1464 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1465 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1466 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1556 $self->init; # pass $1 etc. 1881 $self->init; # pass $1 etc.
1557 return $self; 1882 return $self;
1558 } 1883 }
1559 } 1884 }
1560 1885
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1886 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1887 ()
1563} 1888}
1564 1889
1565sub init { 1890sub init {
1566 my ($self) = @_; 1891 my ($self) = @_;
1588 1913
1589# the temporary/swap location 1914# the temporary/swap location
1590sub save_path { 1915sub save_path {
1591 my ($self) = @_; 1916 my ($self) = @_;
1592 1917
1593 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1594 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1595} 1920}
1596 1921
1597# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1598sub uniq_path { 1923sub uniq_path {
1599 my ($self) = @_; 1924 my ($self) = @_;
1600 1925
1601 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1602 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1603} 1928}
1604 1929
1605# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1606# all maps in C++... 1931# all maps in C++...
1629 1954
1630sub load_header_from($) { 1955sub load_header_from($) {
1631 my ($self, $path) = @_; 1956 my ($self, $path) = @_;
1632 1957
1633 utf8::encode $path; 1958 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1959 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 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;
1639 1967
1640 $self->{load_path} = $path; 1968 $self->{load_path} = $path;
1641 1969
1642 1 1970 1
1643} 1971}
1697sub find { 2025sub find {
1698 my ($path, $origin) = @_; 2026 my ($path, $origin) = @_;
1699 2027
1700 $path = normalise $path, $origin && $origin->path; 2028 $path = normalise $path, $origin && $origin->path;
1701 2029
2030 cf::lock_wait "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 2031 cf::lock_wait "map_find:$path";
1703 2032
1704 $cf::MAP{$path} || do { 2033 $cf::MAP{$path} || do {
1705 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
1706 my $map = new_from_path cf::map $path 2037 my $map = new_from_path cf::map $path
1707 or return; 2038 or return;
1708 2039
1709 $map->{last_save} = $cf::RUNTIME; 2040 $map->{last_save} = $cf::RUNTIME;
1710 2041
1712 or return; 2043 or return;
1713 2044
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 2046 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 2047 #$cf::WAIT_FOR_TICK->wait;
2048 undef $guard1;
2049 undef $guard2;
1717 $map->reset; 2050 $map->reset;
1718 undef $guard;
1719 return find $path; 2051 return find $path;
1720 } 2052 }
1721 2053
1722 $cf::MAP{$path} = $map 2054 $cf::MAP{$path} = $map
1723 } 2055 }
1732 local $self->{deny_reset} = 1; # loading can take a long time 2064 local $self->{deny_reset} = 1; # loading can take a long time
1733 2065
1734 my $path = $self->{path}; 2066 my $path = $self->{path};
1735 2067
1736 { 2068 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2069 my $guard = cf::lock_acquire "map_data:$path";
1738 2070
2071 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2072 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2073
1741 $self->in_memory (cf::MAP_LOADING); 2074 $self->in_memory (cf::MAP_LOADING);
1742 2075
1743 $self->alloc; 2076 $self->alloc;
1744 2077
1745 $self->pre_load; 2078 $self->pre_load;
1746 Coro::cede; 2079 cf::cede_to_tick;
1747 2080
2081 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2083 $self->_load_objects ($f)
1749 or return; 2084 or return;
1750 2085
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1752 if delete $self->{load_original}; 2087 if delete $self->{load_original};
1753 2088
1754 if (my $uniq = $self->uniq_path) { 2089 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2090 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2091 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2093 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2094 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs;
2096 }
1759 } 2097 }
1760 } 2098 }
1761 2099
1762 Coro::cede; 2100 $f->resolve_delayed_derefs;
2101
2102 cf::cede_to_tick;
1763 # now do the right thing for maps 2103 # now do the right thing for maps
1764 $self->link_multipart_objects; 2104 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2105 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2106 unless $self->difficulty;
1767 Coro::cede; 2107 cf::cede_to_tick;
1768 2108
1769 unless ($self->{deny_activate}) { 2109 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2110 $self->decay_objects;
1771 $self->fix_auto_apply; 2111 $self->fix_auto_apply;
1772 $self->update_buttons; 2112 $self->update_buttons;
1773 Coro::cede; 2113 cf::cede_to_tick;
1774 $self->set_darkness_map; 2114 $self->set_darkness_map;
1775 Coro::cede; 2115 cf::cede_to_tick;
1776 $self->activate; 2116 $self->activate;
1777 } 2117 }
1778 2118
2119 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME);
2121
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1780 } 2123 }
1781 2124
1782 $self->post_load; 2125 $self->post_load;
1783} 2126}
1784 2127
1793 2136
1794 $self 2137 $self
1795} 2138}
1796 2139
1797# 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
1798sub load_diag { 2141sub load_neighbours {
1799 my ($map) = @_; 2142 my ($map) = @_;
1800 2143
1801 my @diag; # diagonal neighbours 2144 my @neigh; # diagonal neighbours
1802 2145
1803 for (0 .. 3) { 2146 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2147 my $neigh = $map->tile_path ($_)
1805 or next; 2148 or next;
1806 $neigh = find $neigh, $map 2149 $neigh = find $neigh, $map
1807 or next; 2150 or next;
1808 $neigh->load; 2151 $neigh->load;
1809 2152
2153 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2154 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2155 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2156 }
1813 2157
1814 for (@diag) { 2158 for (grep defined $_->[0], @neigh) {
2159 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2160 my $neigh = find $path, $origin
1816 or next; 2161 or next;
1817 $neigh->load; 2162 $neigh->load;
1818 } 2163 }
1819} 2164}
1820 2165
1825} 2170}
1826 2171
1827sub do_load_sync { 2172sub do_load_sync {
1828 my ($map) = @_; 2173 my ($map) = @_;
1829 2174
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main;
2177
1830 cf::sync_job { $map->load }; 2178 cf::sync_job { $map->load };
1831} 2179}
1832 2180
1833our %MAP_PREFETCH; 2181our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2182our $MAP_PREFETCHER = undef;
1835 2183
1836sub find_async { 2184sub find_async {
1837 my ($path, $origin) = @_; 2185 my ($path, $origin, $load) = @_;
1838 2186
1839 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
1840 2188
1841 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1843 } 2191 }
1844 2192
1845 undef $MAP_PREFETCH{$path}; 2193 $MAP_PREFETCH{$path} |= $load;
2194
1846 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
2196 $Coro::current->{desc} = "map prefetcher";
2197
1847 while (%MAP_PREFETCH) { 2198 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2199 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2200 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2201 $map->load if $v;
2202 }
1852 2203
1853 delete $MAP_PREFETCH{$path}; 2204 delete $MAP_PREFETCH{$k};
1854 } 2205 }
1855 } 2206 }
1856 undef $MAP_PREFETCHER; 2207 undef $MAP_PREFETCHER;
1857 }; 2208 };
1858 $MAP_PREFETCHER->prio (6); 2209 $MAP_PREFETCHER->prio (6);
1861} 2212}
1862 2213
1863sub save { 2214sub save {
1864 my ($self) = @_; 2215 my ($self) = @_;
1865 2216
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2218
1868 $self->{last_save} = $cf::RUNTIME; 2219 $self->{last_save} = $cf::RUNTIME;
1869 2220
1870 return unless $self->dirty; 2221 return unless $self->dirty;
1871 2222
1877 return if $self->{deny_save}; 2228 return if $self->{deny_save};
1878 2229
1879 local $self->{last_access} = $self->last_access;#d# 2230 local $self->{last_access} = $self->last_access;#d#
1880 2231
1881 cf::async { 2232 cf::async {
2233 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
1883 }; 2235 };
2236
2237 cf::get_slot 0.02;
1884 2238
1885 if ($uniq) { 2239 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1887 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1888 } else { 2242 } else {
1894 my ($self) = @_; 2248 my ($self) = @_;
1895 2249
1896 # save first because save cedes 2250 # save first because save cedes
1897 $self->save; 2251 $self->save;
1898 2252
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2254
1901 return if $self->players; 2255 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
1903 return if $self->{deny_save}; 2257 return if $self->{deny_save};
1904 2258
2259 $self->in_memory (cf::MAP_SWAPPED);
2260
2261 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2263 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2264}
1908 2265
1909sub reset_at { 2266sub reset_at {
1910 my ($self) = @_; 2267 my ($self) = @_;
1911 2268
1943 if $uniq; 2300 if $uniq;
1944 } 2301 }
1945 2302
1946 delete $cf::MAP{$self->path}; 2303 delete $cf::MAP{$self->path};
1947 2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2307 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2308
1952 $self->unlink_save; 2309 $self->unlink_save;
1953 $self->destroy; 2310 $self->destroy;
1954} 2311}
1955 2312
1956my $nuke_counter = "aaaa"; 2313my $nuke_counter = "aaaa";
1957 2314
1958sub nuke { 2315sub nuke {
1959 my ($self) = @_; 2316 my ($self) = @_;
1960 2317
2318 {
2319 my $lock = cf::lock_acquire "map_data:$self->{path}";
2320
1961 delete $cf::MAP{$self->path}; 2321 delete $cf::MAP{$self->path};
1962 2322
1963 $self->unlink_save; 2323 $self->unlink_save;
1964 2324
1965 bless $self, "cf::map"; 2325 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2326 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2327 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2328 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2330
1971 $cf::MAP{$self->path} = $self; 2331 $cf::MAP{$self->path} = $self;
2332 }
1972 2333
1973 $self->reset; # polite request, might not happen 2334 $self->reset; # polite request, might not happen
1974} 2335}
1975 2336
1976=item $maps = cf::map::tmp_maps 2337=item $maps = cf::map::tmp_maps
2018 2379
2019sub unique_maps() { 2380sub unique_maps() {
2020 [ 2381 [
2021 map { 2382 map {
2022 utf8::decode $_; 2383 utf8::decode $_;
2023 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2024 ? normalise $_ 2387 : normalise $_
2025 : ()
2026 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2027 ] 2389 ]
2028} 2390}
2029 2391
2030package cf;
2031
2032=back 2392=back
2033 2393
2034=head3 cf::object 2394=head3 cf::object
2035 2395
2036=cut 2396=cut
2039 2399
2040=over 4 2400=over 4
2041 2401
2042=item $ob->inv_recursive 2402=item $ob->inv_recursive
2043 2403
2044Returns 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.
2045 2406
2046=cut 2407=cut
2047 2408
2048sub inv_recursive_; 2409sub inv_recursive_;
2049sub inv_recursive_ { 2410sub inv_recursive_ {
2050 map { $_, inv_recursive_ $_->inv } @_ 2411 map { $_, inv_recursive_ $_->inv } @_
2051} 2412}
2052 2413
2053sub inv_recursive { 2414sub inv_recursive {
2054 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 }
2055} 2444}
2056 2445
2057package cf; 2446package cf;
2058 2447
2059=back 2448=back
2083 2472
2084 } else { 2473 } else {
2085 my $pl = $self->contr; 2474 my $pl = $self->contr;
2086 2475
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2476 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2479
2096 } else { 2480 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2482 $self->message ($msg, $flags);
2099 } 2483 }
2100 } 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 (@_);
2101} 2495}
2102 2496
2103=item $player_object->may ("access") 2497=item $player_object->may ("access")
2104 2498
2105Returns wether the given player is authorized to access resource "access" 2499Returns wether the given player is authorized to access resource "access"
2184 # use -1 or undef as default coordinates, not 0, 0 2578 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2579 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2580 if $x <=0 && $y <= 0;
2187 2581
2188 $map->load; 2582 $map->load;
2189 $map->load_diag; 2583 $map->load_neighbours;
2190 2584
2191 return unless $self->contr->active; 2585 return unless $self->contr->active;
2192 $self->activate_recursive; 2586 $self->activate_recursive;
2193 2587
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2589 $self->enter_map ($map, $x, $y);
2196} 2590}
2197 2591
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2593
2200Moves 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
2201her, loading and preparing them map, calling the provided $check callback 2595her, loading and preparing them map, calling the provided $check callback
2202that 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
2203the 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.
2204 2599
2205=cut 2600=cut
2206 2601
2207our $GOTOGEN; 2602our $GOTOGEN;
2208 2603
2209sub cf::object::player::goto { 2604sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2605 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2606
2212 # 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
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2609
2215 $self->enter_link; 2610 $self->enter_link;
2216 2611
2217 (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
2218 my $map = eval { 2634 my $map = eval {
2219 my $map = cf::map::find $path; 2635 my $map = defined $path ? cf::map::find $path : undef;
2220 2636
2221 if ($map) { 2637 if ($map) {
2222 $map = $map->customise_for ($self); 2638 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2639 $map = $check->($map) if $check && $map;
2224 } else { 2640 } else {
2225 $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);
2226 } 2642 }
2227 2643
2228 $map 2644 $map
2229 }; 2645 };
2230 2646
2235 2651
2236 if ($gen == $self->{_goto_generation}) { 2652 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2653 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2654 $self->leave_link ($map, $x, $y);
2239 } 2655 }
2656
2657 $done->() if $done;
2240 })->prio (1); 2658 })->prio (1);
2241} 2659}
2242 2660
2243=item $player_object->enter_exit ($exit_object) 2661=item $player_object->enter_exit ($exit_object)
2244 2662
2281 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2282 } 2700 }
2283 2701
2284 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2285 2703
2286 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2287 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2289 2707
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
2313 my $hp = $exit->stats->hp; 2731 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2732 my $sp = $exit->stats->sp;
2315 2733
2316 $self->enter_link; 2734 $self->enter_link;
2317 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
2318 (async { 2740 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2742
2319 $self->deactivate_recursive; # just to be sure 2743 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2744 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2745 $self->goto ($slaying, $hp, $sp);
2322 2746
2323 1; 2747 1;
2349 2773
2350 utf8::encode $text; 2774 utf8::encode $text;
2351 $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);
2352} 2776}
2353 2777
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2778=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2779
2356Send 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
2357client 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
2358the 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
2359the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2360 2784
2361=cut 2785=cut
2362 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);
2838
2363sub cf::client::send_msg { 2839sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2841
2366 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg);
2367 2843
2844 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845
2846 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel};
2849
2850 $self->ext_msg (channel_info => $channel)
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id};
2854
2855 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel)
2860 if $self->can_msg;
2861 }
2862
2863 $channel = $channel->{id};
2864 }
2865
2866 return unless @extra || length $msg;
2867
2368 if ($self->can_msg) { 2868 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2869 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF;
2872
2873 $self->send_packet ("msg " . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2370 } else { 2875 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/;
2379 }
2380
2381 if ($color >= 0) { 2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886
2887 $color &= cf::NDI_COLOR_MASK;
2888
2889 utf8::encode $msg;
2890
2382 if ($msg =~ /\[/) { 2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2385 $self->send_packet ("drawinfo $color $msg") 2896 $self->send_packet ("drawinfo $color $msg")
2386 } 2897 }
2387 } 2898 }
2388 } 2899 }
2389} 2900}
2390 2901
2391=item $client->ext_event ($type, %msg) 2902=item $client->ext_msg ($type, @msg)
2392 2903
2393Sends an exti event to the client. 2904Sends an ext event to the client.
2394 2905
2395=cut 2906=cut
2396 2907
2397sub cf::client::ext_event($$%) { 2908sub cf::client::ext_msg($$@) {
2398 my ($self, $type, %msg) = @_; 2909 my ($self, $type, @msg) = @_;
2399 2910
2911 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove
2400 $msg{msgtype} = "event_$type"; 2914 push @msg, msgtype => "event_$type";
2401 $self->send_packet ("ext " . cf::to_json \%msg); 2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 }
2917}
2918
2919=item $client->ext_reply ($msgid, @msg)
2920
2921Sends an ext reply to the client.
2922
2923=cut
2924
2925sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_;
2927
2928 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 }
2402} 2935}
2403 2936
2404=item $success = $client->query ($flags, "text", \&cb) 2937=item $success = $client->query ($flags, "text", \&cb)
2405 2938
2406Queues a query to the client, calling the given callback with 2939Queues a query to the client, calling the given callback with
2407the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2940the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2408C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2941C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2409 2942
2410Queries can fail, so check the return code. Or don't, as queries will become 2943Queries can fail, so check the return code. Or don't, as queries will
2411reliable at some point in the future. 2944become reliable at some point in the future.
2412 2945
2413=cut 2946=cut
2414 2947
2415sub cf::client::query { 2948sub cf::client::query {
2416 my ($self, $flags, $text, $cb) = @_; 2949 my ($self, $flags, $text, $cb) = @_;
2424 utf8::encode $text; 2957 utf8::encode $text;
2425 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2958 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426 2959
2427 $self->send_packet ($self->{query_queue}[0][0]) 2960 $self->send_packet ($self->{query_queue}[0][0])
2428 if @{ $self->{query_queue} } == 1; 2961 if @{ $self->{query_queue} } == 1;
2962
2963 1
2429} 2964}
2430 2965
2431cf::client->attach ( 2966cf::client->attach (
2967 on_connect => sub {
2968 my ($ns) = @_;
2969
2970 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2971 },
2432 on_reply => sub { 2972 on_reply => sub {
2433 my ($ns, $msg) = @_; 2973 my ($ns, $msg) = @_;
2434 2974
2435 # this weird shuffling is so that direct followup queries 2975 # this weird shuffling is so that direct followup queries
2436 # get handled first 2976 # get handled first
2448 } else { 2988 } else {
2449 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2989 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450 } 2990 }
2451 } 2991 }
2452 }, 2992 },
2993 on_exticmd => sub {
2994 my ($ns, $buf) = @_;
2995
2996 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2997
2998 if (ref $msg) {
2999 my ($type, $reply, @payload) =
3000 "ARRAY" eq ref $msg
3001 ? @$msg
3002 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3003
3004 my @reply;
3005
3006 if (my $cb = $EXTICMD{$type}) {
3007 @reply = $cb->($ns, @payload);
3008 }
3009
3010 $ns->ext_reply ($reply, @reply)
3011 if $reply;
3012
3013 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 }
3016
3017 cf::override;
3018 },
2453); 3019);
2454 3020
2455=item $client->async (\&cb) 3021=item $client->async (\&cb)
2456 3022
2457Create a new coroutine, running the specified callback. The coroutine will 3023Create a new coroutine, running the specified callback. The coroutine will
2498our $safe = new Safe "safe"; 3064our $safe = new Safe "safe";
2499our $safe_hole = new Safe::Hole; 3065our $safe_hole = new Safe::Hole;
2500 3066
2501$SIG{FPE} = 'IGNORE'; 3067$SIG{FPE} = 'IGNORE';
2502 3068
2503$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3069$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math
3071 grepstart grepwhile mapstart mapwhile
3072 sort time
3073));
2504 3074
2505# here we export the classes and methods available to script code 3075# here we export the classes and methods available to script code
2506 3076
2507=pod 3077=pod
2508 3078
2509The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
2510 3080
2511 cf::object contr pay_amount pay_player map 3081 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr
3084
2512 cf::object::player player 3085 cf::object::player
2513 cf::player peaceful 3086 player
2514 cf::map trigger 3087
3088 cf::player
3089 peaceful
3090
3091 cf::map
3092 trigger
2515 3093
2516=cut 3094=cut
2517 3095
2518for ( 3096for (
2519 ["cf::object" => qw(contr pay_amount pay_player map)], 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race
3099 decrease_ob_nr destroy)],
2520 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2521 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful)],
2522 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2523) { 3103) {
2524 no strict 'refs'; 3104 no strict 'refs';
2600# the server's init and main functions 3180# the server's init and main functions
2601 3181
2602sub load_facedata($) { 3182sub load_facedata($) {
2603 my ($path) = @_; 3183 my ($path) = @_;
2604 3184
3185 # HACK to clear player env face cache, we need some signal framework
3186 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = ();
3188
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190
2605 warn "loading facedata from $path\n"; 3191 warn "loading facedata from $path\n";
2606 3192
2607 my $facedata; 3193 my $facedata;
2608 0 < aio_load $path, $facedata 3194 0 < aio_load $path, $facedata
2609 or die "$path: $!"; 3195 or die "$path: $!";
2611 $facedata = Coro::Storable::thaw $facedata; 3197 $facedata = Coro::Storable::thaw $facedata;
2612 3198
2613 $facedata->{version} == 2 3199 $facedata->{version} == 2
2614 or cf::cleanup "$path: version mismatch, cannot proceed."; 3200 or cf::cleanup "$path: version mismatch, cannot proceed.";
2615 3201
3202 # patch in the exptable
3203 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3206 };
3207 cf::cede_to_tick;
3208
2616 { 3209 {
2617 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
2618 3211
2619 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
2620 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
2621 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3215 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap};
2622 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2623 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2624 Coro::cede; 3219
3220 cf::cede_to_tick;
2625 } 3221 }
2626 3222
2627 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
2628 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
2629 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
2630 or next; 3227 or next;
3228
2631 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth;
2632 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2633 } else { 3232 } else {
2634 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
2635 } 3234 }
2636 Coro::cede; 3235
3236 cf::cede_to_tick;
2637 } 3237 }
2638 } 3238 }
2639 3239
2640 { 3240 {
2641 my $anims = $facedata->{animinfo}; 3241 my $anims = $facedata->{animinfo};
2642 3242
2643 while (my ($anim, $info) = each %$anims) { 3243 while (my ($anim, $info) = each %$anims) {
2644 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3244 cf::anim::set $anim, $info->{frames}, $info->{facings};
2645 Coro::cede; 3245 cf::cede_to_tick;
2646 } 3246 }
2647 3247
2648 cf::anim::invalidate_all; # d'oh 3248 cf::anim::invalidate_all; # d'oh
2649 } 3249 }
2650 3250
3251 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource};
3255
3256 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260
3261 if ($info->{type} & 1) {
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type};
3276 } else {
3277 $RESOURCE{$name} = $info;
3278 }
3279
3280 cf::cede_to_tick;
3281 }
3282 }
3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285
2651 1 3286 1
2652} 3287}
2653 3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308
3309register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_;
3311
3312 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v);
3314 }
3315};
3316
3317sub load_resource_file($) {
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321 $status
3322}
3323
2654sub reload_regions { 3324sub reload_regions {
3325 # HACK to clear player env face cache, we need some signal framework
3326 # for this (global event?)
3327 %ext::player_env::MUSIC_FACE_CACHE = ();
3328
2655 load_resource_file "$MAPDIR/regions" 3329 load_resource_file "$MAPDIR/regions"
2656 or die "unable to load regions file\n"; 3330 or die "unable to load regions file\n";
3331
3332 for (cf::region::list) {
3333 $_->{match} = qr/$_->{match}/
3334 if exists $_->{match};
3335 }
2657} 3336}
2658 3337
2659sub reload_facedata { 3338sub reload_facedata {
2660 load_facedata "$DATADIR/facedata" 3339 load_facedata "$DATADIR/facedata"
2661 or die "unable to load facedata\n"; 3340 or die "unable to load facedata\n";
2672} 3351}
2673 3352
2674sub reload_resources { 3353sub reload_resources {
2675 warn "reloading resource files...\n"; 3354 warn "reloading resource files...\n";
2676 3355
3356 reload_facedata;
3357 reload_archetypes;
2677 reload_regions; 3358 reload_regions;
2678 reload_facedata;
2679 #reload_archetypes;#d#
2680 reload_archetypes;
2681 reload_treasures; 3359 reload_treasures;
2682 3360
2683 warn "finished reloading resource files\n"; 3361 warn "finished reloading resource files\n";
2684} 3362}
2685 3363
2686sub init { 3364sub init {
3365 my $guard = freeze_mainloop;
3366
2687 reload_resources; 3367 reload_resources;
2688} 3368}
2689 3369
2690sub cfg_load { 3370sub reload_config {
2691 open my $fh, "<:utf8", "$CONFDIR/config" 3371 open my $fh, "<:utf8", "$CONFDIR/config"
2692 or return; 3372 or return;
2693 3373
2694 local $/; 3374 local $/;
2695 *CFG = YAML::Syck::Load <$fh>; 3375 *CFG = YAML::Load <$fh>;
2696 3376
2697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2698 3378
2699 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2700 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3380 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2711sub main { 3391sub main {
2712 # we must not ever block the main coroutine 3392 # we must not ever block the main coroutine
2713 local $Coro::idle = sub { 3393 local $Coro::idle = sub {
2714 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3394 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2715 (async { 3395 (async {
2716 Event::one_event; 3396 $Coro::current->{desc} = "IDLE BUG HANDLER";
3397 EV::loop EV::LOOP_ONESHOT;
2717 })->prio (Coro::PRIO_MAX); 3398 })->prio (Coro::PRIO_MAX);
2718 }; 3399 };
2719 3400
2720 cfg_load; 3401 {
3402 my $guard = freeze_mainloop;
3403 reload_config;
2721 db_init; 3404 db_init;
2722 load_extensions; 3405 load_extensions;
2723 3406
2724 $TICK_WATCHER->start; 3407 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3408 evthread_start IO::AIO::poll_fileno;
3409 }
3410
2725 Event::loop; 3411 EV::loop;
2726} 3412}
2727 3413
2728############################################################################# 3414#############################################################################
2729# initialisation and cleanup 3415# initialisation and cleanup
2730 3416
2731# install some emergency cleanup handlers 3417# install some emergency cleanup handlers
2732BEGIN { 3418BEGIN {
3419 our %SIGWATCHER = ();
2733 for my $signal (qw(INT HUP TERM)) { 3420 for my $signal (qw(INT HUP TERM)) {
2734 Event->signal ( 3421 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2735 reentrant => 0,
2736 data => WF_AUTOCANCEL,
2737 signal => $signal,
2738 prio => 0,
2739 cb => sub {
2740 cf::cleanup "SIG$signal"; 3422 cf::cleanup "SIG$signal";
2741 },
2742 ); 3423 };
2743 } 3424 }
2744} 3425}
2745 3426
2746sub write_runtime { 3427sub write_runtime_sync {
2747 my $runtime = "$LOCALDIR/runtime"; 3428 my $runtime = "$LOCALDIR/runtime";
2748 3429
2749 # first touch the runtime file to show we are still running: 3430 # first touch the runtime file to show we are still running:
2750 # the fsync below can take a very very long time. 3431 # the fsync below can take a very very long time.
2751 3432
2777 and return; 3458 and return;
2778 3459
2779 warn "runtime file written.\n"; 3460 warn "runtime file written.\n";
2780 3461
2781 1 3462 1
3463}
3464
3465our $uuid_lock;
3466our $uuid_skip;
3467
3468sub write_uuid_sync($) {
3469 $uuid_skip ||= $_[0];
3470
3471 return if $uuid_lock;
3472 local $uuid_lock = 1;
3473
3474 my $uuid = "$LOCALDIR/uuid";
3475
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return;
3478
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3480 $uuid_skip = 0;
3481
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return;
3484
3485 # always fsync - this file is important
3486 aio_fsync $fh
3487 and return;
3488
3489 close $fh
3490 or return;
3491
3492 aio_rename "$uuid~", $uuid
3493 and return;
3494
3495 warn "uuid file written ($value).\n";
3496
3497 1
3498
3499}
3500
3501sub write_uuid($$) {
3502 my ($skip, $sync) = @_;
3503
3504 $sync ? write_uuid_sync $skip
3505 : async { write_uuid_sync $skip };
2782} 3506}
2783 3507
2784sub emergency_save() { 3508sub emergency_save() {
2785 my $freeze_guard = cf::freeze_mainloop; 3509 my $freeze_guard = cf::freeze_mainloop;
2786 3510
2792 # and maps saved/destroyed asynchronously. 3516 # and maps saved/destroyed asynchronously.
2793 warn "begin emergency player save\n"; 3517 warn "begin emergency player save\n";
2794 for my $login (keys %cf::PLAYER) { 3518 for my $login (keys %cf::PLAYER) {
2795 my $pl = $cf::PLAYER{$login} or next; 3519 my $pl = $cf::PLAYER{$login} or next;
2796 $pl->valid or next; 3520 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2797 $pl->save; 3522 $pl->save;
2798 } 3523 }
2799 warn "end emergency player save\n"; 3524 warn "end emergency player save\n";
2800 3525
2801 warn "begin emergency map save\n"; 3526 warn "begin emergency map save\n";
2807 warn "end emergency map save\n"; 3532 warn "end emergency map save\n";
2808 3533
2809 warn "begin emergency database checkpoint\n"; 3534 warn "begin emergency database checkpoint\n";
2810 BDB::db_env_txn_checkpoint $DB_ENV; 3535 BDB::db_env_txn_checkpoint $DB_ENV;
2811 warn "end emergency database checkpoint\n"; 3536 warn "end emergency database checkpoint\n";
3537
3538 warn "begin write uuid\n";
3539 write_uuid_sync 1;
3540 warn "end write uuid\n";
2812 }; 3541 };
2813 3542
2814 warn "leave emergency perl save\n"; 3543 warn "leave emergency perl save\n";
2815} 3544}
2816 3545
2831 warn "reloading..."; 3560 warn "reloading...";
2832 3561
2833 warn "entering sync_job"; 3562 warn "entering sync_job";
2834 3563
2835 cf::sync_job { 3564 cf::sync_job {
2836 cf::write_runtime; # external watchdog should not bark 3565 cf::write_runtime_sync; # external watchdog should not bark
2837 cf::emergency_save; 3566 cf::emergency_save;
2838 cf::write_runtime; # external watchdog should not bark 3567 cf::write_runtime_sync; # external watchdog should not bark
2839 3568
2840 warn "syncing database to disk"; 3569 warn "syncing database to disk";
2841 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
2842 3571
2843 # if anything goes wrong in here, we should simply crash as we already saved 3572 # if anything goes wrong in here, we should simply crash as we already saved
2844
2845 warn "cancelling all WF_AUTOCANCEL watchers";
2846 for (Event::all_watchers) {
2847 $_->cancel if $_->data & WF_AUTOCANCEL;
2848 }
2849 3573
2850 warn "flushing outstanding aio requests"; 3574 warn "flushing outstanding aio requests";
2851 for (;;) { 3575 for (;;) {
2852 BDB::flush; 3576 BDB::flush;
2853 IO::AIO::flush; 3577 IO::AIO::flush;
2854 Coro::cede; 3578 Coro::cede_notself;
2855 last unless IO::AIO::nreqs || BDB::nreqs; 3579 last unless IO::AIO::nreqs || BDB::nreqs;
2856 warn "iterate..."; 3580 warn "iterate...";
2857 } 3581 }
2858 3582
2859 ++$RELOAD; 3583 ++$RELOAD;
2863 %EXT_CORO = (); 3587 %EXT_CORO = ();
2864 3588
2865 warn "removing commands"; 3589 warn "removing commands";
2866 %COMMAND = (); 3590 %COMMAND = ();
2867 3591
2868 warn "removing ext commands"; 3592 warn "removing ext/exti commands";
2869 %EXTCMD = (); 3593 %EXTCMD = ();
3594 %EXTICMD = ();
2870 3595
2871 warn "unloading/nuking all extensions"; 3596 warn "unloading/nuking all extensions";
2872 for my $pkg (@EXTS) { 3597 for my $pkg (@EXTS) {
2873 warn "... unloading $pkg"; 3598 warn "... unloading $pkg";
2874 3599
2917 warn "reloading cf.pm"; 3642 warn "reloading cf.pm";
2918 require cf; 3643 require cf;
2919 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3644 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2920 3645
2921 warn "loading config and database again"; 3646 warn "loading config and database again";
2922 cf::cfg_load; 3647 cf::reload_config;
2923 3648
2924 warn "loading extensions"; 3649 warn "loading extensions";
2925 cf::load_extensions; 3650 cf::load_extensions;
2926 3651
2927 warn "reattaching attachments to objects/players"; 3652 warn "reattaching attachments to objects/players";
2934 warn "leaving sync_job"; 3659 warn "leaving sync_job";
2935 3660
2936 1 3661 1
2937 } or do { 3662 } or do {
2938 warn $@; 3663 warn $@;
2939 warn "error while reloading, exiting."; 3664 cf::cleanup "error while reloading, exiting.";
2940 exit 1;
2941 }; 3665 };
2942 3666
2943 warn "reloaded"; 3667 warn "reloaded";
2944}; 3668};
2945 3669
2947 3671
2948sub reload_perl() { 3672sub reload_perl() {
2949 # doing reload synchronously and two reloads happen back-to-back, 3673 # doing reload synchronously and two reloads happen back-to-back,
2950 # coro crashes during coro_state_free->destroy here. 3674 # coro crashes during coro_state_free->destroy here.
2951 3675
2952 $RELOAD_WATCHER ||= Event->timer ( 3676 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2953 reentrant => 0,
2954 after => 0,
2955 data => WF_AUTOCANCEL,
2956 cb => sub {
2957 do_reload_perl; 3677 do_reload_perl;
2958 undef $RELOAD_WATCHER; 3678 undef $RELOAD_WATCHER;
2959 },
2960 ); 3679 };
2961} 3680}
2962 3681
2963register_command "reload" => sub { 3682register_command "reload" => sub {
2964 my ($who, $arg) = @_; 3683 my ($who, $arg) = @_;
2965 3684
2966 if ($who->flag (FLAG_WIZ)) { 3685 if ($who->flag (FLAG_WIZ)) {
2967 $who->message ("reloading server."); 3686 $who->message ("reloading server.");
3687 async {
3688 $Coro::current->{desc} = "perl_reload";
2968 async { reload_perl }; 3689 reload_perl;
3690 };
2969 } 3691 }
2970}; 3692};
2971 3693
2972unshift @INC, $LIBDIR; 3694unshift @INC, $LIBDIR;
2973 3695
2975 3697
2976our @WAIT_FOR_TICK; 3698our @WAIT_FOR_TICK;
2977our @WAIT_FOR_TICK_BEGIN; 3699our @WAIT_FOR_TICK_BEGIN;
2978 3700
2979sub wait_for_tick { 3701sub wait_for_tick {
2980 return unless $TICK_WATCHER->is_active;
2981 return if $Coro::current == $Coro::main; 3702 return if tick_inhibit || $Coro::current == $Coro::main;
2982 3703
2983 my $signal = new Coro::Signal; 3704 my $signal = new Coro::Signal;
2984 push @WAIT_FOR_TICK, $signal; 3705 push @WAIT_FOR_TICK, $signal;
2985 $signal->wait; 3706 $signal->wait;
2986} 3707}
2987 3708
2988sub wait_for_tick_begin { 3709sub wait_for_tick_begin {
2989 return unless $TICK_WATCHER->is_active;
2990 return if $Coro::current == $Coro::main; 3710 return if tick_inhibit || $Coro::current == $Coro::main;
2991 3711
2992 my $signal = new Coro::Signal; 3712 my $signal = new Coro::Signal;
2993 push @WAIT_FOR_TICK_BEGIN, $signal; 3713 push @WAIT_FOR_TICK_BEGIN, $signal;
2994 $signal->wait; 3714 $signal->wait;
2995} 3715}
2996 3716
2997 my $min = 1e6;#d# 3717sub tick {
2998 my $avg = 10;
2999$TICK_WATCHER = Event->timer (
3000 reentrant => 0,
3001 parked => 1,
3002 prio => 0,
3003 at => $NEXT_TICK || $TICK,
3004 data => WF_AUTOCANCEL,
3005 cb => sub {
3006 if ($Coro::current != $Coro::main) { 3718 if ($Coro::current != $Coro::main) {
3007 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3719 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3008 unless ++$bug_warning > 10; 3720 unless ++$bug_warning > 10;
3009 return; 3721 return;
3010 } 3722 }
3011 3723
3012 $NOW = $tick_start = Event::time;
3013
3014 cf::server_tick; # one server iteration 3724 cf::server_tick; # one server iteration
3015 3725
3016 0 && sync_job {#d# 3726 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3017 for(1..10) { 3727 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3018 my $t = Event::time; 3728 Coro::async_pool {
3019 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3729 $Coro::current->{desc} = "runtime saver";
3020 or die; 3730 write_runtime_sync
3021 3731 or warn "ERROR: unable to write runtime file: $!";
3022 $map->width (50);
3023 $map->height (50);
3024 $map->alloc;
3025 $map->_load_objects ("/tmp/x.map", 1);
3026 my $t = Event::time - $t;
3027
3028 #next unless $t < 0.0013;#d#
3029 if ($t < $min) {
3030 $min = $t;
3031 }
3032 $avg = $avg * 0.99 + $t * 0.01;
3033 }
3034 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3035 exit 0;
3036 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3037 }; 3732 };
3733 }
3038 3734
3039 $RUNTIME += $TICK;
3040 $NEXT_TICK += $TICK;
3041
3042 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3043 $NEXT_RUNTIME_WRITE = $NOW + 10;
3044 Coro::async_pool {
3045 write_runtime
3046 or warn "ERROR: unable to write runtime file: $!";
3047 };
3048 }
3049
3050# my $AFTER = Event::time;
3051# warn $AFTER - $NOW;#d#
3052
3053 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3735 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3054 $sig->send; 3736 $sig->send;
3055 } 3737 }
3056 while (my $sig = shift @WAIT_FOR_TICK) { 3738 while (my $sig = shift @WAIT_FOR_TICK) {
3057 $sig->send; 3739 $sig->send;
3058 } 3740 }
3059 3741
3060 $NOW = Event::time; 3742 $LOAD = ($NOW - $TICK_START) / $TICK;
3061
3062 # if we are delayed by four ticks or more, skip them all
3063 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3064
3065 $TICK_WATCHER->at ($NEXT_TICK);
3066 $TICK_WATCHER->start;
3067
3068 $LOAD = ($NOW - $tick_start) / $TICK;
3069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3743 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3070 3744
3071 _post_tick; 3745 if (0) {
3072 3746 if ($NEXT_TICK) {
3073 3747 my $jitter = $TICK_START - $NEXT_TICK;
3748 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3749 warn "jitter $JITTER\n";#d#
3750 }
3074 }, 3751 }
3075); 3752}
3076 3753
3077{ 3754{
3078 BDB::max_poll_time $TICK * 0.1; 3755 # configure BDB
3079 $BDB_POLL_WATCHER = Event->io ( 3756
3080 reentrant => 0,
3081 fd => BDB::poll_fileno,
3082 poll => 'r',
3083 prio => 0,
3084 data => WF_AUTOCANCEL,
3085 cb => \&BDB::poll_cb,
3086 );
3087 BDB::min_parallel 8; 3757 BDB::min_parallel 8;
3088 3758 BDB::max_poll_reqs $TICK * 0.1;
3089 BDB::set_sync_prepare { 3759 $Coro::BDB::WATCHER->priority (1);
3090 my $status;
3091 my $current = $Coro::current;
3092 (
3093 sub {
3094 $status = $!;
3095 $current->ready; undef $current;
3096 },
3097 sub {
3098 Coro::schedule while defined $current;
3099 $! = $status;
3100 },
3101 )
3102 };
3103 3760
3104 unless ($DB_ENV) { 3761 unless ($DB_ENV) {
3105 $DB_ENV = BDB::db_env_create; 3762 $DB_ENV = BDB::db_env_create;
3763 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3764 | BDB::LOG_AUTOREMOVE, 1);
3765 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3766 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3106 3767
3107 cf::sync_job { 3768 cf::sync_job {
3108 eval { 3769 eval {
3109 BDB::db_env_open 3770 BDB::db_env_open
3110 $DB_ENV, 3771 $DB_ENV,
3112 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3773 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3113 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3774 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3114 0666; 3775 0666;
3115 3776
3116 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3777 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3117
3118 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3119 $DB_ENV->set_lk_detect;
3120 }; 3778 };
3121 3779
3122 cf::cleanup "db_env_open(db): $@" if $@; 3780 cf::cleanup "db_env_open(db): $@" if $@;
3123 }; 3781 };
3124 } 3782 }
3783
3784 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3785 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3786 };
3787 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3788 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3789 };
3790 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3791 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3792 };
3125} 3793}
3126 3794
3127{ 3795{
3796 # configure IO::AIO
3797
3128 IO::AIO::min_parallel 8; 3798 IO::AIO::min_parallel 8;
3129
3130 undef $Coro::AIO::WATCHER;
3131 IO::AIO::max_poll_time $TICK * 0.1; 3799 IO::AIO::max_poll_time $TICK * 0.1;
3132 $AIO_POLL_WATCHER = Event->io ( 3800 $Coro::AIO::WATCHER->priority (1);
3133 reentrant => 0,
3134 data => WF_AUTOCANCEL,
3135 fd => IO::AIO::poll_fileno,
3136 poll => 'r',
3137 prio => 6,
3138 cb => \&IO::AIO::poll_cb,
3139 );
3140} 3801}
3141 3802
3142my $_log_backtrace; 3803my $_log_backtrace;
3143 3804
3144sub _log_backtrace { 3805sub _log_backtrace {
3148 3809
3149 # limit the # of concurrent backtraces 3810 # limit the # of concurrent backtraces
3150 if ($_log_backtrace < 2) { 3811 if ($_log_backtrace < 2) {
3151 ++$_log_backtrace; 3812 ++$_log_backtrace;
3152 async { 3813 async {
3814 $Coro::current->{desc} = "abt $msg";
3815
3153 my @bt = fork_call { 3816 my @bt = fork_call {
3154 @addr = map { sprintf "%x", $_ } @addr; 3817 @addr = map { sprintf "%x", $_ } @addr;
3155 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3818 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3156 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3819 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3157 or die "addr2line: $!"; 3820 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines