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.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.421 by root, Tue Apr 15 18:43:11 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
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
57use Digest::MD5 ();
34 58
35# configure various modules to our taste 59# configure various modules to our taste
36# 60#
37$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
38Coro::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
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 64
46$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
47 66
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 68
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
73 93
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 97our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
81 99
82our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 104our $DB_ENV;
84 105
85our %CFG; 106our %CFG;
86 107
87our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 109our $RUNTIME;
110our $NOW;
89 111
90our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
93 115
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 118
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
100 123
101binmode STDOUT; 124binmode STDOUT;
102binmode STDERR; 125binmode STDERR;
103 126
104# read virtual server time, if available 127# read virtual server time, if available
157 180
158The raw value load value from the last tick. 181The raw value load value from the last tick.
159 182
160=item %cf::CFG 183=item %cf::CFG
161 184
162Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 186from wherever your confdir points to.
164 187
165=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
166 189
167These 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
168returns 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
169per 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.
170 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
171=back 200=back
172 201
173=cut 202=cut
174 203
175BEGIN { 204BEGIN {
179 $msg .= "\n" 208 $msg .= "\n"
180 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
181 210
182 $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;
183 212
184 utf8::encode $msg;
185 LOG llevError, $msg; 213 LOG llevError, $msg;
186 }; 214 };
187} 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#?
188 231
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 248)) {
206 no strict 'refs'; 249 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 251}
209 252
210$Event::DIED = sub { 253$EV::DIED = sub {
211 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
212}; 255};
213 256
214############################################################################# 257#############################################################################
215 258
238 $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;
239 $d 282 $d
240 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
241} 284}
242 285
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.
250 293
251=cut 294=cut
252 295
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 297
255sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
257 300
258=item cf::lock_wait $string 301=item cf::lock_wait $string
259 302
260Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
261 304
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
267returned. 310returned.
268 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
269Lock 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
270uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
271 317
272=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
273 319
274Return 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.
275 321
276=cut 322=cut
277 323
278our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
279 326
280sub lock_wait($) { 327sub lock_wait($) {
281 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#
282 334
283 # wait for lock, if any 335 # wait for lock, if any
284 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 338 Coro::schedule;
292 344
293 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
294 lock_wait $key; 346 lock_wait $key;
295 347
296 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
297 350
298 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
301 } 355 }
302} 356}
303 357
306 360
307 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
308} 362}
309 363
310sub freeze_mainloop { 364sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
312 366
313 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
314 $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 }
315 }; 428 }
316 $TICK_WATCHER->stop; 429};
317 $guard 430
431sub get_slot($;$$) {
432 return if tick_inhibit;
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;
318} 443}
319 444
320=item cf::async { BLOCK } 445=item cf::async { BLOCK }
321 446
322Currently the same as Coro::async_pool, meaning you cannot use 447Currently the same as Coro::async_pool, meaning you cannot use
327 452
328BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
329 454
330=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
331 456
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
334partly 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
335acceptable. 460acceptable.
336 461
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
343 468
344sub sync_job(&) { 469sub sync_job(&) {
345 my ($job) = @_; 470 my ($job) = @_;
346 471
347 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 473 my $time = EV::time;
349 474
350 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
352 477
353 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 479
355 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
356 481
357 my $busy = 1; 482 my $busy = 1;
358 my @res; 483 my @res;
359 484
360 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 487 @res = eval { $job->() };
362 warn $@ if $@; 488 warn $@ if $@;
363 undef $busy; 489 undef $busy;
364 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
365 491
366 while ($busy) { 492 while ($busy) {
367 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
368 } 497 }
498 }
369 499
370 $time = Event::time - $time; 500 my $time = EV::time - $time;
371 501
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
376 503
377 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
378 } else { 505 } else {
379 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
380 507
405=item fork_call { }, $args 532=item fork_call { }, $args
406 533
407Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
411 538
412=cut 539=cut
413 540
414sub fork_call(&@) { 541sub fork_call(&@) {
415 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
416 543
417# 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,
418# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 547
422 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 549 reset_signals;
435 local $SIG{__WARN__}; 550 &$cb
436 local $SIG{__DIE__}; 551 }, @args;
437 eval {
438 close $fh1;
439 552
440 my @res = eval { $cb->(@args) }; 553 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 554}
442 };
443 555
444 warn $@ if $@; 556=item $coin = coin_from_name $name
445 _exit 0; 557
446 } 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
447} 581}
448 582
449=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
450 584
451Returns a single value from the environment database. 585Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
454 588
455Stores 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
456data 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).
457 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
458=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}
459 615
460our $DB; 616our $DB;
461 617
462sub db_init { 618sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 619 cf::sync_job {
467 eval { 620 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 621 };
477} 622}
478 623
479sub db_get($$) { 624sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
481 626
531 if (1) { 676 if (1) {
532 $md5 = 677 $md5 =
533 join "\x00", 678 join "\x00",
534 $processversion, 679 $processversion,
535 map { 680 map {
536 Coro::cede; 681 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 683 } 0.. $#$src;
539 684
540 685
541 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
585attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
587 732
588In 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>
589C<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
590Crossfire TRT). 735Deliantra).
591 736
592=over 4 737=over 4
593 738
594=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
595 740
847 "; 992 ";
848 die if $@; 993 die if $@;
849} 994}
850 995
851our $override; 996our $override;
852our @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?
853 998
854sub override { 999sub override {
855 $override = 1; 1000 $override = 1;
856 @invoke_results = (); 1001 @INVOKE_RESULTS = (@_);
857} 1002}
858 1003
859sub do_invoke { 1004sub do_invoke {
860 my $event = shift; 1005 my $event = shift;
861 my $callbacks = shift; 1006 my $callbacks = shift;
862 1007
863 @invoke_results = (); 1008 @INVOKE_RESULTS = ();
864 1009
865 local $override; 1010 local $override;
866 1011
867 for (@$callbacks) { 1012 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1013 eval { &{$_->[1]} };
877 } 1022 }
878 1023
879 0 1024 0
880} 1025}
881 1026
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1028
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1030
886Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
887 1032
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 1035results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1036
892=back 1037=back
893 1038
894=cut 1039=cut
895 1040
896############################################################################# 1041#############################################################################
897# 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}
898 1085
899sub reattach { 1086sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1088 my ($obj) = @_;
902 1089
923cf::attachable->attach ( 1110cf::attachable->attach (
924 prio => -1000000, 1111 prio => -1000000,
925 on_instantiate => sub { 1112 on_instantiate => sub {
926 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
927 1114
928 $data = from_json $data; 1115 $data = decode_json $data;
929 1116
930 for (@$data) { 1117 for (@$data) {
931 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
932 1119
933 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1136sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
951 1138
952 sync_job { 1139 sync_job {
953 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
956 1144
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1146 chmod SAVE_MODE, $fh;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1149 close $fh;
962 1150
963 if (@$objs) { 1151 if (@$objs) {
964 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) {
965 chmod SAVE_MODE, $fh; 1153 chmod SAVE_MODE, $fh;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1157 close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
971 } 1159 }
979 } 1167 }
980 } else { 1168 } else {
981 aio_unlink $filename; 1169 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
983 } 1171 }
984 } 1172 };
985} 1173}
986 1174
987sub object_freezer_as_string { 1175sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
989 1177
1001 or return; 1189 or return;
1002 1190
1003 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1193 or return;
1194
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1007 } 1197 }
1008 1198
1199 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1011 return ($data, $av); 1203 ($data, $av)
1012} 1204}
1013 1205
1014=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1015 1207
1016=over 4 1208=over 4
1089 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1090 1282
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1284
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1099 } else { 1300 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1302 }
1102 1303
1103 cf::override; 1304 cf::override;
1156 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1158 1359
1159 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1361 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1363 }
1164 1364
1165 warn $msg; 1365 warn $msg;
1166 } 1366 }
1167 1367
1192use Coro::AIO; 1392use Coro::AIO;
1193 1393
1194=head3 cf::player 1394=head3 cf::player
1195 1395
1196=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}
1197 1411
1198=item cf::player::find $login 1412=item cf::player::find $login
1199 1413
1200Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1201 1415
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1455
1242 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1463 $cf::PLAYER{$login} = $pl
1245 } 1464 }
1246 } 1465 }
1247} 1466}
1248 1467
1257 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1258 1477
1259 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1261 1480
1481 cf::get_slot 0.01;
1482
1262 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1263 Coro::cede; 1484 cf::cede_to_tick;
1264} 1485}
1265 1486
1266sub new($) { 1487sub new($) {
1267 my ($login) = @_; 1488 my ($login) = @_;
1268 1489
1272 $self->{deny_save} = 1; 1493 $self->{deny_save} = 1;
1273 1494
1274 $cf::PLAYER{$login} = $self; 1495 $cf::PLAYER{$login} = $self;
1275 1496
1276 $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 (@_);
1277} 1508}
1278 1509
1279=item $pl->quit_character 1510=item $pl->quit_character
1280 1511
1281Nukes the player without looking back. If logged in, the connection will 1512Nukes the player without looking back. If logged in, the connection will
1336 or return []; 1567 or return [];
1337 1568
1338 my @logins; 1569 my @logins;
1339 1570
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1577 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1578 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 }
1344 1580
1345 utf8::decode $login; 1581 utf8::decode $login;
1346 push @logins, $login; 1582 push @logins, $login;
1347 } 1583 }
1348 1584
1381 1617
1382Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1383 1619
1384=cut 1620=cut
1385 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
1386sub expand_cfpod { 1633sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1388 1635
1389 # escape & and < 1636 my $xml;
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392 1637
1393 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1394 1641
1395 1 while 1642 $group =~ s/&/&amp;/g;
1396 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1400 # replace G<male|female> tags 1647 ([BCGHITU])
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1648 <
1402 $self->gender ? $2 : $1 1649 (?:
1403 }ge 1650 ([^<>]*) (?{ $group = $^N })
1404 # replace H<hint text> 1651 | < $interior >
1405 || s{H<([^\>]*)>} 1652 )
1653 >
1654 %gcsx
1406 { 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") {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "") 1675 "")
1410 [$self->{hintmode}] 1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1411 }ge; 1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1412 1687
1688 for ($xml) {
1413 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1415 1691
1416 # compress some whitespace 1692 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 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 }
1418 1698
1419 $_ 1699 $xml
1420} 1700}
1701
1702no re 'eval';
1421 1703
1422sub hintmode { 1704sub hintmode {
1423 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1706 $_[0]{hintmode}
1426} 1707}
1427 1708
1428=item $player->ext_reply ($msgid, %msg) 1709=item $player->ext_reply ($msgid, @msg)
1429 1710
1430Sends an ext reply to the player. 1711Sends an ext reply to the player.
1431 1712
1432=cut 1713=cut
1433 1714
1434sub ext_reply($$%) { 1715sub ext_reply($$@) {
1435 my ($self, $id, %msg) = @_; 1716 my ($self, $id, @msg) = @_;
1436 1717
1437 $msg{msgid} = $id; 1718 $self->ns->ext_reply ($id, @msg)
1438 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439} 1719}
1440 1720
1441=item $player->ext_event ($type, %msg) 1721=item $player->ext_msg ($type, @msg)
1442 1722
1443Sends an ext event to the client. 1723Sends an ext event to the client.
1444 1724
1445=cut 1725=cut
1446 1726
1447sub ext_event($$%) { 1727sub ext_msg($$@) {
1448 my ($self, $type, %msg) = @_; 1728 my ($self, $type, @msg) = @_;
1449 1729
1450 $self->ns->ext_event ($type, %msg); 1730 $self->ns->ext_msg ($type, @msg);
1451} 1731}
1452 1732
1453=head3 cf::region 1733=head3 cf::region
1454 1734
1455=over 4 1735=over 4
1468 my ($path) = @_; 1748 my ($path) = @_;
1469 1749
1470 my ($match, $specificity); 1750 my ($match, $specificity);
1471 1751
1472 for my $region (list) { 1752 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1753 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1754 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1755 if $region->specificity > $specificity;
1476 } 1756 }
1477 } 1757 }
1478 1758
1499our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1500our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1501 1781
1502sub generate_random_map { 1782sub generate_random_map {
1503 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
1504 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1505 $self->_create_random_map ( 1788 $self->_create_random_map (
1506 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1507 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1508 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1598 $self->init; # pass $1 etc. 1881 $self->init; # pass $1 etc.
1599 return $self; 1882 return $self;
1600 } 1883 }
1601 } 1884 }
1602 1885
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1886 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1887 ()
1605} 1888}
1606 1889
1607sub init { 1890sub init {
1608 my ($self) = @_; 1891 my ($self) = @_;
1630 1913
1631# the temporary/swap location 1914# the temporary/swap location
1632sub save_path { 1915sub save_path {
1633 my ($self) = @_; 1916 my ($self) = @_;
1634 1917
1635 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1636 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1637} 1920}
1638 1921
1639# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1640sub uniq_path { 1923sub uniq_path {
1641 my ($self) = @_; 1924 my ($self) = @_;
1642 1925
1643 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1644 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1645} 1928}
1646 1929
1647# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1648# all maps in C++... 1931# all maps in C++...
1671 1954
1672sub load_header_from($) { 1955sub load_header_from($) {
1673 my ($self, $path) = @_; 1956 my ($self, $path) = @_;
1674 1957
1675 utf8::encode $path; 1958 utf8::encode $path;
1676 #aio_open $path, O_RDONLY, 0 1959 my $f = new_from_file cf::object::thawer $path
1677 # or return;
1678
1679 $self->_load_header ($path)
1680 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;
1681 1967
1682 $self->{load_path} = $path; 1968 $self->{load_path} = $path;
1683 1969
1684 1 1970 1
1685} 1971}
1739sub find { 2025sub find {
1740 my ($path, $origin) = @_; 2026 my ($path, $origin) = @_;
1741 2027
1742 $path = normalise $path, $origin && $origin->path; 2028 $path = normalise $path, $origin && $origin->path;
1743 2029
2030 cf::lock_wait "map_data:$path";#d#remove
1744 cf::lock_wait "map_find:$path"; 2031 cf::lock_wait "map_find:$path";
1745 2032
1746 $cf::MAP{$path} || do { 2033 $cf::MAP{$path} || do {
1747 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
1748 my $map = new_from_path cf::map $path 2037 my $map = new_from_path cf::map $path
1749 or return; 2038 or return;
1750 2039
1751 $map->{last_save} = $cf::RUNTIME; 2040 $map->{last_save} = $cf::RUNTIME;
1752 2041
1754 or return; 2043 or return;
1755 2044
1756 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1757 # doing this can freeze the server in a sync job, obviously 2046 # doing this can freeze the server in a sync job, obviously
1758 #$cf::WAIT_FOR_TICK->wait; 2047 #$cf::WAIT_FOR_TICK->wait;
2048 undef $guard1;
2049 undef $guard2;
1759 $map->reset; 2050 $map->reset;
1760 undef $guard;
1761 return find $path; 2051 return find $path;
1762 } 2052 }
1763 2053
1764 $cf::MAP{$path} = $map 2054 $cf::MAP{$path} = $map
1765 } 2055 }
1774 local $self->{deny_reset} = 1; # loading can take a long time 2064 local $self->{deny_reset} = 1; # loading can take a long time
1775 2065
1776 my $path = $self->{path}; 2066 my $path = $self->{path};
1777 2067
1778 { 2068 {
1779 my $guard = cf::lock_acquire "map_load:$path"; 2069 my $guard = cf::lock_acquire "map_data:$path";
1780 2070
2071 return unless $self->valid;
1781 return if $self->in_memory != cf::MAP_SWAPPED; 2072 return unless $self->in_memory == cf::MAP_SWAPPED;
1782 2073
1783 $self->in_memory (cf::MAP_LOADING); 2074 $self->in_memory (cf::MAP_LOADING);
1784 2075
1785 $self->alloc; 2076 $self->alloc;
1786 2077
1787 $self->pre_load; 2078 $self->pre_load;
1788 Coro::cede; 2079 cf::cede_to_tick;
1789 2080
2081 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block;
1790 $self->_load_objects ($self->{load_path}, 1) 2083 $self->_load_objects ($f)
1791 or return; 2084 or return;
1792 2085
1793 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1794 if delete $self->{load_original}; 2087 if delete $self->{load_original};
1795 2088
1796 if (my $uniq = $self->uniq_path) { 2089 if (my $uniq = $self->uniq_path) {
1797 utf8::encode $uniq; 2090 utf8::encode $uniq;
1798 if (aio_open $uniq, O_RDONLY, 0) { 2091 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) {
1799 $self->clear_unique_items; 2093 $self->clear_unique_items;
1800 $self->_load_objects ($uniq, 0); 2094 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs;
2096 }
1801 } 2097 }
1802 } 2098 }
1803 2099
1804 Coro::cede; 2100 $f->resolve_delayed_derefs;
2101
2102 cf::cede_to_tick;
1805 # now do the right thing for maps 2103 # now do the right thing for maps
1806 $self->link_multipart_objects; 2104 $self->link_multipart_objects;
1807 $self->difficulty ($self->estimate_difficulty) 2105 $self->difficulty ($self->estimate_difficulty)
1808 unless $self->difficulty; 2106 unless $self->difficulty;
1809 Coro::cede; 2107 cf::cede_to_tick;
1810 2108
1811 unless ($self->{deny_activate}) { 2109 unless ($self->{deny_activate}) {
1812 $self->decay_objects; 2110 $self->decay_objects;
1813 $self->fix_auto_apply; 2111 $self->fix_auto_apply;
1814 $self->update_buttons; 2112 $self->update_buttons;
1815 Coro::cede; 2113 cf::cede_to_tick;
1816 $self->set_darkness_map; 2114 $self->set_darkness_map;
1817 Coro::cede; 2115 cf::cede_to_tick;
1818 $self->activate; 2116 $self->activate;
1819 } 2117 }
1820 2118
2119 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME);
2121
1821 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1822 } 2123 }
1823 2124
1824 $self->post_load; 2125 $self->post_load;
1825} 2126}
1826 2127
1835 2136
1836 $self 2137 $self
1837} 2138}
1838 2139
1839# 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
1840sub load_diag { 2141sub load_neighbours {
1841 my ($map) = @_; 2142 my ($map) = @_;
1842 2143
1843 my @diag; # diagonal neighbours 2144 my @neigh; # diagonal neighbours
1844 2145
1845 for (0 .. 3) { 2146 for (0 .. 3) {
1846 my $neigh = $map->tile_path ($_) 2147 my $neigh = $map->tile_path ($_)
1847 or next; 2148 or next;
1848 $neigh = find $neigh, $map 2149 $neigh = find $neigh, $map
1849 or next; 2150 or next;
1850 $neigh->load; 2151 $neigh->load;
1851 2152
2153 push @neigh,
1852 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2154 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1853 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2155 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1854 } 2156 }
1855 2157
1856 for (@diag) { 2158 for (grep defined $_->[0], @neigh) {
2159 my ($path, $origin) = @$_;
1857 my $neigh = find @$_ 2160 my $neigh = find $path, $origin
1858 or next; 2161 or next;
1859 $neigh->load; 2162 $neigh->load;
1860 } 2163 }
1861} 2164}
1862 2165
1867} 2170}
1868 2171
1869sub do_load_sync { 2172sub do_load_sync {
1870 my ($map) = @_; 2173 my ($map) = @_;
1871 2174
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main;
2177
1872 cf::sync_job { $map->load }; 2178 cf::sync_job { $map->load };
1873} 2179}
1874 2180
1875our %MAP_PREFETCH; 2181our %MAP_PREFETCH;
1876our $MAP_PREFETCHER = undef; 2182our $MAP_PREFETCHER = undef;
1877 2183
1878sub find_async { 2184sub find_async {
1879 my ($path, $origin) = @_; 2185 my ($path, $origin, $load) = @_;
1880 2186
1881 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
1882 2188
1883 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
1884 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1885 } 2191 }
1886 2192
1887 undef $MAP_PREFETCH{$path}; 2193 $MAP_PREFETCH{$path} |= $load;
2194
1888 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
2196 $Coro::current->{desc} = "map prefetcher";
2197
1889 while (%MAP_PREFETCH) { 2198 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 2199 while (my ($k, $v) = each %MAP_PREFETCH) {
1891 my $map = find $path 2200 if (my $map = find $k) {
1892 or next;
1893 $map->load; 2201 $map->load if $v;
2202 }
1894 2203
1895 delete $MAP_PREFETCH{$path}; 2204 delete $MAP_PREFETCH{$k};
1896 } 2205 }
1897 } 2206 }
1898 undef $MAP_PREFETCHER; 2207 undef $MAP_PREFETCHER;
1899 }; 2208 };
1900 $MAP_PREFETCHER->prio (6); 2209 $MAP_PREFETCHER->prio (6);
1903} 2212}
1904 2213
1905sub save { 2214sub save {
1906 my ($self) = @_; 2215 my ($self) = @_;
1907 2216
1908 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1909 2218
1910 $self->{last_save} = $cf::RUNTIME; 2219 $self->{last_save} = $cf::RUNTIME;
1911 2220
1912 return unless $self->dirty; 2221 return unless $self->dirty;
1913 2222
1919 return if $self->{deny_save}; 2228 return if $self->{deny_save};
1920 2229
1921 local $self->{last_access} = $self->last_access;#d# 2230 local $self->{last_access} = $self->last_access;#d#
1922 2231
1923 cf::async { 2232 cf::async {
2233 $Coro::current->{desc} = "map player save";
1924 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
1925 }; 2235 };
2236
2237 cf::get_slot 0.02;
1926 2238
1927 if ($uniq) { 2239 if ($uniq) {
1928 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1929 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1930 } else { 2242 } else {
1936 my ($self) = @_; 2248 my ($self) = @_;
1937 2249
1938 # save first because save cedes 2250 # save first because save cedes
1939 $self->save; 2251 $self->save;
1940 2252
1941 my $lock = cf::lock_acquire "map_data:" . $self->path; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
1942 2254
1943 return if $self->players; 2255 return if $self->players;
1944 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
1945 return if $self->{deny_save}; 2257 return if $self->{deny_save};
1946 2258
2259 $self->in_memory (cf::MAP_SWAPPED);
2260
2261 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP;
1947 $self->clear; 2263 $self->clear;
1948 $self->in_memory (cf::MAP_SWAPPED);
1949} 2264}
1950 2265
1951sub reset_at { 2266sub reset_at {
1952 my ($self) = @_; 2267 my ($self) = @_;
1953 2268
1985 if $uniq; 2300 if $uniq;
1986 } 2301 }
1987 2302
1988 delete $cf::MAP{$self->path}; 2303 delete $cf::MAP{$self->path};
1989 2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
1990 $self->clear; 2307 $self->clear;
1991
1992 $_->clear_links_to ($self) for values %cf::MAP;
1993 2308
1994 $self->unlink_save; 2309 $self->unlink_save;
1995 $self->destroy; 2310 $self->destroy;
1996} 2311}
1997 2312
1998my $nuke_counter = "aaaa"; 2313my $nuke_counter = "aaaa";
1999 2314
2000sub nuke { 2315sub nuke {
2001 my ($self) = @_; 2316 my ($self) = @_;
2002 2317
2318 {
2319 my $lock = cf::lock_acquire "map_data:$self->{path}";
2320
2003 delete $cf::MAP{$self->path}; 2321 delete $cf::MAP{$self->path};
2004 2322
2005 $self->unlink_save; 2323 $self->unlink_save;
2006 2324
2007 bless $self, "cf::map"; 2325 bless $self, "cf::map";
2008 delete $self->{deny_reset}; 2326 delete $self->{deny_reset};
2009 $self->{deny_save} = 1; 2327 $self->{deny_save} = 1;
2010 $self->reset_timeout (1); 2328 $self->reset_timeout (1);
2011 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2012 2330
2013 $cf::MAP{$self->path} = $self; 2331 $cf::MAP{$self->path} = $self;
2332 }
2014 2333
2015 $self->reset; # polite request, might not happen 2334 $self->reset; # polite request, might not happen
2016} 2335}
2017 2336
2018=item $maps = cf::map::tmp_maps 2337=item $maps = cf::map::tmp_maps
2060 2379
2061sub unique_maps() { 2380sub unique_maps() {
2062 [ 2381 [
2063 map { 2382 map {
2064 utf8::decode $_; 2383 utf8::decode $_;
2065 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2066 ? normalise $_ 2387 : normalise $_
2067 : ()
2068 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2069 ] 2389 ]
2070} 2390}
2071 2391
2072package cf;
2073
2074=back 2392=back
2075 2393
2076=head3 cf::object 2394=head3 cf::object
2077 2395
2078=cut 2396=cut
2081 2399
2082=over 4 2400=over 4
2083 2401
2084=item $ob->inv_recursive 2402=item $ob->inv_recursive
2085 2403
2086Returns 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.
2087 2406
2088=cut 2407=cut
2089 2408
2090sub inv_recursive_; 2409sub inv_recursive_;
2091sub inv_recursive_ { 2410sub inv_recursive_ {
2092 map { $_, inv_recursive_ $_->inv } @_ 2411 map { $_, inv_recursive_ $_->inv } @_
2093} 2412}
2094 2413
2095sub inv_recursive { 2414sub inv_recursive {
2096 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 }
2097} 2444}
2098 2445
2099package cf; 2446package cf;
2100 2447
2101=back 2448=back
2125 2472
2126 } else { 2473 } else {
2127 my $pl = $self->contr; 2474 my $pl = $self->contr;
2128 2475
2129 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2476 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130 my $diag = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2131 $diag->{pl}->ext_reply ( 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132 $diag->{id},
2133 msgtype => "reply",
2134 msg => $diag->{pl}->expand_cfpod ($msg),
2135 add_topics => []
2136 );
2137 2479
2138 } else { 2480 } else {
2139 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2140 $self->message ($msg, $flags); 2482 $self->message ($msg, $flags);
2141 } 2483 }
2142 } 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 (@_);
2143} 2495}
2144 2496
2145=item $player_object->may ("access") 2497=item $player_object->may ("access")
2146 2498
2147Returns wether the given player is authorized to access resource "access" 2499Returns wether the given player is authorized to access resource "access"
2226 # use -1 or undef as default coordinates, not 0, 0 2578 # use -1 or undef as default coordinates, not 0, 0
2227 ($x, $y) = ($map->enter_x, $map->enter_y) 2579 ($x, $y) = ($map->enter_x, $map->enter_y)
2228 if $x <=0 && $y <= 0; 2580 if $x <=0 && $y <= 0;
2229 2581
2230 $map->load; 2582 $map->load;
2231 $map->load_diag; 2583 $map->load_neighbours;
2232 2584
2233 return unless $self->contr->active; 2585 return unless $self->contr->active;
2234 $self->activate_recursive; 2586 $self->activate_recursive;
2235 2587
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2589 $self->enter_map ($map, $x, $y);
2238} 2590}
2239 2591
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2593
2242Moves 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
2243her, loading and preparing them map, calling the provided $check callback 2595her, loading and preparing them map, calling the provided $check callback
2244that 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
2245the 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.
2246 2599
2247=cut 2600=cut
2248 2601
2249our $GOTOGEN; 2602our $GOTOGEN;
2250 2603
2251sub cf::object::player::goto { 2604sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2605 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2606
2254 # 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
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2609
2257 $self->enter_link; 2610 $self->enter_link;
2258 2611
2259 (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
2260 my $map = eval { 2634 my $map = eval {
2261 my $map = cf::map::find $path; 2635 my $map = defined $path ? cf::map::find $path : undef;
2262 2636
2263 if ($map) { 2637 if ($map) {
2264 $map = $map->customise_for ($self); 2638 $map = $map->customise_for ($self);
2265 $map = $check->($map) if $check && $map; 2639 $map = $check->($map) if $check && $map;
2266 } else { 2640 } else {
2267 $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);
2268 } 2642 }
2269 2643
2270 $map 2644 $map
2271 }; 2645 };
2272 2646
2277 2651
2278 if ($gen == $self->{_goto_generation}) { 2652 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2653 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2654 $self->leave_link ($map, $x, $y);
2281 } 2655 }
2656
2657 $done->() if $done;
2282 })->prio (1); 2658 })->prio (1);
2283} 2659}
2284 2660
2285=item $player_object->enter_exit ($exit_object) 2661=item $player_object->enter_exit ($exit_object)
2286 2662
2323 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2324 } 2700 }
2325 2701
2326 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2327 2703
2328 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canolicalize->encode ($rmp);
2329 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2330 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2331 2707
2332 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2333 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
2355 my $hp = $exit->stats->hp; 2731 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp; 2732 my $sp = $exit->stats->sp;
2357 2733
2358 $self->enter_link; 2734 $self->enter_link;
2359 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
2360 (async { 2740 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2742
2361 $self->deactivate_recursive; # just to be sure 2743 $self->deactivate_recursive; # just to be sure
2362 unless (eval { 2744 unless (eval {
2363 $self->goto ($slaying, $hp, $sp); 2745 $self->goto ($slaying, $hp, $sp);
2364 2746
2365 1; 2747 1;
2391 2773
2392 utf8::encode $text; 2774 utf8::encode $text;
2393 $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);
2394} 2776}
2395 2777
2396=item $client->send_msg ($color, $type, $msg, [extra...]) 2778=item $client->send_msg ($channel, $msg, $color, [extra...])
2397 2779
2398Send 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
2399client 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
2400the 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
2401the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2402 2784
2403=cut 2785=cut
2404 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
2405sub cf::client::send_msg { 2839sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2407 2841
2408 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg);
2409 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
2410 if ($self->can_msg) { 2868 if ($self->can_msg) {
2869 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF;
2872
2411 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2873 $self->send_packet ("msg " . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2412 } else { 2875 } else {
2413 # replace some tags by gcfclient-compatible ones
2414 for ($msg) {
2415 1 while
2416 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421 }
2422
2423 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
2424 if (0 && $msg =~ /\[/) { 2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2425 $self->send_packet ("drawextinfo $color 4 0 $msg") 2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2426 } else { 2894 } else {
2427 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2428 $self->send_packet ("drawinfo $color $msg") 2896 $self->send_packet ("drawinfo $color $msg")
2429 } 2897 }
2430 } 2898 }
2431 } 2899 }
2432} 2900}
2433 2901
2434=item $client->ext_event ($type, %msg) 2902=item $client->ext_msg ($type, @msg)
2435 2903
2436Sends an ext event to the client. 2904Sends an ext event to the client.
2437 2905
2438=cut 2906=cut
2439 2907
2440sub cf::client::ext_event($$%) { 2908sub cf::client::ext_msg($$@) {
2441 my ($self, $type, %msg) = @_; 2909 my ($self, $type, @msg) = @_;
2442 2910
2911 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove
2443 $msg{msgtype} = "event_$type"; 2914 push @msg, msgtype => "event_$type";
2444 $self->send_packet ("ext " . $self->{json_coder}->encode (\%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 }
2445} 2935}
2446 2936
2447=item $success = $client->query ($flags, "text", \&cb) 2937=item $success = $client->query ($flags, "text", \&cb)
2448 2938
2449Queues a query to the client, calling the given callback with 2939Queues a query to the client, calling the given callback with
2504 my ($ns, $buf) = @_; 2994 my ($ns, $buf) = @_;
2505 2995
2506 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2996 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507 2997
2508 if (ref $msg) { 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
2509 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3006 if (my $cb = $EXTICMD{$type}) {
2510 if (my %reply = $cb->($ns, $msg)) { 3007 @reply = $cb->($ns, @payload);
2511 $reply{msgid} = $msg->{msgid};
2512 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513 }
2514 } 3008 }
3009
3010 $ns->ext_reply ($reply, @reply)
3011 if $reply;
3012
2515 } else { 3013 } else {
2516 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2517 } 3015 }
2518 3016
2519 cf::override; 3017 cf::override;
2566our $safe = new Safe "safe"; 3064our $safe = new Safe "safe";
2567our $safe_hole = new Safe::Hole; 3065our $safe_hole = new Safe::Hole;
2568 3066
2569$SIG{FPE} = 'IGNORE'; 3067$SIG{FPE} = 'IGNORE';
2570 3068
2571$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));
2572 3074
2573# here we export the classes and methods available to script code 3075# here we export the classes and methods available to script code
2574 3076
2575=pod 3077=pod
2576 3078
2577The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
2578 3080
2579 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
2580 cf::object::player player 3085 cf::object::player
2581 cf::player peaceful 3086 player
2582 cf::map trigger 3087
3088 cf::player
3089 peaceful
3090
3091 cf::map
3092 trigger
2583 3093
2584=cut 3094=cut
2585 3095
2586for ( 3096for (
2587 ["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)],
2588 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2591) { 3103) {
2592 no strict 'refs'; 3104 no strict 'refs';
2668# the server's init and main functions 3180# the server's init and main functions
2669 3181
2670sub load_facedata($) { 3182sub load_facedata($) {
2671 my ($path) = @_; 3183 my ($path) = @_;
2672 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
2673 warn "loading facedata from $path\n"; 3191 warn "loading facedata from $path\n";
2674 3192
2675 my $facedata; 3193 my $facedata;
2676 0 < aio_load $path, $facedata 3194 0 < aio_load $path, $facedata
2677 or die "$path: $!"; 3195 or die "$path: $!";
2679 $facedata = Coro::Storable::thaw $facedata; 3197 $facedata = Coro::Storable::thaw $facedata;
2680 3198
2681 $facedata->{version} == 2 3199 $facedata->{version} == 2
2682 or cf::cleanup "$path: version mismatch, cannot proceed."; 3200 or cf::cleanup "$path: version mismatch, cannot proceed.";
2683 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
2684 { 3209 {
2685 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
2686 3211
2687 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3215 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692 Coro::cede; 3219
3220 cf::cede_to_tick;
2693 } 3221 }
2694 3222
2695 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
2697 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
2698 or next; 3227 or next;
3228
2699 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 3232 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 3234 }
2704 Coro::cede; 3235
3236 cf::cede_to_tick;
2705 } 3237 }
2706 } 3238 }
2707 3239
2708 { 3240 {
2709 my $anims = $facedata->{animinfo}; 3241 my $anims = $facedata->{animinfo};
2710 3242
2711 while (my ($anim, $info) = each %$anims) { 3243 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3244 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 3245 cf::cede_to_tick;
2714 } 3246 }
2715 3247
2716 cf::anim::invalidate_all; # d'oh 3248 cf::anim::invalidate_all; # d'oh
2717 } 3249 }
2718 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
2719 1 3286 1
2720} 3287}
2721 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
2722sub reload_regions { 3317sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = ();
3321
2723 load_resource_file "$MAPDIR/regions" 3322 load_resource_file "$MAPDIR/regions"
2724 or die "unable to load regions file\n"; 3323 or die "unable to load regions file\n";
3324
3325 for (cf::region::list) {
3326 $_->{match} = qr/$_->{match}/
3327 if exists $_->{match};
3328 }
2725} 3329}
2726 3330
2727sub reload_facedata { 3331sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 3332 load_facedata "$DATADIR/facedata"
2729 or die "unable to load facedata\n"; 3333 or die "unable to load facedata\n";
2758 3362
2759sub init { 3363sub init {
2760 reload_resources; 3364 reload_resources;
2761} 3365}
2762 3366
2763sub cfg_load { 3367sub reload_config {
2764 open my $fh, "<:utf8", "$CONFDIR/config" 3368 open my $fh, "<:utf8", "$CONFDIR/config"
2765 or return; 3369 or return;
2766 3370
2767 local $/; 3371 local $/;
2768 *CFG = YAML::Syck::Load <$fh>; 3372 *CFG = YAML::Load <$fh>;
2769 3373
2770 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2771 3375
2772 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2773 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2784sub main { 3388sub main {
2785 # we must not ever block the main coroutine 3389 # we must not ever block the main coroutine
2786 local $Coro::idle = sub { 3390 local $Coro::idle = sub {
2787 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2788 (async { 3392 (async {
2789 Event::one_event; 3393 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT;
2790 })->prio (Coro::PRIO_MAX); 3395 })->prio (Coro::PRIO_MAX);
2791 }; 3396 };
2792 3397
2793 cfg_load; 3398 reload_config;
2794 db_init; 3399 db_init;
2795 load_extensions; 3400 load_extensions;
2796 3401
2797 $TICK_WATCHER->start; 3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno;
2798 Event::loop; 3404 EV::loop;
2799} 3405}
2800 3406
2801############################################################################# 3407#############################################################################
2802# initialisation and cleanup 3408# initialisation and cleanup
2803 3409
2804# install some emergency cleanup handlers 3410# install some emergency cleanup handlers
2805BEGIN { 3411BEGIN {
3412 our %SIGWATCHER = ();
2806 for my $signal (qw(INT HUP TERM)) { 3413 for my $signal (qw(INT HUP TERM)) {
2807 Event->signal ( 3414 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2808 reentrant => 0,
2809 data => WF_AUTOCANCEL,
2810 signal => $signal,
2811 prio => 0,
2812 cb => sub {
2813 cf::cleanup "SIG$signal"; 3415 cf::cleanup "SIG$signal";
2814 },
2815 ); 3416 };
2816 } 3417 }
2817} 3418}
2818 3419
2819sub write_runtime { 3420sub write_runtime_sync {
2820 my $runtime = "$LOCALDIR/runtime"; 3421 my $runtime = "$LOCALDIR/runtime";
2821 3422
2822 # first touch the runtime file to show we are still running: 3423 # first touch the runtime file to show we are still running:
2823 # the fsync below can take a very very long time. 3424 # the fsync below can take a very very long time.
2824 3425
2850 and return; 3451 and return;
2851 3452
2852 warn "runtime file written.\n"; 3453 warn "runtime file written.\n";
2853 3454
2854 1 3455 1
3456}
3457
3458our $uuid_lock;
3459our $uuid_skip;
3460
3461sub write_uuid_sync($) {
3462 $uuid_skip ||= $_[0];
3463
3464 return if $uuid_lock;
3465 local $uuid_lock = 1;
3466
3467 my $uuid = "$LOCALDIR/uuid";
3468
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return;
3471
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3473 $uuid_skip = 0;
3474
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return;
3477
3478 # always fsync - this file is important
3479 aio_fsync $fh
3480 and return;
3481
3482 close $fh
3483 or return;
3484
3485 aio_rename "$uuid~", $uuid
3486 and return;
3487
3488 warn "uuid file written ($value).\n";
3489
3490 1
3491
3492}
3493
3494sub write_uuid($$) {
3495 my ($skip, $sync) = @_;
3496
3497 $sync ? write_uuid_sync $skip
3498 : async { write_uuid_sync $skip };
2855} 3499}
2856 3500
2857sub emergency_save() { 3501sub emergency_save() {
2858 my $freeze_guard = cf::freeze_mainloop; 3502 my $freeze_guard = cf::freeze_mainloop;
2859 3503
2865 # and maps saved/destroyed asynchronously. 3509 # and maps saved/destroyed asynchronously.
2866 warn "begin emergency player save\n"; 3510 warn "begin emergency player save\n";
2867 for my $login (keys %cf::PLAYER) { 3511 for my $login (keys %cf::PLAYER) {
2868 my $pl = $cf::PLAYER{$login} or next; 3512 my $pl = $cf::PLAYER{$login} or next;
2869 $pl->valid or next; 3513 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2870 $pl->save; 3515 $pl->save;
2871 } 3516 }
2872 warn "end emergency player save\n"; 3517 warn "end emergency player save\n";
2873 3518
2874 warn "begin emergency map save\n"; 3519 warn "begin emergency map save\n";
2880 warn "end emergency map save\n"; 3525 warn "end emergency map save\n";
2881 3526
2882 warn "begin emergency database checkpoint\n"; 3527 warn "begin emergency database checkpoint\n";
2883 BDB::db_env_txn_checkpoint $DB_ENV; 3528 BDB::db_env_txn_checkpoint $DB_ENV;
2884 warn "end emergency database checkpoint\n"; 3529 warn "end emergency database checkpoint\n";
3530
3531 warn "begin write uuid\n";
3532 write_uuid_sync 1;
3533 warn "end write uuid\n";
2885 }; 3534 };
2886 3535
2887 warn "leave emergency perl save\n"; 3536 warn "leave emergency perl save\n";
2888} 3537}
2889 3538
2904 warn "reloading..."; 3553 warn "reloading...";
2905 3554
2906 warn "entering sync_job"; 3555 warn "entering sync_job";
2907 3556
2908 cf::sync_job { 3557 cf::sync_job {
2909 cf::write_runtime; # external watchdog should not bark 3558 cf::write_runtime_sync; # external watchdog should not bark
2910 cf::emergency_save; 3559 cf::emergency_save;
2911 cf::write_runtime; # external watchdog should not bark 3560 cf::write_runtime_sync; # external watchdog should not bark
2912 3561
2913 warn "syncing database to disk"; 3562 warn "syncing database to disk";
2914 BDB::db_env_txn_checkpoint $DB_ENV; 3563 BDB::db_env_txn_checkpoint $DB_ENV;
2915 3564
2916 # if anything goes wrong in here, we should simply crash as we already saved 3565 # if anything goes wrong in here, we should simply crash as we already saved
2917
2918 warn "cancelling all WF_AUTOCANCEL watchers";
2919 for (Event::all_watchers) {
2920 $_->cancel if $_->data & WF_AUTOCANCEL;
2921 }
2922 3566
2923 warn "flushing outstanding aio requests"; 3567 warn "flushing outstanding aio requests";
2924 for (;;) { 3568 for (;;) {
2925 BDB::flush; 3569 BDB::flush;
2926 IO::AIO::flush; 3570 IO::AIO::flush;
2927 Coro::cede; 3571 Coro::cede_notself;
2928 last unless IO::AIO::nreqs || BDB::nreqs; 3572 last unless IO::AIO::nreqs || BDB::nreqs;
2929 warn "iterate..."; 3573 warn "iterate...";
2930 } 3574 }
2931 3575
2932 ++$RELOAD; 3576 ++$RELOAD;
2991 warn "reloading cf.pm"; 3635 warn "reloading cf.pm";
2992 require cf; 3636 require cf;
2993 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994 3638
2995 warn "loading config and database again"; 3639 warn "loading config and database again";
2996 cf::cfg_load; 3640 cf::reload_config;
2997 3641
2998 warn "loading extensions"; 3642 warn "loading extensions";
2999 cf::load_extensions; 3643 cf::load_extensions;
3000 3644
3001 warn "reattaching attachments to objects/players"; 3645 warn "reattaching attachments to objects/players";
3008 warn "leaving sync_job"; 3652 warn "leaving sync_job";
3009 3653
3010 1 3654 1
3011 } or do { 3655 } or do {
3012 warn $@; 3656 warn $@;
3013 warn "error while reloading, exiting."; 3657 cf::cleanup "error while reloading, exiting.";
3014 exit 1;
3015 }; 3658 };
3016 3659
3017 warn "reloaded"; 3660 warn "reloaded";
3018}; 3661};
3019 3662
3021 3664
3022sub reload_perl() { 3665sub reload_perl() {
3023 # doing reload synchronously and two reloads happen back-to-back, 3666 # doing reload synchronously and two reloads happen back-to-back,
3024 # coro crashes during coro_state_free->destroy here. 3667 # coro crashes during coro_state_free->destroy here.
3025 3668
3026 $RELOAD_WATCHER ||= Event->timer ( 3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3027 reentrant => 0,
3028 after => 0,
3029 data => WF_AUTOCANCEL,
3030 cb => sub {
3031 do_reload_perl; 3670 do_reload_perl;
3032 undef $RELOAD_WATCHER; 3671 undef $RELOAD_WATCHER;
3033 },
3034 ); 3672 };
3035} 3673}
3036 3674
3037register_command "reload" => sub { 3675register_command "reload" => sub {
3038 my ($who, $arg) = @_; 3676 my ($who, $arg) = @_;
3039 3677
3040 if ($who->flag (FLAG_WIZ)) { 3678 if ($who->flag (FLAG_WIZ)) {
3041 $who->message ("reloading server."); 3679 $who->message ("reloading server.");
3680 async {
3681 $Coro::current->{desc} = "perl_reload";
3042 async { reload_perl }; 3682 reload_perl;
3683 };
3043 } 3684 }
3044}; 3685};
3045 3686
3046unshift @INC, $LIBDIR; 3687unshift @INC, $LIBDIR;
3047 3688
3049 3690
3050our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3051our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3052 3693
3053sub wait_for_tick { 3694sub wait_for_tick {
3054 return unless $TICK_WATCHER->is_active; 3695 return if tick_inhibit;
3055 return if $Coro::current == $Coro::main; 3696 return if $Coro::current == $Coro::main;
3056 3697
3057 my $signal = new Coro::Signal; 3698 my $signal = new Coro::Signal;
3058 push @WAIT_FOR_TICK, $signal; 3699 push @WAIT_FOR_TICK, $signal;
3059 $signal->wait; 3700 $signal->wait;
3060} 3701}
3061 3702
3062sub wait_for_tick_begin { 3703sub wait_for_tick_begin {
3063 return unless $TICK_WATCHER->is_active; 3704 return if tick_inhibit;
3064 return if $Coro::current == $Coro::main; 3705 return if $Coro::current == $Coro::main;
3065 3706
3066 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3067 push @WAIT_FOR_TICK_BEGIN, $signal; 3708 push @WAIT_FOR_TICK_BEGIN, $signal;
3068 $signal->wait; 3709 $signal->wait;
3069} 3710}
3070 3711
3071 my $min = 1e6;#d# 3712sub tick {
3072 my $avg = 10;
3073$TICK_WATCHER = Event->timer (
3074 reentrant => 0,
3075 parked => 1,
3076 prio => 0,
3077 at => $NEXT_TICK || $TICK,
3078 data => WF_AUTOCANCEL,
3079 cb => sub {
3080 if ($Coro::current != $Coro::main) { 3713 if ($Coro::current != $Coro::main) {
3081 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3714 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3082 unless ++$bug_warning > 10; 3715 unless ++$bug_warning > 10;
3083 return; 3716 return;
3084 } 3717 }
3085 3718
3086 $NOW = $tick_start = Event::time;
3087
3088 cf::server_tick; # one server iteration 3719 cf::server_tick; # one server iteration
3089 3720
3090 0 && sync_job {#d# 3721 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3091 for(1..10) { 3722 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3092 my $t = Event::time; 3723 Coro::async_pool {
3093 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3724 $Coro::current->{desc} = "runtime saver";
3094 or die; 3725 write_runtime_sync
3095 3726 or warn "ERROR: unable to write runtime file: $!";
3096 $map->width (50);
3097 $map->height (50);
3098 $map->alloc;
3099 $map->_load_objects ("/tmp/x.map", 1);
3100 my $t = Event::time - $t;
3101
3102 #next unless $t < 0.0013;#d#
3103 if ($t < $min) {
3104 $min = $t;
3105 }
3106 $avg = $avg * 0.99 + $t * 0.01;
3107 }
3108 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3109 exit 0;
3110 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3111 }; 3727 };
3728 }
3112 3729
3113 $RUNTIME += $TICK;
3114 $NEXT_TICK += $TICK;
3115
3116 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3117 $NEXT_RUNTIME_WRITE = $NOW + 10;
3118 Coro::async_pool {
3119 write_runtime
3120 or warn "ERROR: unable to write runtime file: $!";
3121 };
3122 }
3123
3124# my $AFTER = Event::time;
3125# warn $AFTER - $NOW;#d#
3126
3127 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3730 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3128 $sig->send; 3731 $sig->send;
3129 } 3732 }
3130 while (my $sig = shift @WAIT_FOR_TICK) { 3733 while (my $sig = shift @WAIT_FOR_TICK) {
3131 $sig->send; 3734 $sig->send;
3132 } 3735 }
3133 3736
3134 $NOW = Event::time; 3737 $LOAD = ($NOW - $TICK_START) / $TICK;
3135
3136 # if we are delayed by four ticks or more, skip them all
3137 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3138
3139 $TICK_WATCHER->at ($NEXT_TICK);
3140 $TICK_WATCHER->start;
3141
3142 $LOAD = ($NOW - $tick_start) / $TICK;
3143 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3738 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3144 3739
3145 _post_tick; 3740 if (0) {
3146 3741 if ($NEXT_TICK) {
3147 3742 my $jitter = $TICK_START - $NEXT_TICK;
3743 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3744 warn "jitter $JITTER\n";#d#
3745 }
3148 }, 3746 }
3149); 3747}
3150 3748
3151{ 3749{
3152 BDB::max_poll_time $TICK * 0.1; 3750 # configure BDB
3153 $BDB_POLL_WATCHER = Event->io ( 3751
3154 reentrant => 0,
3155 fd => BDB::poll_fileno,
3156 poll => 'r',
3157 prio => 0,
3158 data => WF_AUTOCANCEL,
3159 cb => \&BDB::poll_cb,
3160 );
3161 BDB::min_parallel 8; 3752 BDB::min_parallel 8;
3162 3753 BDB::max_poll_reqs $TICK * 0.1;
3163 BDB::set_sync_prepare { 3754 $Coro::BDB::WATCHER->priority (1);
3164 my $status;
3165 my $current = $Coro::current;
3166 (
3167 sub {
3168 $status = $!;
3169 $current->ready; undef $current;
3170 },
3171 sub {
3172 Coro::schedule while defined $current;
3173 $! = $status;
3174 },
3175 )
3176 };
3177 3755
3178 unless ($DB_ENV) { 3756 unless ($DB_ENV) {
3179 $DB_ENV = BDB::db_env_create; 3757 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3759 | BDB::LOG_AUTOREMOVE, 1);
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3180 3762
3181 cf::sync_job { 3763 cf::sync_job {
3182 eval { 3764 eval {
3183 BDB::db_env_open 3765 BDB::db_env_open
3184 $DB_ENV, 3766 $DB_ENV,
3186 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3768 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3187 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3769 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3188 0666; 3770 0666;
3189 3771
3190 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3772 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3191
3192 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3193 $DB_ENV->set_lk_detect;
3194 }; 3773 };
3195 3774
3196 cf::cleanup "db_env_open(db): $@" if $@; 3775 cf::cleanup "db_env_open(db): $@" if $@;
3197 }; 3776 };
3198 } 3777 }
3778
3779 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3780 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3781 };
3782 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3783 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3784 };
3785 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3786 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3787 };
3199} 3788}
3200 3789
3201{ 3790{
3791 # configure IO::AIO
3792
3202 IO::AIO::min_parallel 8; 3793 IO::AIO::min_parallel 8;
3203
3204 undef $Coro::AIO::WATCHER;
3205 IO::AIO::max_poll_time $TICK * 0.1; 3794 IO::AIO::max_poll_time $TICK * 0.1;
3206 $AIO_POLL_WATCHER = Event->io ( 3795 $Coro::AIO::WATCHER->priority (1);
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 fd => IO::AIO::poll_fileno,
3210 poll => 'r',
3211 prio => 6,
3212 cb => \&IO::AIO::poll_cb,
3213 );
3214} 3796}
3215 3797
3216my $_log_backtrace; 3798my $_log_backtrace;
3217 3799
3218sub _log_backtrace { 3800sub _log_backtrace {
3222 3804
3223 # limit the # of concurrent backtraces 3805 # limit the # of concurrent backtraces
3224 if ($_log_backtrace < 2) { 3806 if ($_log_backtrace < 2) {
3225 ++$_log_backtrace; 3807 ++$_log_backtrace;
3226 async { 3808 async {
3809 $Coro::current->{desc} = "abt $msg";
3810
3227 my @bt = fork_call { 3811 my @bt = fork_call {
3228 @addr = map { sprintf "%x", $_ } @addr; 3812 @addr = map { sprintf "%x", $_ } @addr;
3229 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3813 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3230 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3814 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3231 or die "addr2line: $!"; 3815 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines