ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.427 by root, Sat Apr 26 12:25:45 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines