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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.429 by root, Sat May 3 15:17:13 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
34use Digest::MD5 (); 57use Digest::MD5 ();
35 58
36# configure various modules to our taste 59# configure various modules to our taste
37# 60#
38$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
39Coro::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
40Compress::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
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 64
47$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
48 66
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 68
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
74 93
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 97our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
82 99
83our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 104our $DB_ENV;
85 105
86our %CFG; 106our %CFG;
87 107
88our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 109our $RUNTIME;
110our $NOW;
90 111
91our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
94 115
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 118
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
101 123
102binmode STDOUT; 124binmode STDOUT;
103binmode STDERR; 125binmode STDERR;
104 126
105# read virtual server time, if available 127# read virtual server time, if available
158 180
159The raw value load value from the last tick. 181The raw value load value from the last tick.
160 182
161=item %cf::CFG 183=item %cf::CFG
162 184
163Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 186from wherever your confdir points to.
165 187
166=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
167 189
168These 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
186 $msg .= "\n" 208 $msg .= "\n"
187 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
188 210
189 $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;
190 212
191 utf8::encode $msg;
192 LOG llevError, $msg; 213 LOG llevError, $msg;
193 }; 214 };
194} 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#?
195 231
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
212)) { 248)) {
213 no strict 'refs'; 249 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 251}
216 252
217$Event::DIED = sub { 253$EV::DIED = sub {
218 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
219}; 255};
220 256
221############################################################################# 257#############################################################################
222 258
245 $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;
246 $d 282 $d
247 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
248} 284}
249 285
250=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
251 287
252Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
253 289
254=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
255 291
256Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
257 293
258=cut 294=cut
259 295
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 297
262sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
264 300
265=item cf::lock_wait $string 301=item cf::lock_wait $string
266 302
267Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
268 304
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
274returned. 310returned.
275 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
276Lock 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
277uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
278 317
279=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
280 319
281Return 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.
282 321
283=cut 322=cut
284 323
285our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
286 326
287sub lock_wait($) { 327sub lock_wait($) {
288 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#
289 334
290 # wait for lock, if any 335 # wait for lock, if any
291 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 338 Coro::schedule;
299 344
300 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
301 lock_wait $key; 346 lock_wait $key;
302 347
303 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
304 350
305 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
308 } 355 }
309} 356}
310 357
313 360
314 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
315} 362}
316 363
317sub freeze_mainloop { 364sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
319 366
320 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
321 $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 }
322 }; 428 }
323 $TICK_WATCHER->stop; 429};
324 $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;
325} 443}
326 444
327=item cf::async { BLOCK } 445=item cf::async { BLOCK }
328 446
329Currently the same as Coro::async_pool, meaning you cannot use 447Currently the same as Coro::async_pool, meaning you cannot use
334 452
335BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
336 454
337=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
338 456
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
341partly 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
342acceptable. 460acceptable.
343 461
344If 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
345the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
350 468
351sub sync_job(&) { 469sub sync_job(&) {
352 my ($job) = @_; 470 my ($job) = @_;
353 471
354 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 473 my $time = EV::time;
356 474
357 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
359 477
360 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
361 # (but this is cancel-safe) 479
362 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
363 481
364 my $busy = 1; 482 my $busy = 1;
365 my @res; 483 my @res;
366 484
367 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 487 @res = eval { $job->() };
369 warn $@ if $@; 488 warn $@ if $@;
370 undef $busy; 489 undef $busy;
371 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
372 491
373 while ($busy) { 492 while ($busy) {
374 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
375 } 497 }
498 }
376 499
377 $time = Event::time - $time; 500 my $time = EV::time - $time;
378 501
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
383 503
384 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
385 } else { 505 } else {
386 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
387 507
412=item fork_call { }, $args 532=item fork_call { }, $args
413 533
414Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
418 538
419=cut 539=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 540
430sub fork_call(&@) { 541sub fork_call(&@) {
431 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
432 543
433# 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,
434# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 547
438 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 549 reset_signals;
452 local $SIG{__WARN__}; 550 &$cb
453 local $SIG{__DIE__}; 551 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 552
460 eval { 553 wantarray ? @res : $res[-1]
461 close $fh1; 554}
462 555
463 my @res = eval { $cb->(@args) }; 556=item $coin = coin_from_name $name
464 557
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 558=cut
466 close $fh2;
467 };
468 559
469 warn $@ if $@; 560our %coin_alias = (
470 _exit 0; 561 "silver" => "silvercoin",
471 } 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
472} 581}
473 582
474=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
475 584
476Returns a single value from the environment database. 585Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
479 588
480Stores 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
481data 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).
482 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
483=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}
484 615
485our $DB; 616our $DB;
486 617
487sub db_init { 618sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 619 cf::sync_job {
492 eval { 620 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 621 };
502} 622}
503 623
504sub db_get($$) { 624sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
506 626
556 if (1) { 676 if (1) {
557 $md5 = 677 $md5 =
558 join "\x00", 678 join "\x00",
559 $processversion, 679 $processversion,
560 map { 680 map {
561 Coro::cede; 681 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 683 } 0.. $#$src;
564 684
565 685
566 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
610attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
612 732
613In 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>
614C<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
615Crossfire TRT). 735Deliantra).
616 736
617=over 4 737=over 4
618 738
619=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
620 740
902 } 1022 }
903 1023
904 0 1024 0
905} 1025}
906 1026
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 1028
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 1030
911Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
912 1032
918 1038
919=cut 1039=cut
920 1040
921############################################################################# 1041#############################################################################
922# object support 1042# object support
923#
924 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#
925sub _can_merge { 1077sub _can_merge {
926 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
927 1079
928 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931 1081
932 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
933} 1084}
934 1085
935sub reattach { 1086sub reattach {
936 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
937 my ($obj) = @_; 1088 my ($obj) = @_;
959cf::attachable->attach ( 1110cf::attachable->attach (
960 prio => -1000000, 1111 prio => -1000000,
961 on_instantiate => sub { 1112 on_instantiate => sub {
962 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
963 1114
964 $data = from_json $data; 1115 $data = decode_json $data;
965 1116
966 for (@$data) { 1117 for (@$data) {
967 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
968 1119
969 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
985sub object_freezer_save { 1136sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
987 1138
988 sync_job { 1139 sync_job {
989 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
990 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
992 1144
993 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
994 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
995 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
997 close $fh; 1149 aio_close $fh;
998 1150
999 if (@$objs) { 1151 if (@$objs) {
1000 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) {
1001 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1002 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1003 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1004 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1005 close $fh; 1157 aio_close $fh;
1006 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1007 } 1159 }
1008 } else { 1160 } else {
1009 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1010 } 1162 }
1015 } 1167 }
1016 } else { 1168 } else {
1017 aio_unlink $filename; 1169 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1019 } 1171 }
1020 } 1172 };
1021} 1173}
1022 1174
1023sub object_freezer_as_string { 1175sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1025 1177
1037 or return; 1189 or return;
1038 1190
1039 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1193 or return;
1194
1042 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1043 } 1197 }
1044 1198
1199 utf8::decode (my $decname = $filename);
1045 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1047 return ($data, $av); 1203 ($data, $av)
1048} 1204}
1049 1205
1050=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1051 1207
1052=over 4 1208=over 4
1125 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1126 1282
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1284
1129 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
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1135 } else { 1300 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1302 }
1138 1303
1139 cf::override; 1304 cf::override;
1192 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1193 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1194 1359
1195 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1196 warn $msg; 1361 warn $msg;
1197 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1198 exit 1;
1199 } 1363 }
1200 1364
1201 warn $msg; 1365 warn $msg;
1202 } 1366 }
1203 1367
1228use Coro::AIO; 1392use Coro::AIO;
1229 1393
1230=head3 cf::player 1394=head3 cf::player
1231 1395
1232=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}
1233 1411
1234=item cf::player::find $login 1412=item cf::player::find $login
1235 1413
1236Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1237 1415
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1455
1278 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1279 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;
1280 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1281 } 1465 }
1282 } 1466 }
1283} 1467}
1284 1468
1293 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1294 1478
1295 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1297 1481
1482 cf::get_slot 0.01;
1483
1298 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1299 Coro::cede; 1485 cf::cede_to_tick;
1300} 1486}
1301 1487
1302sub new($) { 1488sub new($) {
1303 my ($login) = @_; 1489 my ($login) = @_;
1304 1490
1308 $self->{deny_save} = 1; 1494 $self->{deny_save} = 1;
1309 1495
1310 $cf::PLAYER{$login} = $self; 1496 $cf::PLAYER{$login} = $self;
1311 1497
1312 $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 (@_);
1313} 1509}
1314 1510
1315=item $pl->quit_character 1511=item $pl->quit_character
1316 1512
1317Nukes the player without looking back. If logged in, the connection will 1513Nukes the player without looking back. If logged in, the connection will
1372 or return []; 1568 or return [];
1373 1569
1374 my @logins; 1570 my @logins;
1375 1571
1376 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") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1581 }
1380 1582
1381 utf8::decode $login; 1583 utf8::decode $login;
1382 push @logins, $login; 1584 push @logins, $login;
1383 } 1585 }
1384 1586
1417 1619
1418Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1419 1621
1420=cut 1622=cut
1421 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
1422sub expand_cfpod { 1635sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1424 1637
1425 # escape & and < 1638 my $xml;
1426 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g;
1428 1639
1429 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1430 1643
1431 1 while 1644 $group =~ s/&/&amp;/g;
1432 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1436 # replace G<male|female> tags 1649 ([BCGHITU])
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1650 <
1438 $self->gender ? $2 : $1 1651 (?:
1439 }ge 1652 ([^<>]*) (?{ $group = $^N })
1440 # replace H<hint text> 1653 | < $interior >
1441 || s{H<([^\>]*)>} 1654 )
1655 >
1656 %gcsx
1442 { 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") {
1443 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "") 1677 "")
1446 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1447 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1448 1689
1690 for ($xml) {
1449 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1450 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1451 1693
1452 # compress some whitespace 1694 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1457 1700
1458 $_ 1701 $xml
1459} 1702}
1703
1704no re 'eval';
1460 1705
1461sub hintmode { 1706sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1708 $_[0]{hintmode}
1464} 1709}
1465 1710
1466=item $player->ext_reply ($msgid, %msg) 1711=item $player->ext_reply ($msgid, @msg)
1467 1712
1468Sends an ext reply to the player. 1713Sends an ext reply to the player.
1469 1714
1470=cut 1715=cut
1471 1716
1472sub ext_reply($$%) { 1717sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1718 my ($self, $id, @msg) = @_;
1474 1719
1475 $msg{msgid} = $id; 1720 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1721}
1478 1722
1479=item $player->ext_event ($type, %msg) 1723=item $player->ext_msg ($type, @msg)
1480 1724
1481Sends an ext event to the client. 1725Sends an ext event to the client.
1482 1726
1483=cut 1727=cut
1484 1728
1485sub ext_event($$%) { 1729sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1730 my ($self, $type, @msg) = @_;
1487 1731
1488 $self->ns->ext_event ($type, %msg); 1732 $self->ns->ext_msg ($type, @msg);
1489} 1733}
1490 1734
1491=head3 cf::region 1735=head3 cf::region
1492 1736
1493=over 4 1737=over 4
1537our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1538our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1539 1783
1540sub generate_random_map { 1784sub generate_random_map {
1541 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
1542 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1543 $self->_create_random_map ( 1790 $self->_create_random_map (
1544 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1545 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1546 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1668 1915
1669# the temporary/swap location 1916# the temporary/swap location
1670sub save_path { 1917sub save_path {
1671 my ($self) = @_; 1918 my ($self) = @_;
1672 1919
1673 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1674 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1675} 1922}
1676 1923
1677# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1678sub uniq_path { 1925sub uniq_path {
1679 my ($self) = @_; 1926 my ($self) = @_;
1680 1927
1681 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1682 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1683} 1930}
1684 1931
1685# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1686# all maps in C++... 1933# all maps in C++...
1709 1956
1710sub load_header_from($) { 1957sub load_header_from($) {
1711 my ($self, $path) = @_; 1958 my ($self, $path) = @_;
1712 1959
1713 utf8::encode $path; 1960 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1961 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 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;
1719 1969
1720 $self->{load_path} = $path; 1970 $self->{load_path} = $path;
1721 1971
1722 1 1972 1
1723} 1973}
1777sub find { 2027sub find {
1778 my ($path, $origin) = @_; 2028 my ($path, $origin) = @_;
1779 2029
1780 $path = normalise $path, $origin && $origin->path; 2030 $path = normalise $path, $origin && $origin->path;
1781 2031
2032 cf::lock_wait "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 2033 cf::lock_wait "map_find:$path";
1783 2034
1784 $cf::MAP{$path} || do { 2035 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1785 my $guard = cf::lock_acquire "map_find:$path"; 2037 my $guard2 = cf::lock_acquire "map_find:$path";
2038
1786 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
1787 or return; 2040 or return;
1788 2041
1789 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
1790 2043
1792 or return; 2045 or return;
1793 2046
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 2048 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 2049 #$cf::WAIT_FOR_TICK->wait;
2050 undef $guard2;
2051 undef $guard1;
1797 $map->reset; 2052 $map->reset;
1798 undef $guard;
1799 return find $path; 2053 return find $path;
1800 } 2054 }
1801 2055
1802 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1803 } 2057 }
1812 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
1813 2067
1814 my $path = $self->{path}; 2068 my $path = $self->{path};
1815 2069
1816 { 2070 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 2071 my $guard = cf::lock_acquire "map_data:$path";
1818 2072
2073 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 2074 return unless $self->in_memory == cf::MAP_SWAPPED;
1820 2075
1821 $self->in_memory (cf::MAP_LOADING); 2076 $self->in_memory (cf::MAP_LOADING);
1822 2077
1823 $self->alloc; 2078 $self->alloc;
1824 2079
1825 $self->pre_load; 2080 $self->pre_load;
1826 Coro::cede; 2081 cf::cede_to_tick;
1827 2082
2083 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 2085 $self->_load_objects ($f)
1829 or return; 2086 or return;
1830 2087
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original}; 2089 if delete $self->{load_original};
1833 2090
1834 if (my $uniq = $self->uniq_path) { 2091 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 2092 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 2093 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 2095 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 2096 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs;
2098 }
1839 } 2099 }
1840 } 2100 }
1841 2101
1842 Coro::cede; 2102 $f->resolve_delayed_derefs;
2103
2104 cf::cede_to_tick;
1843 # now do the right thing for maps 2105 # now do the right thing for maps
1844 $self->link_multipart_objects; 2106 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 2107 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 2108 unless $self->difficulty;
1847 Coro::cede; 2109 cf::cede_to_tick;
1848 2110
1849 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 2112 $self->decay_objects;
1851 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
1852 $self->update_buttons; 2114 $self->update_buttons;
1853 Coro::cede; 2115 cf::cede_to_tick;
1854 $self->set_darkness_map; 2116 $self->set_darkness_map;
1855 Coro::cede; 2117 cf::cede_to_tick;
1856 $self->activate; 2118 $self->activate;
1857 } 2119 }
1858 2120
2121 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME);
2123
1859 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1860 } 2125 }
1861 2126
1862 $self->post_load; 2127 $self->post_load;
1863} 2128}
1864 2129
1873 2138
1874 $self 2139 $self
1875} 2140}
1876 2141
1877# 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
1878sub load_diag { 2143sub load_neighbours {
1879 my ($map) = @_; 2144 my ($map) = @_;
1880 2145
1881 my @diag; # diagonal neighbours 2146 my @neigh; # diagonal neighbours
1882 2147
1883 for (0 .. 3) { 2148 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 2149 my $neigh = $map->tile_path ($_)
1885 or next; 2150 or next;
1886 $neigh = find $neigh, $map 2151 $neigh = find $neigh, $map
1887 or next; 2152 or next;
1888 $neigh->load; 2153 $neigh->load;
1889 2154
2155 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2156 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2157 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 2158 }
1893 2159
1894 for (@diag) { 2160 for (grep defined $_->[0], @neigh) {
2161 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 2162 my $neigh = find $path, $origin
1896 or next; 2163 or next;
1897 $neigh->load; 2164 $neigh->load;
1898 } 2165 }
1899} 2166}
1900 2167
1905} 2172}
1906 2173
1907sub do_load_sync { 2174sub do_load_sync {
1908 my ($map) = @_; 2175 my ($map) = @_;
1909 2176
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main;
2179
1910 cf::sync_job { $map->load }; 2180 cf::sync_job { $map->load };
1911} 2181}
1912 2182
1913our %MAP_PREFETCH; 2183our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2184our $MAP_PREFETCHER = undef;
1915 2185
1916sub find_async { 2186sub find_async {
1917 my ($path, $origin) = @_; 2187 my ($path, $origin, $load) = @_;
1918 2188
1919 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
1920 2190
1921 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1923 } 2193 }
1924 2194
1925 undef $MAP_PREFETCH{$path}; 2195 $MAP_PREFETCH{$path} |= $load;
2196
1926 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2198 $Coro::current->{desc} = "map prefetcher";
2199
1927 while (%MAP_PREFETCH) { 2200 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2201 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2202 if (my $map = find $k) {
1930 $map->load; 2203 $map->load if $v;
1931 } 2204 }
1932 2205
1933 delete $MAP_PREFETCH{$path}; 2206 delete $MAP_PREFETCH{$k};
1934 } 2207 }
1935 } 2208 }
1936 undef $MAP_PREFETCHER; 2209 undef $MAP_PREFETCHER;
1937 }; 2210 };
1938 $MAP_PREFETCHER->prio (6); 2211 $MAP_PREFETCHER->prio (6);
1941} 2214}
1942 2215
1943sub save { 2216sub save {
1944 my ($self) = @_; 2217 my ($self) = @_;
1945 2218
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2220
1948 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
1949 2222
1950 return unless $self->dirty; 2223 return unless $self->dirty;
1951 2224
1957 return if $self->{deny_save}; 2230 return if $self->{deny_save};
1958 2231
1959 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
1960 2233
1961 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
1962 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
1963 }; 2237 };
2238
2239 cf::get_slot 0.02;
1964 2240
1965 if ($uniq) { 2241 if ($uniq) {
1966 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1967 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1968 } else { 2244 } else {
1974 my ($self) = @_; 2250 my ($self) = @_;
1975 2251
1976 # save first because save cedes 2252 # save first because save cedes
1977 $self->save; 2253 $self->save;
1978 2254
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2256
1981 return if $self->players; 2257 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
1983 return if $self->{deny_save}; 2259 return if $self->{deny_save};
1984 2260
2261 $self->in_memory (cf::MAP_SWAPPED);
2262
2263 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2265 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2266}
1988 2267
1989sub reset_at { 2268sub reset_at {
1990 my ($self) = @_; 2269 my ($self) = @_;
1991 2270
2023 if $uniq; 2302 if $uniq;
2024 } 2303 }
2025 2304
2026 delete $cf::MAP{$self->path}; 2305 delete $cf::MAP{$self->path};
2027 2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2309 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2310
2032 $self->unlink_save; 2311 $self->unlink_save;
2033 $self->destroy; 2312 $self->destroy;
2034} 2313}
2035 2314
2036my $nuke_counter = "aaaa"; 2315my $nuke_counter = "aaaa";
2037 2316
2038sub nuke { 2317sub nuke {
2039 my ($self) = @_; 2318 my ($self) = @_;
2040 2319
2320 {
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2041 delete $cf::MAP{$self->path}; 2323 delete $cf::MAP{$self->path};
2042 2324
2043 $self->unlink_save; 2325 $self->unlink_save;
2044 2326
2045 bless $self, "cf::map"; 2327 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2328 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2329 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2330 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2332
2051 $cf::MAP{$self->path} = $self; 2333 $cf::MAP{$self->path} = $self;
2334 }
2052 2335
2053 $self->reset; # polite request, might not happen 2336 $self->reset; # polite request, might not happen
2054} 2337}
2055 2338
2056=item $maps = cf::map::tmp_maps 2339=item $maps = cf::map::tmp_maps
2098 2381
2099sub unique_maps() { 2382sub unique_maps() {
2100 [ 2383 [
2101 map { 2384 map {
2102 utf8::decode $_; 2385 utf8::decode $_;
2103 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2104 ? normalise $_ 2389 : normalise $_
2105 : ()
2106 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2107 ] 2391 ]
2108} 2392}
2109 2393
2110package cf;
2111
2112=back 2394=back
2113 2395
2114=head3 cf::object 2396=head3 cf::object
2115 2397
2116=cut 2398=cut
2119 2401
2120=over 4 2402=over 4
2121 2403
2122=item $ob->inv_recursive 2404=item $ob->inv_recursive
2123 2405
2124Returns 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.
2125 2408
2126=cut 2409=cut
2127 2410
2128sub inv_recursive_; 2411sub inv_recursive_;
2129sub inv_recursive_ { 2412sub inv_recursive_ {
2132 2415
2133sub inv_recursive { 2416sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2135} 2418}
2136 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 }
2446}
2447
2137package cf; 2448package cf;
2138 2449
2139=back 2450=back
2140 2451
2141=head3 cf::object::player 2452=head3 cf::object::player
2147Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2458Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2148can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2149dialogue with the given NPC character. 2460dialogue with the given NPC character.
2150 2461
2151=cut 2462=cut
2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2152 2477
2153# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2154# with dialog boxes. 2479# with dialog boxes.
2155#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2156sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2163 2488
2164 } else { 2489 } else {
2165 my $pl = $self->contr; 2490 my $pl = $self->contr;
2166 2491
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2492 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2495
2176 } else { 2496 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2179 } 2499 }
2180 } 2500 }
2501}
2502
2503=item $object->send_msg ($channel, $msg, $color, [extra...])
2504
2505=cut
2506
2507sub cf::object::send_msg {
2508 my $pl = shift->contr
2509 or return;
2510 $pl->send_msg (@_);
2181} 2511}
2182 2512
2183=item $player_object->may ("access") 2513=item $player_object->may ("access")
2184 2514
2185Returns wether the given player is authorized to access resource "access" 2515Returns wether the given player is authorized to access resource "access"
2264 # use -1 or undef as default coordinates, not 0, 0 2594 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2595 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2596 if $x <=0 && $y <= 0;
2267 2597
2268 $map->load; 2598 $map->load;
2269 $map->load_diag; 2599 $map->load_neighbours;
2270 2600
2271 return unless $self->contr->active; 2601 return unless $self->contr->active;
2272 $self->activate_recursive; 2602 $self->activate_recursive;
2273 2603
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2624 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295 2625
2296 $self->enter_link; 2626 $self->enter_link;
2297 2627
2298 (async { 2628 (async {
2629 $Coro::current->{desc} = "player::goto $path $x $y";
2630
2631 # *tag paths override both path and x|y
2632 if ($path =~ /^\*(.*)$/) {
2633 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2634 my $ob = $obs[rand @obs];
2635
2636 # see if we actually can go there
2637 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2638 $ob = $obs[rand @obs];
2639 } else {
2640 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2641 }
2642 # else put us there anyways for now #d#
2643
2644 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2645 } else {
2646 ($path, $x, $y) = (undef, undef, undef);
2647 }
2648 }
2649
2299 my $map = eval { 2650 my $map = eval {
2300 my $map = cf::map::find $path; 2651 my $map = defined $path ? cf::map::find $path : undef;
2301 2652
2302 if ($map) { 2653 if ($map) {
2303 $map = $map->customise_for ($self); 2654 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map; 2655 $map = $check->($map) if $check && $map;
2305 } else { 2656 } else {
2306 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2657 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2307 } 2658 }
2308 2659
2309 $map 2660 $map
2310 }; 2661 };
2311 2662
2364 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2365 } 2716 }
2366 2717
2367 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2368 2719
2369 my $data = cf::to_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2370 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2371 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2372 2723
2373 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2374 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
2401 # if exit is damned, update players death & WoR home-position 2752 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp) 2753 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED); 2754 if $exit->flag (FLAG_DAMNED);
2404 2755
2405 (async { 2756 (async {
2757 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2758
2406 $self->deactivate_recursive; # just to be sure 2759 $self->deactivate_recursive; # just to be sure
2407 unless (eval { 2760 unless (eval {
2408 $self->goto ($slaying, $hp, $sp); 2761 $self->goto ($slaying, $hp, $sp);
2409 2762
2410 1; 2763 1;
2445the message, with C<log> being the default. If C<$color> is negative, suppress 2798the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2799the message unless the client supports the msg packet.
2447 2800
2448=cut 2801=cut
2449 2802
2803# non-persistent channels (usually the info channel)
2804our %CHANNEL = (
2805 "c/identify" => {
2806 id => "infobox",
2807 title => "Identify",
2808 reply => undef,
2809 tooltip => "Items recently identified",
2810 },
2811 "c/examine" => {
2812 id => "infobox",
2813 title => "Examine",
2814 reply => undef,
2815 tooltip => "Signs and other items you examined",
2816 },
2817 "c/book" => {
2818 id => "infobox",
2819 title => "Book",
2820 reply => undef,
2821 tooltip => "The contents of a note or book",
2822 },
2823 "c/lookat" => {
2824 id => "infobox",
2825 title => "Look",
2826 reply => undef,
2827 tooltip => "What you saw there",
2828 },
2829 "c/who" => {
2830 id => "infobox",
2831 title => "Players",
2832 reply => undef,
2833 tooltip => "Shows players who are currently online",
2834 },
2835 "c/body" => {
2836 id => "infobox",
2837 title => "Body Parts",
2838 reply => undef,
2839 tooltip => "Shows which body parts you posess and are available",
2840 },
2841 "c/uptime" => {
2842 id => "infobox",
2843 title => "Uptime",
2844 reply => undef,
2845 tooltip => "How long the server has been running since last restart",
2846 },
2847 "c/mapinfo" => {
2848 id => "infobox",
2849 title => "Map Info",
2850 reply => undef,
2851 tooltip => "Information related to the maps",
2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2859);
2860
2450sub cf::client::send_msg { 2861sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2862 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2863
2453 $msg = $self->pl->expand_cfpod ($msg); 2864 $msg = $self->pl->expand_cfpod ($msg);
2454 2865
2455 $color &= ~cf::NDI_UNIQUE; # just in case... 2866 $color &= cf::NDI_CLIENT_MASK; # just in case...
2456 2867
2868 # check predefined channels, for the benefit of C
2869 if ($CHANNEL{$channel}) {
2870 $channel = $CHANNEL{$channel};
2871
2872 $self->ext_msg (channel_info => $channel)
2873 if $self->can_msg;
2874
2875 $channel = $channel->{id};
2876
2457 if (ref $channel) { 2877 } elsif (ref $channel) {
2458 # send meta info to client, if not yet sent 2878 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2879 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2880 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2881 $self->ext_msg (channel_info => $channel)
2882 if $self->can_msg;
2462 } 2883 }
2463 2884
2464 $channel = $channel->{id}; 2885 $channel = $channel->{id};
2465 } 2886 }
2466 2887
2467 return unless @extra || length $msg; 2888 return unless @extra || length $msg;
2468 2889
2469 if ($self->can_msg) { 2890 if ($self->can_msg) {
2891 # default colour, mask it out
2892 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2893 if $color & cf::NDI_DEF;
2894
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2895 $self->send_packet ("msg " . $self->{json_coder}->encode (
2896 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2897 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) { 2898 if ($color >= 0) {
2899 # replace some tags by gcfclient-compatible ones
2900 for ($msg) {
2901 1 while
2902 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2903 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2904 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2905 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2906 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2907 }
2908
2909 $color &= cf::NDI_COLOR_MASK;
2910
2911 utf8::encode $msg;
2912
2483 if (0 && $msg =~ /\[/) { 2913 if (0 && $msg =~ /\[/) {
2914 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2915 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2916 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2917 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2918 $self->send_packet ("drawinfo $color $msg")
2488 } 2919 }
2489 } 2920 }
2490 } 2921 }
2491} 2922}
2492 2923
2493=item $client->ext_event ($type, %msg) 2924=item $client->ext_msg ($type, @msg)
2494 2925
2495Sends an ext event to the client. 2926Sends an ext event to the client.
2496 2927
2497=cut 2928=cut
2498 2929
2499sub cf::client::ext_event($$%) { 2930sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2931 my ($self, $type, @msg) = @_;
2501 2932
2502 return unless $self->extcmd; 2933 if ($self->extcmd == 2) {
2503 2934 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2935 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2936 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2937 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2938 }
2939}
2940
2941=item $client->ext_reply ($msgid, @msg)
2942
2943Sends an ext reply to the client.
2944
2945=cut
2946
2947sub cf::client::ext_reply($$@) {
2948 my ($self, $id, @msg) = @_;
2949
2950 if ($self->extcmd == 2) {
2951 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2952 } elsif ($self->extcmd == 1) {
2953 #TODO: version 1, remove
2954 unshift @msg, msgtype => "reply", msgid => $id;
2955 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2956 }
2506} 2957}
2507 2958
2508=item $success = $client->query ($flags, "text", \&cb) 2959=item $success = $client->query ($flags, "text", \&cb)
2509 2960
2510Queues a query to the client, calling the given callback with 2961Queues a query to the client, calling the given callback with
2565 my ($ns, $buf) = @_; 3016 my ($ns, $buf) = @_;
2566 3017
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3018 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 3019
2569 if (ref $msg) { 3020 if (ref $msg) {
3021 my ($type, $reply, @payload) =
3022 "ARRAY" eq ref $msg
3023 ? @$msg
3024 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3025
3026 my @reply;
3027
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3028 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 3029 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 3030 }
3031
3032 $ns->ext_reply ($reply, @reply)
3033 if $reply;
3034
2576 } else { 3035 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3036 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 3037 }
2579 3038
2580 cf::override; 3039 cf::override;
2627our $safe = new Safe "safe"; 3086our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 3087our $safe_hole = new Safe::Hole;
2629 3088
2630$SIG{FPE} = 'IGNORE'; 3089$SIG{FPE} = 'IGNORE';
2631 3090
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3091$safe->permit_only (Opcode::opset qw(
3092 :base_core :base_mem :base_orig :base_math
3093 grepstart grepwhile mapstart mapwhile
3094 sort time
3095));
2633 3096
2634# here we export the classes and methods available to script code 3097# here we export the classes and methods available to script code
2635 3098
2636=pod 3099=pod
2637 3100
2638The following functions and methods are available within a safe environment: 3101The following functions and methods are available within a safe environment:
2639 3102
2640 cf::object 3103 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 3104 contr pay_amount pay_player map x y force_find force_add destroy
2642 insert remove 3105 insert remove name archname title slaying race decrease split
2643 3106
2644 cf::object::player 3107 cf::object::player
2645 player 3108 player
2646 3109
2647 cf::player 3110 cf::player
2652 3115
2653=cut 3116=cut
2654 3117
2655for ( 3118for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2657 insert remove)], 3120 insert remove inv name archname title slaying race
3121 decrease split destroy)],
2658 ["cf::object::player" => qw(player)], 3122 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 3123 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 3124 ["cf::map" => qw(trigger)],
2661) { 3125) {
2662 no strict 'refs'; 3126 no strict 'refs';
2738# the server's init and main functions 3202# the server's init and main functions
2739 3203
2740sub load_facedata($) { 3204sub load_facedata($) {
2741 my ($path) = @_; 3205 my ($path) = @_;
2742 3206
3207 # HACK to clear player env face cache, we need some signal framework
3208 # for this (global event?)
3209 %ext::player_env::MUSIC_FACE_CACHE = ();
3210
3211 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3212
2743 warn "loading facedata from $path\n"; 3213 warn "loading facedata from $path\n";
2744 3214
2745 my $facedata; 3215 my $facedata;
2746 0 < aio_load $path, $facedata 3216 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 3217 or die "$path: $!";
2749 $facedata = Coro::Storable::thaw $facedata; 3219 $facedata = Coro::Storable::thaw $facedata;
2750 3220
2751 $facedata->{version} == 2 3221 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 3222 or cf::cleanup "$path: version mismatch, cannot proceed.";
2753 3223
3224 # patch in the exptable
3225 $facedata->{resource}{"res/exp_table"} = {
3226 type => FT_RSRC,
3227 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3228 };
3229 cf::cede_to_tick;
3230
2754 { 3231 {
2755 my $faces = $facedata->{faceinfo}; 3232 my $faces = $facedata->{faceinfo};
2756 3233
2757 while (my ($face, $info) = each %$faces) { 3234 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3235 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3236
2759 cf::face::set_visibility $idx, $info->{visibility}; 3237 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 3238 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3239 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3240 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 3241
2764 cf::cede_to_tick; 3242 cf::cede_to_tick;
2765 } 3243 }
2766 3244
2767 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
2768 next unless $info->{smooth}; 3246 next unless $info->{smooth};
3247
2769 my $idx = cf::face::find $face 3248 my $idx = cf::face::find $face
2770 or next; 3249 or next;
3250
2771 if (my $smooth = cf::face::find $info->{smooth}) { 3251 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth; 3252 cf::face::set_smooth $idx, $smooth;
2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3253 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2774 } else { 3254 } else {
2775 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3255 warn "smooth face '$info->{smooth}' not found for face '$face'";
2792 3272
2793 { 3273 {
2794 # TODO: for gcfclient pleasure, we should give resources 3274 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3275 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3276 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical;
2798 3277
2799 while (my ($name, $info) = each %$res) { 3278 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({ 3279 if (defined $info->{type}) {
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3280 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3281 my $data;
2807 3282
2808 if ($name =~ /\.jpg$/) { 3283 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3284 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3285
3286 my $meta = $enc->encode ({
3287 name => $name,
3288 %{ $info->{meta} || {} },
3289 });
3290
3291 $data = pack "(w/a*)*", $meta, $info->{data};
3292 } else {
3293 $data = $info->{data};
3294 }
3295
3296 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3297 cf::face::set_type $idx, $info->{type};
2811 } else { 3298 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3299 $RESOURCE{$name} = $info;
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3300 }
2818 3301
2819 cf::cede_to_tick; 3302 cf::cede_to_tick;
2820 } 3303 }
2821 } 3304 }
2822 3305
3306 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3307
2823 1 3308 1
2824} 3309}
2825 3310
3311cf::global->attach (on_resource_update => sub {
3312 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3313 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3314
3315 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3316 my $sound = $soundconf->{compat}[$_]
3317 or next;
3318
3319 my $face = cf::face::find "sound/$sound->[1]";
3320 cf::sound::set $sound->[0] => $face;
3321 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3322 }
3323
3324 while (my ($k, $v) = each %{$soundconf->{event}}) {
3325 my $face = cf::face::find "sound/$v";
3326 cf::sound::set $k => $face;
3327 }
3328 }
3329});
3330
3331register_exticmd fx_want => sub {
3332 my ($ns, $want) = @_;
3333
3334 while (my ($k, $v) = each %$want) {
3335 $ns->fx_want ($k, $v);
3336 }
3337};
3338
3339sub load_resource_file($) {
3340 my $guard = lock_acquire "load_resource_file";
3341
3342 my $status = load_resource_file_ $_[0];
3343 get_slot 0.1, 100;
3344 cf::arch::commit_load;
3345
3346 $status
3347}
3348
2826sub reload_regions { 3349sub reload_regions {
3350 # HACK to clear player env face cache, we need some signal framework
3351 # for this (global event?)
3352 %ext::player_env::MUSIC_FACE_CACHE = ();
3353
2827 load_resource_file "$MAPDIR/regions" 3354 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3355 or die "unable to load regions file\n";
2829 3356
2830 for (cf::region::list) { 3357 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3358 $_->{match} = qr/$_->{match}/
2839} 3366}
2840 3367
2841sub reload_archetypes { 3368sub reload_archetypes {
2842 load_resource_file "$DATADIR/archetypes" 3369 load_resource_file "$DATADIR/archetypes"
2843 or die "unable to load archetypes\n"; 3370 or die "unable to load archetypes\n";
2844 #d# NEED to laod twice to resolve forward references
2845 # this really needs to be done in an extra post-pass
2846 # (which needs to be synchronous, so solve it differently)
2847 load_resource_file "$DATADIR/archetypes"
2848 or die "unable to load archetypes\n";
2849} 3371}
2850 3372
2851sub reload_treasures { 3373sub reload_treasures {
2852 load_resource_file "$DATADIR/treasures" 3374 load_resource_file "$DATADIR/treasures"
2853 or die "unable to load treasurelists\n"; 3375 or die "unable to load treasurelists\n";
2854} 3376}
2855 3377
2856sub reload_resources { 3378sub reload_resources {
2857 warn "reloading resource files...\n"; 3379 warn "reloading resource files...\n";
2858 3380
3381 reload_facedata;
3382 reload_archetypes;
2859 reload_regions; 3383 reload_regions;
2860 reload_facedata;
2861 #reload_archetypes;#d#
2862 reload_archetypes;
2863 reload_treasures; 3384 reload_treasures;
2864 3385
2865 warn "finished reloading resource files\n"; 3386 warn "finished reloading resource files\n";
2866} 3387}
2867 3388
2868sub init { 3389sub init {
3390 my $guard = freeze_mainloop;
3391
2869 reload_resources; 3392 reload_resources;
2870} 3393}
2871 3394
2872sub cfg_load { 3395sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3396 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3397 or return;
2875 3398
2876 local $/; 3399 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3400 *CFG = YAML::Load <$fh>;
2878 3401
2879 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3402 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2880 3403
2881 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3404 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2882 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3405 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2893sub main { 3416sub main {
2894 # we must not ever block the main coroutine 3417 # we must not ever block the main coroutine
2895 local $Coro::idle = sub { 3418 local $Coro::idle = sub {
2896 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3419 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2897 (async { 3420 (async {
2898 Event::one_event; 3421 $Coro::current->{desc} = "IDLE BUG HANDLER";
3422 EV::loop EV::LOOP_ONESHOT;
2899 })->prio (Coro::PRIO_MAX); 3423 })->prio (Coro::PRIO_MAX);
2900 }; 3424 };
2901 3425
2902 cfg_load; 3426 {
3427 my $guard = freeze_mainloop;
3428 reload_config;
2903 db_init; 3429 db_init;
2904 load_extensions; 3430 load_extensions;
2905 3431
2906 $TICK_WATCHER->start; 3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 evthread_start IO::AIO::poll_fileno;
3434 }
3435
2907 Event::loop; 3436 EV::loop;
2908} 3437}
2909 3438
2910############################################################################# 3439#############################################################################
2911# initialisation and cleanup 3440# initialisation and cleanup
2912 3441
2913# install some emergency cleanup handlers 3442# install some emergency cleanup handlers
2914BEGIN { 3443BEGIN {
3444 our %SIGWATCHER = ();
2915 for my $signal (qw(INT HUP TERM)) { 3445 for my $signal (qw(INT HUP TERM)) {
2916 Event->signal ( 3446 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2917 reentrant => 0,
2918 data => WF_AUTOCANCEL,
2919 signal => $signal,
2920 prio => 0,
2921 cb => sub {
2922 cf::cleanup "SIG$signal"; 3447 cf::cleanup "SIG$signal";
2923 },
2924 ); 3448 };
2925 } 3449 }
2926} 3450}
2927 3451
2928sub write_runtime { 3452sub write_runtime_sync {
2929 my $runtime = "$LOCALDIR/runtime"; 3453 my $runtime = "$LOCALDIR/runtime";
2930 3454
2931 # first touch the runtime file to show we are still running: 3455 # first touch the runtime file to show we are still running:
2932 # the fsync below can take a very very long time. 3456 # the fsync below can take a very very long time.
2933 3457
2959 and return; 3483 and return;
2960 3484
2961 warn "runtime file written.\n"; 3485 warn "runtime file written.\n";
2962 3486
2963 1 3487 1
3488}
3489
3490our $uuid_lock;
3491our $uuid_skip;
3492
3493sub write_uuid_sync($) {
3494 $uuid_skip ||= $_[0];
3495
3496 return if $uuid_lock;
3497 local $uuid_lock = 1;
3498
3499 my $uuid = "$LOCALDIR/uuid";
3500
3501 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3502 or return;
3503
3504 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3505 $uuid_skip = 0;
3506
3507 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3508 and return;
3509
3510 # always fsync - this file is important
3511 aio_fsync $fh
3512 and return;
3513
3514 close $fh
3515 or return;
3516
3517 aio_rename "$uuid~", $uuid
3518 and return;
3519
3520 warn "uuid file written ($value).\n";
3521
3522 1
3523
3524}
3525
3526sub write_uuid($$) {
3527 my ($skip, $sync) = @_;
3528
3529 $sync ? write_uuid_sync $skip
3530 : async { write_uuid_sync $skip };
2964} 3531}
2965 3532
2966sub emergency_save() { 3533sub emergency_save() {
2967 my $freeze_guard = cf::freeze_mainloop; 3534 my $freeze_guard = cf::freeze_mainloop;
2968 3535
2974 # and maps saved/destroyed asynchronously. 3541 # and maps saved/destroyed asynchronously.
2975 warn "begin emergency player save\n"; 3542 warn "begin emergency player save\n";
2976 for my $login (keys %cf::PLAYER) { 3543 for my $login (keys %cf::PLAYER) {
2977 my $pl = $cf::PLAYER{$login} or next; 3544 my $pl = $cf::PLAYER{$login} or next;
2978 $pl->valid or next; 3545 $pl->valid or next;
3546 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2979 $pl->save; 3547 $pl->save;
2980 } 3548 }
2981 warn "end emergency player save\n"; 3549 warn "end emergency player save\n";
2982 3550
2983 warn "begin emergency map save\n"; 3551 warn "begin emergency map save\n";
2989 warn "end emergency map save\n"; 3557 warn "end emergency map save\n";
2990 3558
2991 warn "begin emergency database checkpoint\n"; 3559 warn "begin emergency database checkpoint\n";
2992 BDB::db_env_txn_checkpoint $DB_ENV; 3560 BDB::db_env_txn_checkpoint $DB_ENV;
2993 warn "end emergency database checkpoint\n"; 3561 warn "end emergency database checkpoint\n";
3562
3563 warn "begin write uuid\n";
3564 write_uuid_sync 1;
3565 warn "end write uuid\n";
2994 }; 3566 };
2995 3567
2996 warn "leave emergency perl save\n"; 3568 warn "leave emergency perl save\n";
2997} 3569}
2998 3570
3013 warn "reloading..."; 3585 warn "reloading...";
3014 3586
3015 warn "entering sync_job"; 3587 warn "entering sync_job";
3016 3588
3017 cf::sync_job { 3589 cf::sync_job {
3018 cf::write_runtime; # external watchdog should not bark 3590 cf::write_runtime_sync; # external watchdog should not bark
3019 cf::emergency_save; 3591 cf::emergency_save;
3020 cf::write_runtime; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3021 3593
3022 warn "syncing database to disk"; 3594 warn "syncing database to disk";
3023 BDB::db_env_txn_checkpoint $DB_ENV; 3595 BDB::db_env_txn_checkpoint $DB_ENV;
3024 3596
3025 # if anything goes wrong in here, we should simply crash as we already saved 3597 # if anything goes wrong in here, we should simply crash as we already saved
3026
3027 warn "cancelling all WF_AUTOCANCEL watchers";
3028 for (Event::all_watchers) {
3029 $_->cancel if $_->data & WF_AUTOCANCEL;
3030 }
3031 3598
3032 warn "flushing outstanding aio requests"; 3599 warn "flushing outstanding aio requests";
3033 for (;;) { 3600 for (;;) {
3034 BDB::flush; 3601 BDB::flush;
3035 IO::AIO::flush; 3602 IO::AIO::flush;
3036 Coro::cede; 3603 Coro::cede_notself;
3037 last unless IO::AIO::nreqs || BDB::nreqs; 3604 last unless IO::AIO::nreqs || BDB::nreqs;
3038 warn "iterate..."; 3605 warn "iterate...";
3039 } 3606 }
3040 3607
3041 ++$RELOAD; 3608 ++$RELOAD;
3100 warn "reloading cf.pm"; 3667 warn "reloading cf.pm";
3101 require cf; 3668 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3670
3104 warn "loading config and database again"; 3671 warn "loading config and database again";
3105 cf::cfg_load; 3672 cf::reload_config;
3106 3673
3107 warn "loading extensions"; 3674 warn "loading extensions";
3108 cf::load_extensions; 3675 cf::load_extensions;
3109 3676
3110 warn "reattaching attachments to objects/players"; 3677 warn "reattaching attachments to objects/players";
3117 warn "leaving sync_job"; 3684 warn "leaving sync_job";
3118 3685
3119 1 3686 1
3120 } or do { 3687 } or do {
3121 warn $@; 3688 warn $@;
3122 warn "error while reloading, exiting."; 3689 cf::cleanup "error while reloading, exiting.";
3123 exit 1;
3124 }; 3690 };
3125 3691
3126 warn "reloaded"; 3692 warn "reloaded";
3127}; 3693};
3128 3694
3130 3696
3131sub reload_perl() { 3697sub reload_perl() {
3132 # doing reload synchronously and two reloads happen back-to-back, 3698 # doing reload synchronously and two reloads happen back-to-back,
3133 # coro crashes during coro_state_free->destroy here. 3699 # coro crashes during coro_state_free->destroy here.
3134 3700
3135 $RELOAD_WATCHER ||= Event->timer ( 3701 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3136 reentrant => 0,
3137 after => 0,
3138 data => WF_AUTOCANCEL,
3139 cb => sub {
3140 do_reload_perl; 3702 do_reload_perl;
3141 undef $RELOAD_WATCHER; 3703 undef $RELOAD_WATCHER;
3142 },
3143 ); 3704 };
3144} 3705}
3145 3706
3146register_command "reload" => sub { 3707register_command "reload" => sub {
3147 my ($who, $arg) = @_; 3708 my ($who, $arg) = @_;
3148 3709
3149 if ($who->flag (FLAG_WIZ)) { 3710 if ($who->flag (FLAG_WIZ)) {
3150 $who->message ("reloading server."); 3711 $who->message ("reloading server.");
3712 async {
3713 $Coro::current->{desc} = "perl_reload";
3151 async { reload_perl }; 3714 reload_perl;
3715 };
3152 } 3716 }
3153}; 3717};
3154 3718
3155unshift @INC, $LIBDIR; 3719unshift @INC, $LIBDIR;
3156 3720
3158 3722
3159our @WAIT_FOR_TICK; 3723our @WAIT_FOR_TICK;
3160our @WAIT_FOR_TICK_BEGIN; 3724our @WAIT_FOR_TICK_BEGIN;
3161 3725
3162sub wait_for_tick { 3726sub wait_for_tick {
3163 return unless $TICK_WATCHER->is_active;
3164 return if $Coro::current == $Coro::main; 3727 return if tick_inhibit || $Coro::current == $Coro::main;
3165 3728
3166 my $signal = new Coro::Signal; 3729 my $signal = new Coro::Signal;
3167 push @WAIT_FOR_TICK, $signal; 3730 push @WAIT_FOR_TICK, $signal;
3168 $signal->wait; 3731 $signal->wait;
3169} 3732}
3170 3733
3171sub wait_for_tick_begin { 3734sub wait_for_tick_begin {
3172 return unless $TICK_WATCHER->is_active;
3173 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3174 3736
3175 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3176 push @WAIT_FOR_TICK_BEGIN, $signal; 3738 push @WAIT_FOR_TICK_BEGIN, $signal;
3177 $signal->wait; 3739 $signal->wait;
3178} 3740}
3179 3741
3180 my $min = 1e6;#d# 3742sub tick {
3181 my $avg = 10;
3182$TICK_WATCHER = Event->timer (
3183 reentrant => 0,
3184 parked => 1,
3185 prio => 0,
3186 at => $NEXT_TICK || $TICK,
3187 data => WF_AUTOCANCEL,
3188 cb => sub {
3189 if ($Coro::current != $Coro::main) { 3743 if ($Coro::current != $Coro::main) {
3190 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3744 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3191 unless ++$bug_warning > 10; 3745 unless ++$bug_warning > 10;
3192 return; 3746 return;
3193 } 3747 }
3194 3748
3195 $NOW = $tick_start = Event::time;
3196
3197 cf::server_tick; # one server iteration 3749 cf::server_tick; # one server iteration
3198 3750
3199 0 && sync_job {#d# 3751 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3200 for(1..10) { 3752 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3201 my $t = Event::time; 3753 Coro::async_pool {
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3754 $Coro::current->{desc} = "runtime saver";
3203 or die; 3755 write_runtime_sync
3204 3756 or warn "ERROR: unable to write runtime file: $!";
3205 $map->width (50);
3206 $map->height (50);
3207 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1);
3209 my $t = Event::time - $t;
3210
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 }; 3757 };
3758 }
3221 3759
3222 $RUNTIME += $TICK;
3223 $NEXT_TICK += $TICK;
3224
3225 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226 $NEXT_RUNTIME_WRITE = $NOW + 10;
3227 Coro::async_pool {
3228 write_runtime
3229 or warn "ERROR: unable to write runtime file: $!";
3230 };
3231 }
3232
3233# my $AFTER = Event::time;
3234# warn $AFTER - $NOW;#d#
3235
3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3760 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237 $sig->send; 3761 $sig->send;
3238 } 3762 }
3239 while (my $sig = shift @WAIT_FOR_TICK) { 3763 while (my $sig = shift @WAIT_FOR_TICK) {
3240 $sig->send; 3764 $sig->send;
3241 } 3765 }
3242 3766
3243 $NOW = Event::time; 3767 $LOAD = ($NOW - $TICK_START) / $TICK;
3244
3245 # if we are delayed by four ticks or more, skip them all
3246 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3247
3248 $TICK_WATCHER->at ($NEXT_TICK);
3249 $TICK_WATCHER->start;
3250
3251 $LOAD = ($NOW - $tick_start) / $TICK;
3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3768 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253 3769
3254 _post_tick; 3770 if (0) {
3255 3771 if ($NEXT_TICK) {
3256 3772 my $jitter = $TICK_START - $NEXT_TICK;
3773 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3774 warn "jitter $JITTER\n";#d#
3775 }
3257 }, 3776 }
3258); 3777}
3259 3778
3260{ 3779{
3261 BDB::max_poll_time $TICK * 0.1; 3780 # configure BDB
3262 $BDB_POLL_WATCHER = Event->io ( 3781
3263 reentrant => 0,
3264 fd => BDB::poll_fileno,
3265 poll => 'r',
3266 prio => 0,
3267 data => WF_AUTOCANCEL,
3268 cb => \&BDB::poll_cb,
3269 );
3270 BDB::min_parallel 8; 3782 BDB::min_parallel 8;
3271 3783 BDB::max_poll_reqs $TICK * 0.1;
3272 BDB::set_sync_prepare { 3784 $Coro::BDB::WATCHER->priority (1);
3273 my $status;
3274 my $current = $Coro::current;
3275 (
3276 sub {
3277 $status = $!;
3278 $current->ready; undef $current;
3279 },
3280 sub {
3281 Coro::schedule while defined $current;
3282 $! = $status;
3283 },
3284 )
3285 };
3286 3785
3287 unless ($DB_ENV) { 3786 unless ($DB_ENV) {
3288 $DB_ENV = BDB::db_env_create; 3787 $DB_ENV = BDB::db_env_create;
3788 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3789 | BDB::LOG_AUTOREMOVE, 1);
3790 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3791 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3289 3792
3290 cf::sync_job { 3793 cf::sync_job {
3291 eval { 3794 eval {
3292 BDB::db_env_open 3795 BDB::db_env_open
3293 $DB_ENV, 3796 $DB_ENV,
3295 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3798 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3296 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3799 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3297 0666; 3800 0666;
3298 3801
3299 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3802 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300
3301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3302 $DB_ENV->set_lk_detect;
3303 }; 3803 };
3304 3804
3305 cf::cleanup "db_env_open(db): $@" if $@; 3805 cf::cleanup "db_env_open(db): $@" if $@;
3306 }; 3806 };
3307 } 3807 }
3808
3809 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3810 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3811 };
3812 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3813 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3814 };
3815 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3816 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3817 };
3308} 3818}
3309 3819
3310{ 3820{
3821 # configure IO::AIO
3822
3311 IO::AIO::min_parallel 8; 3823 IO::AIO::min_parallel 8;
3312
3313 undef $Coro::AIO::WATCHER;
3314 IO::AIO::max_poll_time $TICK * 0.1; 3824 IO::AIO::max_poll_time $TICK * 0.1;
3315 $AIO_POLL_WATCHER = Event->io ( 3825 $Coro::AIO::WATCHER->priority (1);
3316 reentrant => 0,
3317 data => WF_AUTOCANCEL,
3318 fd => IO::AIO::poll_fileno,
3319 poll => 'r',
3320 prio => 6,
3321 cb => \&IO::AIO::poll_cb,
3322 );
3323} 3826}
3324 3827
3325my $_log_backtrace; 3828my $_log_backtrace;
3326 3829
3327sub _log_backtrace { 3830sub _log_backtrace {
3331 3834
3332 # limit the # of concurrent backtraces 3835 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) { 3836 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace; 3837 ++$_log_backtrace;
3335 async { 3838 async {
3839 $Coro::current->{desc} = "abt $msg";
3840
3336 my @bt = fork_call { 3841 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr; 3842 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3843 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3844 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3340 or die "addr2line: $!"; 3845 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines