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.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs.
Revision 1.425 by root, Mon Apr 21 06:35:26 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
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}
923 1085
924sub reattach { 1086sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1088 my ($obj) = @_;
927 1089
948cf::attachable->attach ( 1110cf::attachable->attach (
949 prio => -1000000, 1111 prio => -1000000,
950 on_instantiate => sub { 1112 on_instantiate => sub {
951 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
952 1114
953 $data = from_json $data; 1115 $data = decode_json $data;
954 1116
955 for (@$data) { 1117 for (@$data) {
956 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
957 1119
958 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
974sub object_freezer_save { 1136sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
976 1138
977 sync_job { 1139 sync_job {
978 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
981 1144
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1146 chmod SAVE_MODE, $fh;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
986 close $fh; 1149 close $fh;
987 1150
988 if (@$objs) { 1151 if (@$objs) {
989 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) {
990 chmod SAVE_MODE, $fh; 1153 chmod SAVE_MODE, $fh;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
993 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
994 close $fh; 1157 close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
996 } 1159 }
1004 } 1167 }
1005 } else { 1168 } else {
1006 aio_unlink $filename; 1169 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1008 } 1171 }
1009 } 1172 };
1010} 1173}
1011 1174
1012sub object_freezer_as_string { 1175sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1014 1177
1026 or return; 1189 or return;
1027 1190
1028 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1193 or return;
1194
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1032 } 1197 }
1033 1198
1199 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1036 return ($data, $av); 1203 ($data, $av)
1037} 1204}
1038 1205
1039=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1040 1207
1041=over 4 1208=over 4
1114 my ($pl, $buf) = @_; 1281 my ($pl, $buf) = @_;
1115 1282
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1284
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1293 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1294 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1124 } else { 1300 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1302 }
1127 1303
1128 cf::override; 1304 cf::override;
1181 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1182 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1183 1359
1184 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1185 warn $msg; 1361 warn $msg;
1186 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1187 exit 1;
1188 } 1363 }
1189 1364
1190 warn $msg; 1365 warn $msg;
1191 } 1366 }
1192 1367
1217use Coro::AIO; 1392use Coro::AIO;
1218 1393
1219=head3 cf::player 1394=head3 cf::player
1220 1395
1221=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}
1222 1411
1223=item cf::player::find $login 1412=item cf::player::find $login
1224 1413
1225Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1226 1415
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1455
1267 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1268 or return; 1457 or return;
1458
1459 my $pl = cf::player::load_pl $f
1460 or return;
1461 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs;
1269 $cf::PLAYER{$login} = $pl 1463 $cf::PLAYER{$login} = $pl
1270 } 1464 }
1271 } 1465 }
1272} 1466}
1273 1467
1282 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1283 1477
1284 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1286 1480
1481 cf::get_slot 0.01;
1482
1287 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1288 Coro::cede; 1484 cf::cede_to_tick;
1289} 1485}
1290 1486
1291sub new($) { 1487sub new($) {
1292 my ($login) = @_; 1488 my ($login) = @_;
1293 1489
1297 $self->{deny_save} = 1; 1493 $self->{deny_save} = 1;
1298 1494
1299 $cf::PLAYER{$login} = $self; 1495 $cf::PLAYER{$login} = $self;
1300 1496
1301 $self 1497 $self
1498}
1499
1500=item $player->send_msg ($channel, $msg, $color, [extra...])
1501
1502=cut
1503
1504sub send_msg {
1505 my $ns = shift->ns
1506 or return;
1507 $ns->send_msg (@_);
1302} 1508}
1303 1509
1304=item $pl->quit_character 1510=item $pl->quit_character
1305 1511
1306Nukes the player without looking back. If logged in, the connection will 1512Nukes the player without looking back. If logged in, the connection will
1361 or return []; 1567 or return [];
1362 1568
1363 my @logins; 1569 my @logins;
1364 1570
1365 for my $login (@$dirs) { 1571 for my $login (@$dirs) {
1572 my $path = path $login;
1573
1574 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1577 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1578 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 }
1369 1580
1370 utf8::decode $login; 1581 utf8::decode $login;
1371 push @logins, $login; 1582 push @logins, $login;
1372 } 1583 }
1373 1584
1406 1617
1407Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1408 1619
1409=cut 1620=cut
1410 1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1411sub expand_cfpod { 1633sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1413 1635
1414 # escape & and < 1636 my $xml;
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417 1637
1418 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1419 1641
1420 1 while 1642 $group =~ s/&/&amp;/g;
1421 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1425 # replace G<male|female> tags 1647 ([BCGHITU])
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1648 <
1427 $self->gender ? $2 : $1 1649 (?:
1428 }ge 1650 ([^<>]*) (?{ $group = $^N })
1429 # replace H<hint text> 1651 | < $interior >
1430 || s{H<([^\>]*)>} 1652 )
1653 >
1654 %gcsx
1431 { 1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "") 1675 "")
1435 [$self->{hintmode}] 1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1436 }ge; 1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1437 1687
1688 for ($xml) {
1438 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1440 1691
1441 # compress some whitespace 1692 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends 1693 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines 1694 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines 1695 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines 1696 s/\n+$//; # ending lines
1697 }
1446 1698
1447 $_ 1699 $xml
1448} 1700}
1701
1702no re 'eval';
1449 1703
1450sub hintmode { 1704sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1706 $_[0]{hintmode}
1453} 1707}
1454 1708
1455=item $player->ext_reply ($msgid, %msg) 1709=item $player->ext_reply ($msgid, @msg)
1456 1710
1457Sends an ext reply to the player. 1711Sends an ext reply to the player.
1458 1712
1459=cut 1713=cut
1460 1714
1461sub ext_reply($$%) { 1715sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1716 my ($self, $id, @msg) = @_;
1463 1717
1464 $msg{msgid} = $id; 1718 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1719}
1467 1720
1468=item $player->ext_event ($type, %msg) 1721=item $player->ext_msg ($type, @msg)
1469 1722
1470Sends an ext event to the client. 1723Sends an ext event to the client.
1471 1724
1472=cut 1725=cut
1473 1726
1474sub ext_event($$%) { 1727sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1728 my ($self, $type, @msg) = @_;
1476 1729
1477 $self->ns->ext_event ($type, %msg); 1730 $self->ns->ext_msg ($type, @msg);
1478} 1731}
1479 1732
1480=head3 cf::region 1733=head3 cf::region
1481 1734
1482=over 4 1735=over 4
1526our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1527our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1528 1781
1529sub generate_random_map { 1782sub generate_random_map {
1530 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1531 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1532 $self->_create_random_map ( 1788 $self->_create_random_map (
1533 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1534 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1535 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1657 1913
1658# the temporary/swap location 1914# the temporary/swap location
1659sub save_path { 1915sub save_path {
1660 my ($self) = @_; 1916 my ($self) = @_;
1661 1917
1662 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1663 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1664} 1920}
1665 1921
1666# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1667sub uniq_path { 1923sub uniq_path {
1668 my ($self) = @_; 1924 my ($self) = @_;
1669 1925
1670 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1671 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1672} 1928}
1673 1929
1674# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1675# all maps in C++... 1931# all maps in C++...
1698 1954
1699sub load_header_from($) { 1955sub load_header_from($) {
1700 my ($self, $path) = @_; 1956 my ($self, $path) = @_;
1701 1957
1702 utf8::encode $path; 1958 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1959 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 or return; 1960 or return;
1961
1962 $self->_load_header ($f)
1963 or return;
1964
1965 local $MAP_LOADING{$self->{path}} = $self;
1966 $f->resolve_delayed_derefs;
1708 1967
1709 $self->{load_path} = $path; 1968 $self->{load_path} = $path;
1710 1969
1711 1 1970 1
1712} 1971}
1766sub find { 2025sub find {
1767 my ($path, $origin) = @_; 2026 my ($path, $origin) = @_;
1768 2027
1769 $path = normalise $path, $origin && $origin->path; 2028 $path = normalise $path, $origin && $origin->path;
1770 2029
2030 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 2031 cf::lock_wait "map_find:$path";
1772 2032
1773 $cf::MAP{$path} || do { 2033 $cf::MAP{$path} || do {
1774 my $guard = cf::lock_acquire "map_find:$path"; 2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
1775 my $map = new_from_path cf::map $path 2037 my $map = new_from_path cf::map $path
1776 or return; 2038 or return;
1777 2039
1778 $map->{last_save} = $cf::RUNTIME; 2040 $map->{last_save} = $cf::RUNTIME;
1779 2041
1781 or return; 2043 or return;
1782 2044
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 2046 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 2047 #$cf::WAIT_FOR_TICK->wait;
2048 undef $guard1;
2049 undef $guard2;
1786 $map->reset; 2050 $map->reset;
1787 undef $guard;
1788 return find $path; 2051 return find $path;
1789 } 2052 }
1790 2053
1791 $cf::MAP{$path} = $map 2054 $cf::MAP{$path} = $map
1792 } 2055 }
1801 local $self->{deny_reset} = 1; # loading can take a long time 2064 local $self->{deny_reset} = 1; # loading can take a long time
1802 2065
1803 my $path = $self->{path}; 2066 my $path = $self->{path};
1804 2067
1805 { 2068 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 2069 my $guard = cf::lock_acquire "map_data:$path";
1807 2070
2071 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 2072 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 2073
1810 $self->in_memory (cf::MAP_LOADING); 2074 $self->in_memory (cf::MAP_LOADING);
1811 2075
1812 $self->alloc; 2076 $self->alloc;
1813 2077
1814 $self->pre_load; 2078 $self->pre_load;
1815 Coro::cede; 2079 cf::cede_to_tick;
1816 2080
2081 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2083 $self->_load_objects ($f)
1818 or return; 2084 or return;
1819 2085
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1821 if delete $self->{load_original}; 2087 if delete $self->{load_original};
1822 2088
1823 if (my $uniq = $self->uniq_path) { 2089 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2090 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2091 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2093 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2094 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs;
2096 }
1828 } 2097 }
1829 } 2098 }
1830 2099
1831 Coro::cede; 2100 $f->resolve_delayed_derefs;
2101
2102 cf::cede_to_tick;
1832 # now do the right thing for maps 2103 # now do the right thing for maps
1833 $self->link_multipart_objects; 2104 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2105 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2106 unless $self->difficulty;
1836 Coro::cede; 2107 cf::cede_to_tick;
1837 2108
1838 unless ($self->{deny_activate}) { 2109 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2110 $self->decay_objects;
1840 $self->fix_auto_apply; 2111 $self->fix_auto_apply;
1841 $self->update_buttons; 2112 $self->update_buttons;
1842 Coro::cede; 2113 cf::cede_to_tick;
1843 $self->set_darkness_map; 2114 $self->set_darkness_map;
1844 Coro::cede; 2115 cf::cede_to_tick;
1845 $self->activate; 2116 $self->activate;
1846 } 2117 }
1847 2118
2119 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME);
2121
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1849 } 2123 }
1850 2124
1851 $self->post_load; 2125 $self->post_load;
1852} 2126}
1853 2127
1862 2136
1863 $self 2137 $self
1864} 2138}
1865 2139
1866# find and load all maps in the 3x3 area around a map 2140# find and load all maps in the 3x3 area around a map
1867sub load_diag { 2141sub load_neighbours {
1868 my ($map) = @_; 2142 my ($map) = @_;
1869 2143
1870 my @diag; # diagonal neighbours 2144 my @neigh; # diagonal neighbours
1871 2145
1872 for (0 .. 3) { 2146 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2147 my $neigh = $map->tile_path ($_)
1874 or next; 2148 or next;
1875 $neigh = find $neigh, $map 2149 $neigh = find $neigh, $map
1876 or next; 2150 or next;
1877 $neigh->load; 2151 $neigh->load;
1878 2152
2153 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2154 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2155 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2156 }
1882 2157
1883 for (@diag) { 2158 for (grep defined $_->[0], @neigh) {
2159 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2160 my $neigh = find $path, $origin
1885 or next; 2161 or next;
1886 $neigh->load; 2162 $neigh->load;
1887 } 2163 }
1888} 2164}
1889 2165
1894} 2170}
1895 2171
1896sub do_load_sync { 2172sub do_load_sync {
1897 my ($map) = @_; 2173 my ($map) = @_;
1898 2174
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main;
2177
1899 cf::sync_job { $map->load }; 2178 cf::sync_job { $map->load };
1900} 2179}
1901 2180
1902our %MAP_PREFETCH; 2181our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2182our $MAP_PREFETCHER = undef;
1904 2183
1905sub find_async { 2184sub find_async {
1906 my ($path, $origin) = @_; 2185 my ($path, $origin, $load) = @_;
1907 2186
1908 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
1909 2188
1910 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1912 } 2191 }
1913 2192
1914 undef $MAP_PREFETCH{$path}; 2193 $MAP_PREFETCH{$path} |= $load;
2194
1915 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
2196 $Coro::current->{desc} = "map prefetcher";
2197
1916 while (%MAP_PREFETCH) { 2198 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2199 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2200 if (my $map = find $k) {
1919 $map->load; 2201 $map->load if $v;
1920 } 2202 }
1921 2203
1922 delete $MAP_PREFETCH{$path}; 2204 delete $MAP_PREFETCH{$k};
1923 } 2205 }
1924 } 2206 }
1925 undef $MAP_PREFETCHER; 2207 undef $MAP_PREFETCHER;
1926 }; 2208 };
1927 $MAP_PREFETCHER->prio (6); 2209 $MAP_PREFETCHER->prio (6);
1930} 2212}
1931 2213
1932sub save { 2214sub save {
1933 my ($self) = @_; 2215 my ($self) = @_;
1934 2216
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2218
1937 $self->{last_save} = $cf::RUNTIME; 2219 $self->{last_save} = $cf::RUNTIME;
1938 2220
1939 return unless $self->dirty; 2221 return unless $self->dirty;
1940 2222
1946 return if $self->{deny_save}; 2228 return if $self->{deny_save};
1947 2229
1948 local $self->{last_access} = $self->last_access;#d# 2230 local $self->{last_access} = $self->last_access;#d#
1949 2231
1950 cf::async { 2232 cf::async {
2233 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
1952 }; 2235 };
2236
2237 cf::get_slot 0.02;
1953 2238
1954 if ($uniq) { 2239 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1957 } else { 2242 } else {
1963 my ($self) = @_; 2248 my ($self) = @_;
1964 2249
1965 # save first because save cedes 2250 # save first because save cedes
1966 $self->save; 2251 $self->save;
1967 2252
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2254
1970 return if $self->players; 2255 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
1972 return if $self->{deny_save}; 2257 return if $self->{deny_save};
1973 2258
2259 $self->in_memory (cf::MAP_SWAPPED);
2260
2261 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2263 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2264}
1977 2265
1978sub reset_at { 2266sub reset_at {
1979 my ($self) = @_; 2267 my ($self) = @_;
1980 2268
2012 if $uniq; 2300 if $uniq;
2013 } 2301 }
2014 2302
2015 delete $cf::MAP{$self->path}; 2303 delete $cf::MAP{$self->path};
2016 2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2307 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2308
2021 $self->unlink_save; 2309 $self->unlink_save;
2022 $self->destroy; 2310 $self->destroy;
2023} 2311}
2024 2312
2025my $nuke_counter = "aaaa"; 2313my $nuke_counter = "aaaa";
2026 2314
2027sub nuke { 2315sub nuke {
2028 my ($self) = @_; 2316 my ($self) = @_;
2029 2317
2318 {
2319 my $lock = cf::lock_acquire "map_data:$self->{path}";
2320
2030 delete $cf::MAP{$self->path}; 2321 delete $cf::MAP{$self->path};
2031 2322
2032 $self->unlink_save; 2323 $self->unlink_save;
2033 2324
2034 bless $self, "cf::map"; 2325 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2326 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2327 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2328 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2330
2040 $cf::MAP{$self->path} = $self; 2331 $cf::MAP{$self->path} = $self;
2332 }
2041 2333
2042 $self->reset; # polite request, might not happen 2334 $self->reset; # polite request, might not happen
2043} 2335}
2044 2336
2045=item $maps = cf::map::tmp_maps 2337=item $maps = cf::map::tmp_maps
2087 2379
2088sub unique_maps() { 2380sub unique_maps() {
2089 [ 2381 [
2090 map { 2382 map {
2091 utf8::decode $_; 2383 utf8::decode $_;
2092 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2093 ? normalise $_ 2387 : normalise $_
2094 : ()
2095 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2096 ] 2389 ]
2097} 2390}
2098 2391
2099package cf;
2100
2101=back 2392=back
2102 2393
2103=head3 cf::object 2394=head3 cf::object
2104 2395
2105=cut 2396=cut
2108 2399
2109=over 4 2400=over 4
2110 2401
2111=item $ob->inv_recursive 2402=item $ob->inv_recursive
2112 2403
2113Returns the inventory of the object _and_ their inventories, recursively. 2404Returns the inventory of the object I<and> their inventories, recursively,
2405but I<not> the object itself.
2114 2406
2115=cut 2407=cut
2116 2408
2117sub inv_recursive_; 2409sub inv_recursive_;
2118sub inv_recursive_ { 2410sub inv_recursive_ {
2119 map { $_, inv_recursive_ $_->inv } @_ 2411 map { $_, inv_recursive_ $_->inv } @_
2120} 2412}
2121 2413
2122sub inv_recursive { 2414sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2415 inv_recursive_ inv $_[0]
2416}
2417
2418=item $ref = $ob->ref
2419
2420Creates and returns a persistent reference to an object that can be stored as a string.
2421
2422=item $ob = cf::object::deref ($refstring)
2423
2424returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2425even if the object actually exists. May block.
2426
2427=cut
2428
2429sub deref {
2430 my ($ref) = @_;
2431
2432 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2433 my ($uuid, $name) = ($1, $2);
2434 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2435 or return;
2436 $pl->ob->uuid eq $uuid
2437 or return;
2438
2439 $pl->ob
2440 } else {
2441 warn "$ref: cannot resolve object reference\n";
2442 undef
2443 }
2124} 2444}
2125 2445
2126package cf; 2446package cf;
2127 2447
2128=back 2448=back
2152 2472
2153 } else { 2473 } else {
2154 my $pl = $self->contr; 2474 my $pl = $self->contr;
2155 2475
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2476 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2479
2165 } else { 2480 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2482 $self->message ($msg, $flags);
2168 } 2483 }
2169 } 2484 }
2485}
2486
2487=item $object->send_msg ($channel, $msg, $color, [extra...])
2488
2489=cut
2490
2491sub cf::object::send_msg {
2492 my $pl = shift->contr
2493 or return;
2494 $pl->send_msg (@_);
2170} 2495}
2171 2496
2172=item $player_object->may ("access") 2497=item $player_object->may ("access")
2173 2498
2174Returns wether the given player is authorized to access resource "access" 2499Returns wether the given player is authorized to access resource "access"
2253 # use -1 or undef as default coordinates, not 0, 0 2578 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2579 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2580 if $x <=0 && $y <= 0;
2256 2581
2257 $map->load; 2582 $map->load;
2258 $map->load_diag; 2583 $map->load_neighbours;
2259 2584
2260 return unless $self->contr->active; 2585 return unless $self->contr->active;
2261 $self->activate_recursive; 2586 $self->activate_recursive;
2262 2587
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2609
2285 $self->enter_link; 2610 $self->enter_link;
2286 2611
2287 (async { 2612 (async {
2613 $Coro::current->{desc} = "player::goto $path $x $y";
2614
2615 # *tag paths override both path and x|y
2616 if ($path =~ /^\*(.*)$/) {
2617 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2618 my $ob = $obs[rand @obs];
2619
2620 # see if we actually can go there
2621 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2622 $ob = $obs[rand @obs];
2623 } else {
2624 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2625 }
2626 # else put us there anyways for now #d#
2627
2628 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2629 } else {
2630 ($path, $x, $y) = (undef, undef, undef);
2631 }
2632 }
2633
2288 my $map = eval { 2634 my $map = eval {
2289 my $map = cf::map::find $path; 2635 my $map = defined $path ? cf::map::find $path : undef;
2290 2636
2291 if ($map) { 2637 if ($map) {
2292 $map = $map->customise_for ($self); 2638 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2639 $map = $check->($map) if $check && $map;
2294 } else { 2640 } else {
2295 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2296 } 2642 }
2297 2643
2298 $map 2644 $map
2299 }; 2645 };
2300 2646
2353 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2354 } 2700 }
2355 2701
2356 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2357 2703
2358 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2359 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2360 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2361 2707
2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
2390 # if exit is damned, update players death & WoR home-position 2736 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp) 2737 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED); 2738 if $exit->flag (FLAG_DAMNED);
2393 2739
2394 (async { 2740 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2742
2395 $self->deactivate_recursive; # just to be sure 2743 $self->deactivate_recursive; # just to be sure
2396 unless (eval { 2744 unless (eval {
2397 $self->goto ($slaying, $hp, $sp); 2745 $self->goto ($slaying, $hp, $sp);
2398 2746
2399 1; 2747 1;
2425 2773
2426 utf8::encode $text; 2774 utf8::encode $text;
2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2775 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2428} 2776}
2429 2777
2430=item $client->send_msg ($color, $type, $msg, [extra...]) 2778=item $client->send_msg ($channel, $msg, $color, [extra...])
2431 2779
2432Send a drawinfo or msg packet to the client, formatting the msg for the 2780Send a drawinfo or msg packet to the client, formatting the msg for the
2433client if neccessary. C<$type> should be a string identifying the type of 2781client if neccessary. C<$type> should be a string identifying the type of
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2782the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2436 2784
2437=cut 2785=cut
2438 2786
2787# non-persistent channels (usually the info channel)
2788our %CHANNEL = (
2789 "c/identify" => {
2790 id => "infobox",
2791 title => "Identify",
2792 reply => undef,
2793 tooltip => "Items recently identified",
2794 },
2795 "c/examine" => {
2796 id => "infobox",
2797 title => "Examine",
2798 reply => undef,
2799 tooltip => "Signs and other items you examined",
2800 },
2801 "c/book" => {
2802 id => "infobox",
2803 title => "Book",
2804 reply => undef,
2805 tooltip => "The contents of a note or book",
2806 },
2807 "c/lookat" => {
2808 id => "infobox",
2809 title => "Look",
2810 reply => undef,
2811 tooltip => "What you saw there",
2812 },
2813 "c/who" => {
2814 id => "infobox",
2815 title => "Players",
2816 reply => undef,
2817 tooltip => "Shows players who are currently online",
2818 },
2819 "c/body" => {
2820 id => "infobox",
2821 title => "Body Parts",
2822 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available",
2824 },
2825 "c/uptime" => {
2826 id => "infobox",
2827 title => "Uptime",
2828 reply => undef,
2829 tooltip => "How long the server has been running since last restart",
2830 },
2831 "c/mapinfo" => {
2832 id => "infobox",
2833 title => "Map Info",
2834 reply => undef,
2835 tooltip => "Information related to the maps",
2836 },
2837);
2838
2439sub cf::client::send_msg { 2839sub cf::client::send_msg {
2440 my ($self, $color, $type, $msg, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2841
2442 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg);
2443 2843
2844 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845
2846 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel};
2849
2850 $self->ext_msg (channel_info => $channel)
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id};
2854
2855 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel)
2860 if $self->can_msg;
2861 }
2862
2863 $channel = $channel->{id};
2864 }
2865
2444 return unless @extra || length $msg; 2866 return unless @extra || length $msg;
2445 2867
2446 if ($self->can_msg) { 2868 if ($self->can_msg) {
2869 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF;
2872
2447 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2873 $self->send_packet ("msg " . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2448 } else { 2875 } else {
2449 # replace some tags by gcfclient-compatible ones
2450 for ($msg) {
2451 1 while
2452 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2453 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2454 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2455 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2456 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2457 }
2458
2459 if ($color >= 0) { 2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886
2887 $color &= cf::NDI_COLOR_MASK;
2888
2889 utf8::encode $msg;
2890
2460 if (0 && $msg =~ /\[/) { 2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2461 $self->send_packet ("drawextinfo $color 4 0 $msg") 2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2462 } else { 2894 } else {
2463 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2464 $self->send_packet ("drawinfo $color $msg") 2896 $self->send_packet ("drawinfo $color $msg")
2465 } 2897 }
2466 } 2898 }
2467 } 2899 }
2468} 2900}
2469 2901
2470=item $client->ext_event ($type, %msg) 2902=item $client->ext_msg ($type, @msg)
2471 2903
2472Sends an ext event to the client. 2904Sends an ext event to the client.
2473 2905
2474=cut 2906=cut
2475 2907
2476sub cf::client::ext_event($$%) { 2908sub cf::client::ext_msg($$@) {
2477 my ($self, $type, %msg) = @_; 2909 my ($self, $type, @msg) = @_;
2478 2910
2479 return unless $self->extcmd; 2911 if ($self->extcmd == 2) {
2480 2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove
2481 $msg{msgtype} = "event_$type"; 2914 push @msg, msgtype => "event_$type";
2482 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 }
2917}
2918
2919=item $client->ext_reply ($msgid, @msg)
2920
2921Sends an ext reply to the client.
2922
2923=cut
2924
2925sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_;
2927
2928 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 }
2483} 2935}
2484 2936
2485=item $success = $client->query ($flags, "text", \&cb) 2937=item $success = $client->query ($flags, "text", \&cb)
2486 2938
2487Queues a query to the client, calling the given callback with 2939Queues a query to the client, calling the given callback with
2542 my ($ns, $buf) = @_; 2994 my ($ns, $buf) = @_;
2543 2995
2544 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2996 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2545 2997
2546 if (ref $msg) { 2998 if (ref $msg) {
2999 my ($type, $reply, @payload) =
3000 "ARRAY" eq ref $msg
3001 ? @$msg
3002 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3003
3004 my @reply;
3005
2547 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3006 if (my $cb = $EXTICMD{$type}) {
2548 if (my %reply = $cb->($ns, $msg)) { 3007 @reply = $cb->($ns, @payload);
2549 $reply{msgid} = $msg->{msgid};
2550 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2551 }
2552 } 3008 }
3009
3010 $ns->ext_reply ($reply, @reply)
3011 if $reply;
3012
2553 } else { 3013 } else {
2554 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2555 } 3015 }
2556 3016
2557 cf::override; 3017 cf::override;
2604our $safe = new Safe "safe"; 3064our $safe = new Safe "safe";
2605our $safe_hole = new Safe::Hole; 3065our $safe_hole = new Safe::Hole;
2606 3066
2607$SIG{FPE} = 'IGNORE'; 3067$SIG{FPE} = 'IGNORE';
2608 3068
2609$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3069$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math
3071 grepstart grepwhile mapstart mapwhile
3072 sort time
3073));
2610 3074
2611# here we export the classes and methods available to script code 3075# here we export the classes and methods available to script code
2612 3076
2613=pod 3077=pod
2614 3078
2615The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
2616 3080
2617 cf::object 3081 cf::object
2618 contr pay_amount pay_player map x y force_find force_add 3082 contr pay_amount pay_player map x y force_find force_add destroy
2619 insert remove 3083 insert remove name archname title slaying race decrease split
2620 3084
2621 cf::object::player 3085 cf::object::player
2622 player 3086 player
2623 3087
2624 cf::player 3088 cf::player
2629 3093
2630=cut 3094=cut
2631 3095
2632for ( 3096for (
2633 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2634 insert remove)], 3098 insert remove inv name archname title slaying race
3099 decrease split destroy)],
2635 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2636 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful)],
2637 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2638) { 3103) {
2639 no strict 'refs'; 3104 no strict 'refs';
2715# the server's init and main functions 3180# the server's init and main functions
2716 3181
2717sub load_facedata($) { 3182sub load_facedata($) {
2718 my ($path) = @_; 3183 my ($path) = @_;
2719 3184
3185 # HACK to clear player env face cache, we need some signal framework
3186 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = ();
3188
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190
2720 warn "loading facedata from $path\n"; 3191 warn "loading facedata from $path\n";
2721 3192
2722 my $facedata; 3193 my $facedata;
2723 0 < aio_load $path, $facedata 3194 0 < aio_load $path, $facedata
2724 or die "$path: $!"; 3195 or die "$path: $!";
2726 $facedata = Coro::Storable::thaw $facedata; 3197 $facedata = Coro::Storable::thaw $facedata;
2727 3198
2728 $facedata->{version} == 2 3199 $facedata->{version} == 2
2729 or cf::cleanup "$path: version mismatch, cannot proceed."; 3200 or cf::cleanup "$path: version mismatch, cannot proceed.";
2730 3201
3202 # patch in the exptable
3203 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3206 };
3207 cf::cede_to_tick;
3208
2731 { 3209 {
2732 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
2733 3211
2734 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
2735 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
2736 cf::face::set_visibility $idx, $info->{visibility}; 3215 cf::face::set_visibility $idx, $info->{visibility};
2737 cf::face::set_magicmap $idx, $info->{magicmap}; 3216 cf::face::set_magicmap $idx, $info->{magicmap};
2738 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2739 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2740 3219
2741 cf::cede_to_tick; 3220 cf::cede_to_tick;
2742 } 3221 }
2743 3222
2744 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
2745 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
2746 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
2747 or next; 3227 or next;
3228
2748 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
2749 cf::face::set_smooth $idx, $smooth; 3230 cf::face::set_smooth $idx, $smooth;
2750 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2751 } else { 3232 } else {
2752 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
2769 3250
2770 { 3251 {
2771 # TODO: for gcfclient pleasure, we should give resources 3252 # TODO: for gcfclient pleasure, we should give resources
2772 # that gcfclient doesn't grok a >10000 face index. 3253 # that gcfclient doesn't grok a >10000 face index.
2773 my $res = $facedata->{resource}; 3254 my $res = $facedata->{resource};
2774 my $enc = JSON::XS->new->utf8->canonical;
2775 3255
2776 while (my ($name, $info) = each %$res) { 3256 while (my ($name, $info) = each %$res) {
2777 my $meta = $enc->encode ({ 3257 if (defined $info->{type}) {
2778 name => $name,
2779 type => $info->{type},
2780 copyright => $info->{copyright}, #TODO#
2781 });
2782
2783 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
2784 3260
2785 if ($name =~ /\.jpg$/) { 3261 if ($info->{type} & 1) {
2786 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3262 # prepend meta info
2787 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type};
2788 } else { 3276 } else {
2789 my $data = pack "(w/a*)*", $meta, $info->{data}; 3277 $RESOURCE{$name} = $info;
2790 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791
2792 cf::face::set_type $idx, 1;
2793 cf::face::set_data $idx, 0, $data, $chk;
2794 } 3278 }
2795 3279
2796 cf::cede_to_tick; 3280 cf::cede_to_tick;
2797 } 3281 }
2798 } 3282 }
2799 3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285
2800 1 3286 1
2801} 3287}
2802 3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308
3309register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_;
3311
3312 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v);
3314 }
3315};
3316
3317sub load_resource_file($) {
3318 my $guard = lock_acquire "load_resource_file";
3319
3320 my $status = load_resource_file_ $_[0];
3321 get_slot 0.1, 100;
3322 cf::arch::commit_load;
3323
3324 $status
3325}
3326
2803sub reload_regions { 3327sub reload_regions {
3328 # HACK to clear player env face cache, we need some signal framework
3329 # for this (global event?)
3330 %ext::player_env::MUSIC_FACE_CACHE = ();
3331
2804 load_resource_file "$MAPDIR/regions" 3332 load_resource_file "$MAPDIR/regions"
2805 or die "unable to load regions file\n"; 3333 or die "unable to load regions file\n";
2806 3334
2807 for (cf::region::list) { 3335 for (cf::region::list) {
2808 $_->{match} = qr/$_->{match}/ 3336 $_->{match} = qr/$_->{match}/
2816} 3344}
2817 3345
2818sub reload_archetypes { 3346sub reload_archetypes {
2819 load_resource_file "$DATADIR/archetypes" 3347 load_resource_file "$DATADIR/archetypes"
2820 or die "unable to load archetypes\n"; 3348 or die "unable to load archetypes\n";
2821 #d# NEED to laod twice to resolve forward references
2822 # this really needs to be done in an extra post-pass
2823 # (which needs to be synchronous, so solve it differently)
2824 load_resource_file "$DATADIR/archetypes"
2825 or die "unable to load archetypes\n";
2826} 3349}
2827 3350
2828sub reload_treasures { 3351sub reload_treasures {
2829 load_resource_file "$DATADIR/treasures" 3352 load_resource_file "$DATADIR/treasures"
2830 or die "unable to load treasurelists\n"; 3353 or die "unable to load treasurelists\n";
2831} 3354}
2832 3355
2833sub reload_resources { 3356sub reload_resources {
2834 warn "reloading resource files...\n"; 3357 warn "reloading resource files...\n";
2835 3358
3359 reload_facedata;
3360 reload_archetypes;
2836 reload_regions; 3361 reload_regions;
2837 reload_facedata;
2838 #reload_archetypes;#d#
2839 reload_archetypes;
2840 reload_treasures; 3362 reload_treasures;
2841 3363
2842 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
2843} 3365}
2844 3366
2845sub init { 3367sub init {
3368 my $guard = freeze_mainloop;
3369
2846 reload_resources; 3370 reload_resources;
2847} 3371}
2848 3372
2849sub cfg_load { 3373sub reload_config {
2850 open my $fh, "<:utf8", "$CONFDIR/config" 3374 open my $fh, "<:utf8", "$CONFDIR/config"
2851 or return; 3375 or return;
2852 3376
2853 local $/; 3377 local $/;
2854 *CFG = YAML::Syck::Load <$fh>; 3378 *CFG = YAML::Load <$fh>;
2855 3379
2856 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3380 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2857 3381
2858 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3382 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2859 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3383 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2870sub main { 3394sub main {
2871 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
2872 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
2873 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2874 (async { 3398 (async {
2875 Event::one_event; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3400 EV::loop EV::LOOP_ONESHOT;
2876 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
2877 }; 3402 };
2878 3403
2879 cfg_load; 3404 {
3405 my $guard = freeze_mainloop;
3406 reload_config;
2880 db_init; 3407 db_init;
2881 load_extensions; 3408 load_extensions;
2882 3409
2883 $TICK_WATCHER->start; 3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3411 evthread_start IO::AIO::poll_fileno;
3412 }
3413
2884 Event::loop; 3414 EV::loop;
2885} 3415}
2886 3416
2887############################################################################# 3417#############################################################################
2888# initialisation and cleanup 3418# initialisation and cleanup
2889 3419
2890# install some emergency cleanup handlers 3420# install some emergency cleanup handlers
2891BEGIN { 3421BEGIN {
3422 our %SIGWATCHER = ();
2892 for my $signal (qw(INT HUP TERM)) { 3423 for my $signal (qw(INT HUP TERM)) {
2893 Event->signal ( 3424 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2894 reentrant => 0,
2895 data => WF_AUTOCANCEL,
2896 signal => $signal,
2897 prio => 0,
2898 cb => sub {
2899 cf::cleanup "SIG$signal"; 3425 cf::cleanup "SIG$signal";
2900 },
2901 ); 3426 };
2902 } 3427 }
2903} 3428}
2904 3429
2905sub write_runtime { 3430sub write_runtime_sync {
2906 my $runtime = "$LOCALDIR/runtime"; 3431 my $runtime = "$LOCALDIR/runtime";
2907 3432
2908 # first touch the runtime file to show we are still running: 3433 # first touch the runtime file to show we are still running:
2909 # the fsync below can take a very very long time. 3434 # the fsync below can take a very very long time.
2910 3435
2936 and return; 3461 and return;
2937 3462
2938 warn "runtime file written.\n"; 3463 warn "runtime file written.\n";
2939 3464
2940 1 3465 1
3466}
3467
3468our $uuid_lock;
3469our $uuid_skip;
3470
3471sub write_uuid_sync($) {
3472 $uuid_skip ||= $_[0];
3473
3474 return if $uuid_lock;
3475 local $uuid_lock = 1;
3476
3477 my $uuid = "$LOCALDIR/uuid";
3478
3479 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3480 or return;
3481
3482 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3483 $uuid_skip = 0;
3484
3485 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3486 and return;
3487
3488 # always fsync - this file is important
3489 aio_fsync $fh
3490 and return;
3491
3492 close $fh
3493 or return;
3494
3495 aio_rename "$uuid~", $uuid
3496 and return;
3497
3498 warn "uuid file written ($value).\n";
3499
3500 1
3501
3502}
3503
3504sub write_uuid($$) {
3505 my ($skip, $sync) = @_;
3506
3507 $sync ? write_uuid_sync $skip
3508 : async { write_uuid_sync $skip };
2941} 3509}
2942 3510
2943sub emergency_save() { 3511sub emergency_save() {
2944 my $freeze_guard = cf::freeze_mainloop; 3512 my $freeze_guard = cf::freeze_mainloop;
2945 3513
2951 # and maps saved/destroyed asynchronously. 3519 # and maps saved/destroyed asynchronously.
2952 warn "begin emergency player save\n"; 3520 warn "begin emergency player save\n";
2953 for my $login (keys %cf::PLAYER) { 3521 for my $login (keys %cf::PLAYER) {
2954 my $pl = $cf::PLAYER{$login} or next; 3522 my $pl = $cf::PLAYER{$login} or next;
2955 $pl->valid or next; 3523 $pl->valid or next;
3524 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2956 $pl->save; 3525 $pl->save;
2957 } 3526 }
2958 warn "end emergency player save\n"; 3527 warn "end emergency player save\n";
2959 3528
2960 warn "begin emergency map save\n"; 3529 warn "begin emergency map save\n";
2966 warn "end emergency map save\n"; 3535 warn "end emergency map save\n";
2967 3536
2968 warn "begin emergency database checkpoint\n"; 3537 warn "begin emergency database checkpoint\n";
2969 BDB::db_env_txn_checkpoint $DB_ENV; 3538 BDB::db_env_txn_checkpoint $DB_ENV;
2970 warn "end emergency database checkpoint\n"; 3539 warn "end emergency database checkpoint\n";
3540
3541 warn "begin write uuid\n";
3542 write_uuid_sync 1;
3543 warn "end write uuid\n";
2971 }; 3544 };
2972 3545
2973 warn "leave emergency perl save\n"; 3546 warn "leave emergency perl save\n";
2974} 3547}
2975 3548
2990 warn "reloading..."; 3563 warn "reloading...";
2991 3564
2992 warn "entering sync_job"; 3565 warn "entering sync_job";
2993 3566
2994 cf::sync_job { 3567 cf::sync_job {
2995 cf::write_runtime; # external watchdog should not bark 3568 cf::write_runtime_sync; # external watchdog should not bark
2996 cf::emergency_save; 3569 cf::emergency_save;
2997 cf::write_runtime; # external watchdog should not bark 3570 cf::write_runtime_sync; # external watchdog should not bark
2998 3571
2999 warn "syncing database to disk"; 3572 warn "syncing database to disk";
3000 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3001 3574
3002 # if anything goes wrong in here, we should simply crash as we already saved 3575 # if anything goes wrong in here, we should simply crash as we already saved
3003
3004 warn "cancelling all WF_AUTOCANCEL watchers";
3005 for (Event::all_watchers) {
3006 $_->cancel if $_->data & WF_AUTOCANCEL;
3007 }
3008 3576
3009 warn "flushing outstanding aio requests"; 3577 warn "flushing outstanding aio requests";
3010 for (;;) { 3578 for (;;) {
3011 BDB::flush; 3579 BDB::flush;
3012 IO::AIO::flush; 3580 IO::AIO::flush;
3013 Coro::cede; 3581 Coro::cede_notself;
3014 last unless IO::AIO::nreqs || BDB::nreqs; 3582 last unless IO::AIO::nreqs || BDB::nreqs;
3015 warn "iterate..."; 3583 warn "iterate...";
3016 } 3584 }
3017 3585
3018 ++$RELOAD; 3586 ++$RELOAD;
3077 warn "reloading cf.pm"; 3645 warn "reloading cf.pm";
3078 require cf; 3646 require cf;
3079 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3647 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3080 3648
3081 warn "loading config and database again"; 3649 warn "loading config and database again";
3082 cf::cfg_load; 3650 cf::reload_config;
3083 3651
3084 warn "loading extensions"; 3652 warn "loading extensions";
3085 cf::load_extensions; 3653 cf::load_extensions;
3086 3654
3087 warn "reattaching attachments to objects/players"; 3655 warn "reattaching attachments to objects/players";
3094 warn "leaving sync_job"; 3662 warn "leaving sync_job";
3095 3663
3096 1 3664 1
3097 } or do { 3665 } or do {
3098 warn $@; 3666 warn $@;
3099 warn "error while reloading, exiting."; 3667 cf::cleanup "error while reloading, exiting.";
3100 exit 1;
3101 }; 3668 };
3102 3669
3103 warn "reloaded"; 3670 warn "reloaded";
3104}; 3671};
3105 3672
3107 3674
3108sub reload_perl() { 3675sub reload_perl() {
3109 # doing reload synchronously and two reloads happen back-to-back, 3676 # doing reload synchronously and two reloads happen back-to-back,
3110 # coro crashes during coro_state_free->destroy here. 3677 # coro crashes during coro_state_free->destroy here.
3111 3678
3112 $RELOAD_WATCHER ||= Event->timer ( 3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3113 reentrant => 0,
3114 after => 0,
3115 data => WF_AUTOCANCEL,
3116 cb => sub {
3117 do_reload_perl; 3680 do_reload_perl;
3118 undef $RELOAD_WATCHER; 3681 undef $RELOAD_WATCHER;
3119 },
3120 ); 3682 };
3121} 3683}
3122 3684
3123register_command "reload" => sub { 3685register_command "reload" => sub {
3124 my ($who, $arg) = @_; 3686 my ($who, $arg) = @_;
3125 3687
3126 if ($who->flag (FLAG_WIZ)) { 3688 if ($who->flag (FLAG_WIZ)) {
3127 $who->message ("reloading server."); 3689 $who->message ("reloading server.");
3690 async {
3691 $Coro::current->{desc} = "perl_reload";
3128 async { reload_perl }; 3692 reload_perl;
3693 };
3129 } 3694 }
3130}; 3695};
3131 3696
3132unshift @INC, $LIBDIR; 3697unshift @INC, $LIBDIR;
3133 3698
3135 3700
3136our @WAIT_FOR_TICK; 3701our @WAIT_FOR_TICK;
3137our @WAIT_FOR_TICK_BEGIN; 3702our @WAIT_FOR_TICK_BEGIN;
3138 3703
3139sub wait_for_tick { 3704sub wait_for_tick {
3140 return unless $TICK_WATCHER->is_active;
3141 return if $Coro::current == $Coro::main; 3705 return if tick_inhibit || $Coro::current == $Coro::main;
3142 3706
3143 my $signal = new Coro::Signal; 3707 my $signal = new Coro::Signal;
3144 push @WAIT_FOR_TICK, $signal; 3708 push @WAIT_FOR_TICK, $signal;
3145 $signal->wait; 3709 $signal->wait;
3146} 3710}
3147 3711
3148sub wait_for_tick_begin { 3712sub wait_for_tick_begin {
3149 return unless $TICK_WATCHER->is_active;
3150 return if $Coro::current == $Coro::main; 3713 return if tick_inhibit || $Coro::current == $Coro::main;
3151 3714
3152 my $signal = new Coro::Signal; 3715 my $signal = new Coro::Signal;
3153 push @WAIT_FOR_TICK_BEGIN, $signal; 3716 push @WAIT_FOR_TICK_BEGIN, $signal;
3154 $signal->wait; 3717 $signal->wait;
3155} 3718}
3156 3719
3157 my $min = 1e6;#d# 3720sub tick {
3158 my $avg = 10;
3159$TICK_WATCHER = Event->timer (
3160 reentrant => 0,
3161 parked => 1,
3162 prio => 0,
3163 at => $NEXT_TICK || $TICK,
3164 data => WF_AUTOCANCEL,
3165 cb => sub {
3166 if ($Coro::current != $Coro::main) { 3721 if ($Coro::current != $Coro::main) {
3167 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3722 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3168 unless ++$bug_warning > 10; 3723 unless ++$bug_warning > 10;
3169 return; 3724 return;
3170 } 3725 }
3171 3726
3172 $NOW = $tick_start = Event::time;
3173
3174 cf::server_tick; # one server iteration 3727 cf::server_tick; # one server iteration
3175 3728
3176 0 && sync_job {#d# 3729 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3177 for(1..10) { 3730 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3178 my $t = Event::time; 3731 Coro::async_pool {
3179 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3732 $Coro::current->{desc} = "runtime saver";
3180 or die; 3733 write_runtime_sync
3181 3734 or warn "ERROR: unable to write runtime file: $!";
3182 $map->width (50);
3183 $map->height (50);
3184 $map->alloc;
3185 $map->_load_objects ("/tmp/x.map", 1);
3186 my $t = Event::time - $t;
3187
3188 #next unless $t < 0.0013;#d#
3189 if ($t < $min) {
3190 $min = $t;
3191 }
3192 $avg = $avg * 0.99 + $t * 0.01;
3193 }
3194 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3195 exit 0;
3196 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3197 }; 3735 };
3736 }
3198 3737
3199 $RUNTIME += $TICK;
3200 $NEXT_TICK += $TICK;
3201
3202 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3203 $NEXT_RUNTIME_WRITE = $NOW + 10;
3204 Coro::async_pool {
3205 write_runtime
3206 or warn "ERROR: unable to write runtime file: $!";
3207 };
3208 }
3209
3210# my $AFTER = Event::time;
3211# warn $AFTER - $NOW;#d#
3212
3213 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3214 $sig->send; 3739 $sig->send;
3215 } 3740 }
3216 while (my $sig = shift @WAIT_FOR_TICK) { 3741 while (my $sig = shift @WAIT_FOR_TICK) {
3217 $sig->send; 3742 $sig->send;
3218 } 3743 }
3219 3744
3220 $NOW = Event::time; 3745 $LOAD = ($NOW - $TICK_START) / $TICK;
3221
3222 # if we are delayed by four ticks or more, skip them all
3223 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3224
3225 $TICK_WATCHER->at ($NEXT_TICK);
3226 $TICK_WATCHER->start;
3227
3228 $LOAD = ($NOW - $tick_start) / $TICK;
3229 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3746 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3230 3747
3231 _post_tick; 3748 if (0) {
3232 3749 if ($NEXT_TICK) {
3233 3750 my $jitter = $TICK_START - $NEXT_TICK;
3751 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3752 warn "jitter $JITTER\n";#d#
3753 }
3234 }, 3754 }
3235); 3755}
3236 3756
3237{ 3757{
3238 BDB::max_poll_time $TICK * 0.1; 3758 # configure BDB
3239 $BDB_POLL_WATCHER = Event->io ( 3759
3240 reentrant => 0,
3241 fd => BDB::poll_fileno,
3242 poll => 'r',
3243 prio => 0,
3244 data => WF_AUTOCANCEL,
3245 cb => \&BDB::poll_cb,
3246 );
3247 BDB::min_parallel 8; 3760 BDB::min_parallel 8;
3248 3761 BDB::max_poll_reqs $TICK * 0.1;
3249 BDB::set_sync_prepare { 3762 $Coro::BDB::WATCHER->priority (1);
3250 my $status;
3251 my $current = $Coro::current;
3252 (
3253 sub {
3254 $status = $!;
3255 $current->ready; undef $current;
3256 },
3257 sub {
3258 Coro::schedule while defined $current;
3259 $! = $status;
3260 },
3261 )
3262 };
3263 3763
3264 unless ($DB_ENV) { 3764 unless ($DB_ENV) {
3265 $DB_ENV = BDB::db_env_create; 3765 $DB_ENV = BDB::db_env_create;
3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3767 | BDB::LOG_AUTOREMOVE, 1);
3768 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3769 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3266 3770
3267 cf::sync_job { 3771 cf::sync_job {
3268 eval { 3772 eval {
3269 BDB::db_env_open 3773 BDB::db_env_open
3270 $DB_ENV, 3774 $DB_ENV,
3272 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3776 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3273 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3777 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3274 0666; 3778 0666;
3275 3779
3276 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3780 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3277
3278 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3279 $DB_ENV->set_lk_detect;
3280 }; 3781 };
3281 3782
3282 cf::cleanup "db_env_open(db): $@" if $@; 3783 cf::cleanup "db_env_open(db): $@" if $@;
3283 }; 3784 };
3284 } 3785 }
3786
3787 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3788 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3789 };
3790 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3791 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3792 };
3793 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3794 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3795 };
3285} 3796}
3286 3797
3287{ 3798{
3799 # configure IO::AIO
3800
3288 IO::AIO::min_parallel 8; 3801 IO::AIO::min_parallel 8;
3289
3290 undef $Coro::AIO::WATCHER;
3291 IO::AIO::max_poll_time $TICK * 0.1; 3802 IO::AIO::max_poll_time $TICK * 0.1;
3292 $AIO_POLL_WATCHER = Event->io ( 3803 $Coro::AIO::WATCHER->priority (1);
3293 reentrant => 0,
3294 data => WF_AUTOCANCEL,
3295 fd => IO::AIO::poll_fileno,
3296 poll => 'r',
3297 prio => 6,
3298 cb => \&IO::AIO::poll_cb,
3299 );
3300} 3804}
3301 3805
3302my $_log_backtrace; 3806my $_log_backtrace;
3303 3807
3304sub _log_backtrace { 3808sub _log_backtrace {
3308 3812
3309 # limit the # of concurrent backtraces 3813 # limit the # of concurrent backtraces
3310 if ($_log_backtrace < 2) { 3814 if ($_log_backtrace < 2) {
3311 ++$_log_backtrace; 3815 ++$_log_backtrace;
3312 async { 3816 async {
3817 $Coro::current->{desc} = "abt $msg";
3818
3313 my @bt = fork_call { 3819 my @bt = fork_call {
3314 @addr = map { sprintf "%x", $_ } @addr; 3820 @addr = map { sprintf "%x", $_ } @addr;
3315 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3821 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3316 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3822 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3317 or die "addr2line: $!"; 3823 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines