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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.330 by elmex, Fri Aug 10 10:35:07 2007 UTC vs.
Revision 1.426 by root, Thu Apr 24 04:40:31 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}
322 }; 369
323 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
324 $guard 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
325} 383}
326 384
327=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
328 386
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 398our @SLOT_QUEUE;
341our $SLOT_QUEUE; 399our $SLOT_QUEUE;
342 400
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
345 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
346 406
347 while () { 407 while () {
348 next_job: 408 next_job:
349 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
357 } 417 }
358 } 418 }
359 } 419 }
360 420
361 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 424 $signal->wait;
365 } else { 425 } else {
366 Coro::schedule; 426 Coro::schedule;
367 } 427 }
368 } 428 }
369}; 429};
370 430
371sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
372 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
373 435
374 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
376 438
390 452
391BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
392 454
393=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
394 456
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
397partly 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
398acceptable. 460acceptable.
399 461
400If 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
401the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
406 468
407sub sync_job(&) { 469sub sync_job(&) {
408 my ($job) = @_; 470 my ($job) = @_;
409 471
410 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 473 my $time = EV::time;
412 474
413 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
415 477
416 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 479
418 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
419 481
420 my $busy = 1; 482 my $busy = 1;
421 my @res; 483 my @res;
422 484
423 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 487 @res = eval { $job->() };
425 warn $@ if $@; 488 warn $@ if $@;
426 undef $busy; 489 undef $busy;
427 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
428 491
429 while ($busy) { 492 while ($busy) {
430 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
431 } 497 }
498 }
432 499
433 $time = Event::time - $time; 500 my $time = EV::time - $time;
434 501
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
439 503
440 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
441 } else { 505 } else {
442 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
443 507
468=item fork_call { }, $args 532=item fork_call { }, $args
469 533
470Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
474 538
475=cut 539=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 540
486sub fork_call(&@) { 541sub fork_call(&@) {
487 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
488 543
489# 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,
490# or die "socketpair: $!"; 545 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 546 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 547
494 if (my $pid = fork) { 548 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 549 reset_signals;
508 local $SIG{__WARN__}; 550 &$cb
509 local $SIG{__DIE__}; 551 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 552
516 eval { 553 wantarray ? @res : $res[-1]
517 close $fh1; 554}
518 555
519 my @res = eval { $cb->(@args) }; 556=item $coin = coin_from_name $name
520 557
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 558=cut
522 close $fh2;
523 };
524 559
525 warn $@ if $@; 560our %coin_alias = (
526 _exit 0; 561 "silver" => "silvercoin",
527 } 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
528} 581}
529 582
530=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
531 584
532Returns a single value from the environment database. 585Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
535 588
536Stores 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
537data 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).
538 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
539=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}
540 615
541our $DB; 616our $DB;
542 617
543sub db_init { 618sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 619 cf::sync_job {
548 eval { 620 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 621 };
558} 622}
559 623
560sub db_get($$) { 624sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
562 626
612 if (1) { 676 if (1) {
613 $md5 = 677 $md5 =
614 join "\x00", 678 join "\x00",
615 $processversion, 679 $processversion,
616 map { 680 map {
617 Coro::cede; 681 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 682 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 683 } 0.. $#$src;
620 684
621 685
622 my $dbmd5 = db_get cache => "$id/md5"; 686 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
668 732
669In 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>
670C<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
671Crossfire TRT). 735Deliantra).
672 736
673=over 4 737=over 4
674 738
675=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
676 740
958 } 1022 }
959 1023
960 0 1024 0
961} 1025}
962 1026
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1028
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1030
967Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
968 1032
974 1038
975=cut 1039=cut
976 1040
977############################################################################# 1041#############################################################################
978# object support 1042# object support
979#
980 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#
981sub _can_merge { 1077sub _can_merge {
982 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
983 1079
984 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1081
988 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
989} 1084}
990 1085
991sub reattach { 1086sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1088 my ($obj) = @_;
1015cf::attachable->attach ( 1110cf::attachable->attach (
1016 prio => -1000000, 1111 prio => -1000000,
1017 on_instantiate => sub { 1112 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
1019 1114
1020 $data = from_json $data; 1115 $data = decode_json $data;
1021 1116
1022 for (@$data) { 1117 for (@$data) {
1023 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
1024 1119
1025 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1136sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
1043 1138
1044 sync_job { 1139 sync_job {
1045 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1048 1144
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1146 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1149 close $fh;
1054 1150
1055 if (@$objs) { 1151 if (@$objs) {
1056 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) {
1057 chmod SAVE_MODE, $fh; 1153 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1157 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1159 }
1071 } 1167 }
1072 } else { 1168 } else {
1073 aio_unlink $filename; 1169 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1075 } 1171 }
1076 } 1172 };
1077} 1173}
1078 1174
1079sub object_freezer_as_string { 1175sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1081 1177
1093 or return; 1189 or return;
1094 1190
1095 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1193 or return;
1194
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1099 } 1197 }
1100 1198
1199 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1202
1103 return ($data, $av); 1203 ($data, $av)
1104} 1204}
1105 1205
1106=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1107 1207
1108=over 4 1208=over 4
1186 my ($type, $reply, @payload) = 1286 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1287 "ARRAY" eq ref $msg
1188 ? @$msg 1288 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1290
1291 my @reply;
1292
1191 if (my $cb = $EXTCMD{$type}) { 1293 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1294 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1295 }
1296
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1197 } else { 1300 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1302 }
1200 1303
1201 cf::override; 1304 cf::override;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1256 1359
1257 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1361 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1363 }
1262 1364
1263 warn $msg; 1365 warn $msg;
1264 } 1366 }
1265 1367
1290use Coro::AIO; 1392use Coro::AIO;
1291 1393
1292=head3 cf::player 1394=head3 cf::player
1293 1395
1294=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}
1295 1411
1296=item cf::player::find $login 1412=item cf::player::find $login
1297 1413
1298Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1299 1415
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1451 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1452 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1453 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1455
1340 my $pl = load_pl path $login 1456 my $f = new_from_file cf::object::thawer path $login
1341 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;
1342 $cf::PLAYER{$login} = $pl 1463 $cf::PLAYER{$login} = $pl
1343 } 1464 }
1344 } 1465 }
1345} 1466}
1346 1467
1355 return if $pl->{deny_save}; 1476 return if $pl->{deny_save};
1356 1477
1357 aio_mkdir playerdir $pl, 0770; 1478 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1479 $pl->{last_save} = $cf::RUNTIME;
1359 1480
1481 cf::get_slot 0.01;
1482
1360 $pl->save_pl ($path); 1483 $pl->save_pl ($path);
1361 Coro::cede; 1484 cf::cede_to_tick;
1362} 1485}
1363 1486
1364sub new($) { 1487sub new($) {
1365 my ($login) = @_; 1488 my ($login) = @_;
1366 1489
1444 or return []; 1567 or return [];
1445 1568
1446 my @logins; 1569 my @logins;
1447 1570
1448 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") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1577 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1578 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 }
1452 1580
1453 utf8::decode $login; 1581 utf8::decode $login;
1454 push @logins, $login; 1582 push @logins, $login;
1455 } 1583 }
1456 1584
1489 1617
1490Expand crossfire pod fragments into protocol xml. 1618Expand crossfire pod fragments into protocol xml.
1491 1619
1492=cut 1620=cut
1493 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
1494sub expand_cfpod { 1633sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1634 my ($self, $pod) = @_;
1496 1635
1497 # escape & and < 1636 my $xml;
1498 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g;
1500 1637
1501 # this is buggy, it needs to properly take care of nested <'s 1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1502 1641
1503 1 while 1642 $group =~ s/&/&amp;/g;
1504 # replace B<>, I<>, U<> etc. 1643 $group =~ s/</&lt;/g;
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1644
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1645 $xml .= $group;
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1646 } elsif ($pod =~ m%\G
1508 # replace G<male|female> tags 1647 ([BCGHITU])
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1648 <
1510 $self->gender ? $2 : $1 1649 (?:
1511 }ge 1650 ([^<>]*) (?{ $group = $^N })
1512 # replace H<hint text> 1651 | < $interior >
1513 || s{H<([^\>]*)>} 1652 )
1653 >
1654 %gcsx
1514 { 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") {
1515 ("<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>",
1516 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1517 "") 1675 "")
1518 [$self->{hintmode}] 1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1519 }ge; 1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1520 1687
1688 for ($xml) {
1521 # create single paragraphs (very hackish) 1689 # create single paragraphs (very hackish)
1522 s/(?<=\S)\n(?=\w)/ /g; 1690 s/(?<=\S)\n(?=\w)/ /g;
1523 1691
1524 # compress some whitespace 1692 # compress some whitespace
1525 s/\s+\n/\n/g; # ws line-ends 1693 s/\s+\n/\n/g; # ws line-ends
1526 s/\n\n+/\n/g; # double lines 1694 s/\n\n+/\n/g; # double lines
1527 s/^\n+//; # beginning lines 1695 s/^\n+//; # beginning lines
1528 s/\n+$//; # ending lines 1696 s/\n+$//; # ending lines
1697 }
1529 1698
1530 $_ 1699 $xml
1531} 1700}
1701
1702no re 'eval';
1532 1703
1533sub hintmode { 1704sub hintmode {
1534 $_[0]{hintmode} = $_[1] if @_ > 1; 1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1535 $_[0]{hintmode} 1706 $_[0]{hintmode}
1536} 1707}
1542=cut 1713=cut
1543 1714
1544sub ext_reply($$@) { 1715sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1716 my ($self, $id, @msg) = @_;
1546 1717
1547 if ($self->ns->extcmd == 2) { 1718 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1719}
1555 1720
1556=item $player->ext_msg ($type, @msg) 1721=item $player->ext_msg ($type, @msg)
1557 1722
1558Sends an ext event to the client. 1723Sends an ext event to the client.
1614our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1615our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1616 1781
1617sub generate_random_map { 1782sub generate_random_map {
1618 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
1619 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1620 $self->_create_random_map ( 1788 $self->_create_random_map (
1621 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1622 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1623 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1745 1913
1746# the temporary/swap location 1914# the temporary/swap location
1747sub save_path { 1915sub save_path {
1748 my ($self) = @_; 1916 my ($self) = @_;
1749 1917
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1752} 1920}
1753 1921
1754# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1755sub uniq_path { 1923sub uniq_path {
1756 my ($self) = @_; 1924 my ($self) = @_;
1757 1925
1758 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1759 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1760} 1928}
1761 1929
1762# and all this just because we cannot iterate over 1930# and all this just because we cannot iterate over
1763# all maps in C++... 1931# all maps in C++...
1786 1954
1787sub load_header_from($) { 1955sub load_header_from($) {
1788 my ($self, $path) = @_; 1956 my ($self, $path) = @_;
1789 1957
1790 utf8::encode $path; 1958 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1959 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 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;
1796 1967
1797 $self->{load_path} = $path; 1968 $self->{load_path} = $path;
1798 1969
1799 1 1970 1
1800} 1971}
1854sub find { 2025sub find {
1855 my ($path, $origin) = @_; 2026 my ($path, $origin) = @_;
1856 2027
1857 $path = normalise $path, $origin && $origin->path; 2028 $path = normalise $path, $origin && $origin->path;
1858 2029
2030 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 2031 cf::lock_wait "map_find:$path";
1860 2032
1861 $cf::MAP{$path} || do { 2033 $cf::MAP{$path} || do {
1862 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
1863 my $map = new_from_path cf::map $path 2037 my $map = new_from_path cf::map $path
1864 or return; 2038 or return;
1865 2039
1866 $map->{last_save} = $cf::RUNTIME; 2040 $map->{last_save} = $cf::RUNTIME;
1867 2041
1869 or return; 2043 or return;
1870 2044
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 2046 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 2047 #$cf::WAIT_FOR_TICK->wait;
2048 undef $guard1;
2049 undef $guard2;
1874 $map->reset; 2050 $map->reset;
1875 undef $guard;
1876 return find $path; 2051 return find $path;
1877 } 2052 }
1878 2053
1879 $cf::MAP{$path} = $map 2054 $cf::MAP{$path} = $map
1880 } 2055 }
1889 local $self->{deny_reset} = 1; # loading can take a long time 2064 local $self->{deny_reset} = 1; # loading can take a long time
1890 2065
1891 my $path = $self->{path}; 2066 my $path = $self->{path};
1892 2067
1893 { 2068 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 2069 my $guard = cf::lock_acquire "map_data:$path";
1895 2070
2071 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2072 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2073
1898 $self->in_memory (cf::MAP_LOADING); 2074 $self->in_memory (cf::MAP_LOADING);
1899 2075
1900 $self->alloc; 2076 $self->alloc;
1901 2077
1902 $self->pre_load; 2078 $self->pre_load;
1903 Coro::cede; 2079 cf::cede_to_tick;
1904 2080
2081 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 2083 $self->_load_objects ($f)
1906 or return; 2084 or return;
1907 2085
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 2087 if delete $self->{load_original};
1910 2088
1911 if (my $uniq = $self->uniq_path) { 2089 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 2090 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 2091 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 2093 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 2094 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs;
2096 }
1916 } 2097 }
1917 } 2098 }
1918 2099
1919 Coro::cede; 2100 $f->resolve_delayed_derefs;
2101
2102 cf::cede_to_tick;
1920 # now do the right thing for maps 2103 # now do the right thing for maps
1921 $self->link_multipart_objects; 2104 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 2105 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 2106 unless $self->difficulty;
1924 Coro::cede; 2107 cf::cede_to_tick;
1925 2108
1926 unless ($self->{deny_activate}) { 2109 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 2110 $self->decay_objects;
1928 $self->fix_auto_apply; 2111 $self->fix_auto_apply;
1929 $self->update_buttons; 2112 $self->update_buttons;
1930 Coro::cede; 2113 cf::cede_to_tick;
1931 $self->set_darkness_map; 2114 $self->set_darkness_map;
1932 Coro::cede; 2115 cf::cede_to_tick;
1933 $self->activate; 2116 $self->activate;
1934 } 2117 }
1935 2118
1936 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
1938 2121
1939 $self->in_memory (cf::MAP_IN_MEMORY); 2122 $self->in_memory (cf::MAP_ACTIVE);
1940 } 2123 }
1941 2124
1942 $self->post_load; 2125 $self->post_load;
1943} 2126}
1944 2127
1953 2136
1954 $self 2137 $self
1955} 2138}
1956 2139
1957# 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
1958sub load_diag { 2141sub load_neighbours {
1959 my ($map) = @_; 2142 my ($map) = @_;
1960 2143
1961 my @diag; # diagonal neighbours 2144 my @neigh; # diagonal neighbours
1962 2145
1963 for (0 .. 3) { 2146 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 2147 my $neigh = $map->tile_path ($_)
1965 or next; 2148 or next;
1966 $neigh = find $neigh, $map 2149 $neigh = find $neigh, $map
1967 or next; 2150 or next;
1968 $neigh->load; 2151 $neigh->load;
1969 2152
2153 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2154 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2155 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2156 }
1973 2157
1974 for (@diag) { 2158 for (grep defined $_->[0], @neigh) {
2159 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2160 my $neigh = find $path, $origin
1976 or next; 2161 or next;
1977 $neigh->load; 2162 $neigh->load;
1978 } 2163 }
1979} 2164}
1980 2165
1985} 2170}
1986 2171
1987sub do_load_sync { 2172sub do_load_sync {
1988 my ($map) = @_; 2173 my ($map) = @_;
1989 2174
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main;
2177
1990 cf::sync_job { $map->load }; 2178 cf::sync_job { $map->load };
1991} 2179}
1992 2180
1993our %MAP_PREFETCH; 2181our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2182our $MAP_PREFETCHER = undef;
1995 2183
1996sub find_async { 2184sub find_async {
1997 my ($path, $origin) = @_; 2185 my ($path, $origin, $load) = @_;
1998 2186
1999 $path = normalise $path, $origin && $origin->{path}; 2187 $path = normalise $path, $origin && $origin->{path};
2000 2188
2001 if (my $map = $cf::MAP{$path}) { 2189 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2003 } 2191 }
2004 2192
2005 undef $MAP_PREFETCH{$path}; 2193 $MAP_PREFETCH{$path} |= $load;
2194
2006 $MAP_PREFETCHER ||= cf::async { 2195 $MAP_PREFETCHER ||= cf::async {
2196 $Coro::current->{desc} = "map prefetcher";
2197
2007 while (%MAP_PREFETCH) { 2198 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2199 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2200 if (my $map = find $k) {
2010 $map->load; 2201 $map->load if $v;
2011 } 2202 }
2012 2203
2013 delete $MAP_PREFETCH{$path}; 2204 delete $MAP_PREFETCH{$k};
2014 } 2205 }
2015 } 2206 }
2016 undef $MAP_PREFETCHER; 2207 undef $MAP_PREFETCHER;
2017 }; 2208 };
2018 $MAP_PREFETCHER->prio (6); 2209 $MAP_PREFETCHER->prio (6);
2021} 2212}
2022 2213
2023sub save { 2214sub save {
2024 my ($self) = @_; 2215 my ($self) = @_;
2025 2216
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2218
2028 $self->{last_save} = $cf::RUNTIME; 2219 $self->{last_save} = $cf::RUNTIME;
2029 2220
2030 return unless $self->dirty; 2221 return unless $self->dirty;
2031 2222
2037 return if $self->{deny_save}; 2228 return if $self->{deny_save};
2038 2229
2039 local $self->{last_access} = $self->last_access;#d# 2230 local $self->{last_access} = $self->last_access;#d#
2040 2231
2041 cf::async { 2232 cf::async {
2233 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2234 $_->contr->save for $self->players;
2043 }; 2235 };
2236
2237 cf::get_slot 0.02;
2044 2238
2045 if ($uniq) { 2239 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2240 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2047 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2241 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2048 } else { 2242 } else {
2054 my ($self) = @_; 2248 my ($self) = @_;
2055 2249
2056 # save first because save cedes 2250 # save first because save cedes
2057 $self->save; 2251 $self->save;
2058 2252
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2253 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2254
2061 return if $self->players; 2255 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2256 return if $self->in_memory != cf::MAP_ACTIVE;
2063 return if $self->{deny_save}; 2257 return if $self->{deny_save};
2064 2258
2259 $self->in_memory (cf::MAP_SWAPPED);
2260
2261 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2263 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2264}
2068 2265
2069sub reset_at { 2266sub reset_at {
2070 my ($self) = @_; 2267 my ($self) = @_;
2071 2268
2103 if $uniq; 2300 if $uniq;
2104 } 2301 }
2105 2302
2106 delete $cf::MAP{$self->path}; 2303 delete $cf::MAP{$self->path};
2107 2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2307 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2308
2112 $self->unlink_save; 2309 $self->unlink_save;
2113 $self->destroy; 2310 $self->destroy;
2114} 2311}
2115 2312
2116my $nuke_counter = "aaaa"; 2313my $nuke_counter = "aaaa";
2117 2314
2118sub nuke { 2315sub nuke {
2119 my ($self) = @_; 2316 my ($self) = @_;
2120 2317
2318 {
2319 my $lock = cf::lock_acquire "map_data:$self->{path}";
2320
2121 delete $cf::MAP{$self->path}; 2321 delete $cf::MAP{$self->path};
2122 2322
2123 $self->unlink_save; 2323 $self->unlink_save;
2124 2324
2125 bless $self, "cf::map"; 2325 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2326 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2327 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2328 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2330
2131 $cf::MAP{$self->path} = $self; 2331 $cf::MAP{$self->path} = $self;
2332 }
2132 2333
2133 $self->reset; # polite request, might not happen 2334 $self->reset; # polite request, might not happen
2134} 2335}
2135 2336
2136=item $maps = cf::map::tmp_maps 2337=item $maps = cf::map::tmp_maps
2178 2379
2179sub unique_maps() { 2380sub unique_maps() {
2180 [ 2381 [
2181 map { 2382 map {
2182 utf8::decode $_; 2383 utf8::decode $_;
2183 /\.map$/ 2384 s/\.map$//; # TODO future compatibility hack
2385 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2386 ? ()
2184 ? normalise $_ 2387 : normalise $_
2185 : ()
2186 } @{ aio_readdir $UNIQUEDIR or [] } 2388 } @{ aio_readdir $UNIQUEDIR or [] }
2187 ] 2389 ]
2188} 2390}
2189 2391
2190package cf;
2191
2192=back 2392=back
2193 2393
2194=head3 cf::object 2394=head3 cf::object
2195 2395
2196=cut 2396=cut
2199 2399
2200=over 4 2400=over 4
2201 2401
2202=item $ob->inv_recursive 2402=item $ob->inv_recursive
2203 2403
2204Returns 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.
2205 2406
2206=cut 2407=cut
2207 2408
2208sub inv_recursive_; 2409sub inv_recursive_;
2209sub inv_recursive_ { 2410sub inv_recursive_ {
2210 map { $_, inv_recursive_ $_->inv } @_ 2411 map { $_, inv_recursive_ $_->inv } @_
2211} 2412}
2212 2413
2213sub inv_recursive { 2414sub inv_recursive {
2214 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 }
2215} 2444}
2216 2445
2217package cf; 2446package cf;
2218 2447
2219=back 2448=back
2349 # use -1 or undef as default coordinates, not 0, 0 2578 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2579 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2580 if $x <=0 && $y <= 0;
2352 2581
2353 $map->load; 2582 $map->load;
2354 $map->load_diag; 2583 $map->load_neighbours;
2355 2584
2356 return unless $self->contr->active; 2585 return unless $self->contr->active;
2357 $self->activate_recursive; 2586 $self->activate_recursive;
2358 2587
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2609
2381 $self->enter_link; 2610 $self->enter_link;
2382 2611
2383 (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
2384 my $map = eval { 2634 my $map = eval {
2385 my $map = cf::map::find $path; 2635 my $map = defined $path ? cf::map::find $path : undef;
2386 2636
2387 if ($map) { 2637 if ($map) {
2388 $map = $map->customise_for ($self); 2638 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2639 $map = $check->($map) if $check && $map;
2390 } else { 2640 } else {
2391 $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);
2392 } 2642 }
2393 2643
2394 $map 2644 $map
2395 }; 2645 };
2396 2646
2449 $rmp->{origin_y} = $exit->y; 2699 $rmp->{origin_y} = $exit->y;
2450 } 2700 }
2451 2701
2452 $rmp->{random_seed} ||= $exit->random_seed; 2702 $rmp->{random_seed} ||= $exit->random_seed;
2453 2703
2454 my $data = cf::to_json $rmp; 2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2455 my $md5 = Digest::MD5::md5_hex $data; 2705 my $md5 = Digest::MD5::md5_hex $data;
2456 my $meta = "$RANDOMDIR/$md5.meta"; 2706 my $meta = "$RANDOMDIR/$md5.meta";
2457 2707
2458 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2459 aio_write $fh, 0, (length $data), $data, 0; 2709 aio_write $fh, 0, (length $data), $data, 0;
2486 # if exit is damned, update players death & WoR home-position 2736 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp) 2737 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED); 2738 if $exit->flag (FLAG_DAMNED);
2489 2739
2490 (async { 2740 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2742
2491 $self->deactivate_recursive; # just to be sure 2743 $self->deactivate_recursive; # just to be sure
2492 unless (eval { 2744 unless (eval {
2493 $self->goto ($slaying, $hp, $sp); 2745 $self->goto ($slaying, $hp, $sp);
2494 2746
2495 1; 2747 1;
2530the 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
2531the message unless the client supports the msg packet. 2783the message unless the client supports the msg packet.
2532 2784
2533=cut 2785=cut
2534 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 "c/party" => {
2838 id => "party",
2839 title => "Party",
2840 reply => "gsay ",
2841 tooltip => "Messages and chat related to your party",
2842 },
2843);
2844
2535sub cf::client::send_msg { 2845sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2846 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2847
2538 $msg = $self->pl->expand_cfpod ($msg); 2848 $msg = $self->pl->expand_cfpod ($msg);
2539 2849
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2850 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 2851
2852 # check predefined channels, for the benefit of C
2853 if ($CHANNEL{$channel}) {
2854 $channel = $CHANNEL{$channel};
2855
2856 $self->ext_msg (channel_info => $channel)
2857 if $self->can_msg;
2858
2859 $channel = $channel->{id};
2860
2542 if (ref $channel) { 2861 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2862 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2863 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2864 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2865 $self->ext_msg (channel_info => $channel)
2866 if $self->can_msg;
2547 } 2867 }
2548 2868
2549 $channel = $channel->{id}; 2869 $channel = $channel->{id};
2550 } 2870 }
2551 2871
2573 $color &= cf::NDI_COLOR_MASK; 2893 $color &= cf::NDI_COLOR_MASK;
2574 2894
2575 utf8::encode $msg; 2895 utf8::encode $msg;
2576 2896
2577 if (0 && $msg =~ /\[/) { 2897 if (0 && $msg =~ /\[/) {
2898 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2899 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2900 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2901 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2902 $self->send_packet ("drawinfo $color $msg")
2582 } 2903 }
2583 } 2904 }
2591=cut 2912=cut
2592 2913
2593sub cf::client::ext_msg($$@) { 2914sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 2915 my ($self, $type, @msg) = @_;
2595 2916
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) { 2917 if ($self->extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2918 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2919 } elsif ($self->extcmd == 1) { # TODO: remove
2601 push @msg, msgtype => "event_$type"; 2920 push @msg, msgtype => "event_$type";
2921 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2922 }
2923}
2924
2925=item $client->ext_reply ($msgid, @msg)
2926
2927Sends an ext reply to the client.
2928
2929=cut
2930
2931sub cf::client::ext_reply($$@) {
2932 my ($self, $id, @msg) = @_;
2933
2934 if ($self->extcmd == 2) {
2935 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2936 } elsif ($self->extcmd == 1) {
2937 #TODO: version 1, remove
2938 unshift @msg, msgtype => "reply", msgid => $id;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2939 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2940 }
2604} 2941}
2605 2942
2606=item $success = $client->query ($flags, "text", \&cb) 2943=item $success = $client->query ($flags, "text", \&cb)
2668 my ($type, $reply, @payload) = 3005 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 3006 "ARRAY" eq ref $msg
2670 ? @$msg 3007 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3008 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 3009
3010 my @reply;
3011
2673 if (my $cb = $EXTICMD{$type}) { 3012 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 3013 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 3014 }
3015
3016 $ns->ext_reply ($reply, @reply)
3017 if $reply;
3018
2679 } else { 3019 } else {
2680 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3020 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2681 } 3021 }
2682 3022
2683 cf::override; 3023 cf::override;
2743=pod 3083=pod
2744 3084
2745The following functions and methods are available within a safe environment: 3085The following functions and methods are available within a safe environment:
2746 3086
2747 cf::object 3087 cf::object
2748 contr pay_amount pay_player map x y force_find force_add 3088 contr pay_amount pay_player map x y force_find force_add destroy
2749 insert remove name archname title slaying race 3089 insert remove name archname title slaying race decrease split
2750 3090
2751 cf::object::player 3091 cf::object::player
2752 player 3092 player
2753 3093
2754 cf::player 3094 cf::player
2759 3099
2760=cut 3100=cut
2761 3101
2762for ( 3102for (
2763 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3103 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2764 insert remove inv name archname title slaying race)], 3104 insert remove inv name archname title slaying race
3105 decrease split destroy)],
2765 ["cf::object::player" => qw(player)], 3106 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 3107 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 3108 ["cf::map" => qw(trigger)],
2768) { 3109) {
2769 no strict 'refs'; 3110 no strict 'refs';
2845# the server's init and main functions 3186# the server's init and main functions
2846 3187
2847sub load_facedata($) { 3188sub load_facedata($) {
2848 my ($path) = @_; 3189 my ($path) = @_;
2849 3190
3191 # HACK to clear player env face cache, we need some signal framework
3192 # for this (global event?)
3193 %ext::player_env::MUSIC_FACE_CACHE = ();
3194
3195 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3196
2850 warn "loading facedata from $path\n"; 3197 warn "loading facedata from $path\n";
2851 3198
2852 my $facedata; 3199 my $facedata;
2853 0 < aio_load $path, $facedata 3200 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 3201 or die "$path: $!";
2856 $facedata = Coro::Storable::thaw $facedata; 3203 $facedata = Coro::Storable::thaw $facedata;
2857 3204
2858 $facedata->{version} == 2 3205 $facedata->{version} == 2
2859 or cf::cleanup "$path: version mismatch, cannot proceed."; 3206 or cf::cleanup "$path: version mismatch, cannot proceed.";
2860 3207
3208 # patch in the exptable
3209 $facedata->{resource}{"res/exp_table"} = {
3210 type => FT_RSRC,
3211 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3212 };
3213 cf::cede_to_tick;
3214
2861 { 3215 {
2862 my $faces = $facedata->{faceinfo}; 3216 my $faces = $facedata->{faceinfo};
2863 3217
2864 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3219 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3220
2866 cf::face::set_visibility $idx, $info->{visibility}; 3221 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 3222 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3223 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3224 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 3225
2871 cf::cede_to_tick; 3226 cf::cede_to_tick;
2872 } 3227 }
2873 3228
2874 while (my ($face, $info) = each %$faces) { 3229 while (my ($face, $info) = each %$faces) {
2875 next unless $info->{smooth}; 3230 next unless $info->{smooth};
3231
2876 my $idx = cf::face::find $face 3232 my $idx = cf::face::find $face
2877 or next; 3233 or next;
3234
2878 if (my $smooth = cf::face::find $info->{smooth}) { 3235 if (my $smooth = cf::face::find $info->{smooth}) {
2879 cf::face::set_smooth $idx, $smooth; 3236 cf::face::set_smooth $idx, $smooth;
2880 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3237 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2881 } else { 3238 } else {
2882 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3239 warn "smooth face '$info->{smooth}' not found for face '$face'";
2899 3256
2900 { 3257 {
2901 # TODO: for gcfclient pleasure, we should give resources 3258 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 3259 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3260 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905
2906 my $soundconf = delete $res->{"res/sound.conf"};
2907 3261
2908 while (my ($name, $info) = each %$res) { 3262 while (my ($name, $info) = each %$res) {
2909 my $meta = $enc->encode ({ 3263 if (defined $info->{type}) {
2910 name => $name,
2911 %{ $info->{meta} || {} },
2912 });
2913
2914 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3264 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3265 my $data;
2915 3266
2916 if ($info->{type} & 1) { 3267 if ($info->{type} & 1) {
2917 # prepend meta info 3268 # prepend meta info
2918 3269
3270 my $meta = $enc->encode ({
3271 name => $name,
3272 %{ $info->{meta} || {} },
3273 });
3274
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 3275 $data = pack "(w/a*)*", $meta, $info->{data};
2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3276 } else {
3277 $data = $info->{data};
3278 }
2921 3279
2922 cf::face::set_data $idx, 0, $data, $chk; 3280 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3281 cf::face::set_type $idx, $info->{type};
2923 } else { 3282 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3283 $RESOURCE{$name} = $info;
2925 } 3284 }
2926 3285
2927 cf::face::set_type $idx, $info->{type};
2928
2929 cf::cede_to_tick; 3286 cf::cede_to_tick;
2930 } 3287 }
2931
2932 if ($soundconf) {
2933 $soundconf = $enc->decode (delete $soundconf->{data});
2934
2935 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2936 my $sound = $soundconf->{compat}[$_]
2937 or next;
2938
2939 my $face = cf::face::find "sound/$sound->[1]";
2940 cf::sound::set $sound->[0] => $face;
2941 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2942 }
2943
2944 while (my ($k, $v) = each %{$soundconf->{event}}) {
2945 my $face = cf::face::find "sound/$v";
2946 cf::sound::set $k => $face;
2947 }
2948 }
2949 } 3288 }
3289
3290 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2950 3291
2951 1 3292 1
2952} 3293}
3294
3295cf::global->attach (on_resource_update => sub {
3296 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3297 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3298
3299 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3300 my $sound = $soundconf->{compat}[$_]
3301 or next;
3302
3303 my $face = cf::face::find "sound/$sound->[1]";
3304 cf::sound::set $sound->[0] => $face;
3305 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3306 }
3307
3308 while (my ($k, $v) = each %{$soundconf->{event}}) {
3309 my $face = cf::face::find "sound/$v";
3310 cf::sound::set $k => $face;
3311 }
3312 }
3313});
2953 3314
2954register_exticmd fx_want => sub { 3315register_exticmd fx_want => sub {
2955 my ($ns, $want) = @_; 3316 my ($ns, $want) = @_;
2956 3317
2957 while (my ($k, $v) = each %$want) { 3318 while (my ($k, $v) = each %$want) {
2958 $ns->fx_want ($k, $v); 3319 $ns->fx_want ($k, $v);
2959 } 3320 }
2960}; 3321};
2961 3322
3323sub load_resource_file($) {
3324 my $guard = lock_acquire "load_resource_file";
3325
3326 my $status = load_resource_file_ $_[0];
3327 get_slot 0.1, 100;
3328 cf::arch::commit_load;
3329
3330 $status
3331}
3332
2962sub reload_regions { 3333sub reload_regions {
3334 # HACK to clear player env face cache, we need some signal framework
3335 # for this (global event?)
3336 %ext::player_env::MUSIC_FACE_CACHE = ();
3337
2963 load_resource_file "$MAPDIR/regions" 3338 load_resource_file "$MAPDIR/regions"
2964 or die "unable to load regions file\n"; 3339 or die "unable to load regions file\n";
2965 3340
2966 for (cf::region::list) { 3341 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/ 3342 $_->{match} = qr/$_->{match}/
2975} 3350}
2976 3351
2977sub reload_archetypes { 3352sub reload_archetypes {
2978 load_resource_file "$DATADIR/archetypes" 3353 load_resource_file "$DATADIR/archetypes"
2979 or die "unable to load archetypes\n"; 3354 or die "unable to load archetypes\n";
2980 #d# NEED to laod twice to resolve forward references
2981 # this really needs to be done in an extra post-pass
2982 # (which needs to be synchronous, so solve it differently)
2983 load_resource_file "$DATADIR/archetypes"
2984 or die "unable to load archetypes\n";
2985} 3355}
2986 3356
2987sub reload_treasures { 3357sub reload_treasures {
2988 load_resource_file "$DATADIR/treasures" 3358 load_resource_file "$DATADIR/treasures"
2989 or die "unable to load treasurelists\n"; 3359 or die "unable to load treasurelists\n";
2990} 3360}
2991 3361
2992sub reload_resources { 3362sub reload_resources {
2993 warn "reloading resource files...\n"; 3363 warn "reloading resource files...\n";
2994 3364
3365 reload_facedata;
3366 reload_archetypes;
2995 reload_regions; 3367 reload_regions;
2996 reload_facedata;
2997 #reload_archetypes;#d#
2998 reload_archetypes;
2999 reload_treasures; 3368 reload_treasures;
3000 3369
3001 warn "finished reloading resource files\n"; 3370 warn "finished reloading resource files\n";
3002} 3371}
3003 3372
3004sub init { 3373sub init {
3374 my $guard = freeze_mainloop;
3375
3005 reload_resources; 3376 reload_resources;
3006} 3377}
3007 3378
3008sub cfg_load { 3379sub reload_config {
3009 open my $fh, "<:utf8", "$CONFDIR/config" 3380 open my $fh, "<:utf8", "$CONFDIR/config"
3010 or return; 3381 or return;
3011 3382
3012 local $/; 3383 local $/;
3013 *CFG = YAML::Syck::Load <$fh>; 3384 *CFG = YAML::Load <$fh>;
3014 3385
3015 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3386 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3016 3387
3017 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3388 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3018 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3389 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3029sub main { 3400sub main {
3030 # we must not ever block the main coroutine 3401 # we must not ever block the main coroutine
3031 local $Coro::idle = sub { 3402 local $Coro::idle = sub {
3032 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3403 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3033 (async { 3404 (async {
3034 Event::one_event; 3405 $Coro::current->{desc} = "IDLE BUG HANDLER";
3406 EV::loop EV::LOOP_ONESHOT;
3035 })->prio (Coro::PRIO_MAX); 3407 })->prio (Coro::PRIO_MAX);
3036 }; 3408 };
3037 3409
3038 cfg_load; 3410 {
3411 my $guard = freeze_mainloop;
3412 reload_config;
3039 db_init; 3413 db_init;
3040 load_extensions; 3414 load_extensions;
3041 3415
3042 $TICK_WATCHER->start; 3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 evthread_start IO::AIO::poll_fileno;
3418 }
3419
3043 Event::loop; 3420 EV::loop;
3044} 3421}
3045 3422
3046############################################################################# 3423#############################################################################
3047# initialisation and cleanup 3424# initialisation and cleanup
3048 3425
3049# install some emergency cleanup handlers 3426# install some emergency cleanup handlers
3050BEGIN { 3427BEGIN {
3428 our %SIGWATCHER = ();
3051 for my $signal (qw(INT HUP TERM)) { 3429 for my $signal (qw(INT HUP TERM)) {
3052 Event->signal ( 3430 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3053 reentrant => 0,
3054 data => WF_AUTOCANCEL,
3055 signal => $signal,
3056 prio => 0,
3057 cb => sub {
3058 cf::cleanup "SIG$signal"; 3431 cf::cleanup "SIG$signal";
3059 },
3060 ); 3432 };
3061 } 3433 }
3062} 3434}
3063 3435
3064sub write_runtime { 3436sub write_runtime_sync {
3065 my $runtime = "$LOCALDIR/runtime"; 3437 my $runtime = "$LOCALDIR/runtime";
3066 3438
3067 # first touch the runtime file to show we are still running: 3439 # first touch the runtime file to show we are still running:
3068 # the fsync below can take a very very long time. 3440 # the fsync below can take a very very long time.
3069 3441
3095 and return; 3467 and return;
3096 3468
3097 warn "runtime file written.\n"; 3469 warn "runtime file written.\n";
3098 3470
3099 1 3471 1
3472}
3473
3474our $uuid_lock;
3475our $uuid_skip;
3476
3477sub write_uuid_sync($) {
3478 $uuid_skip ||= $_[0];
3479
3480 return if $uuid_lock;
3481 local $uuid_lock = 1;
3482
3483 my $uuid = "$LOCALDIR/uuid";
3484
3485 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3486 or return;
3487
3488 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3489 $uuid_skip = 0;
3490
3491 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3492 and return;
3493
3494 # always fsync - this file is important
3495 aio_fsync $fh
3496 and return;
3497
3498 close $fh
3499 or return;
3500
3501 aio_rename "$uuid~", $uuid
3502 and return;
3503
3504 warn "uuid file written ($value).\n";
3505
3506 1
3507
3508}
3509
3510sub write_uuid($$) {
3511 my ($skip, $sync) = @_;
3512
3513 $sync ? write_uuid_sync $skip
3514 : async { write_uuid_sync $skip };
3100} 3515}
3101 3516
3102sub emergency_save() { 3517sub emergency_save() {
3103 my $freeze_guard = cf::freeze_mainloop; 3518 my $freeze_guard = cf::freeze_mainloop;
3104 3519
3110 # and maps saved/destroyed asynchronously. 3525 # and maps saved/destroyed asynchronously.
3111 warn "begin emergency player save\n"; 3526 warn "begin emergency player save\n";
3112 for my $login (keys %cf::PLAYER) { 3527 for my $login (keys %cf::PLAYER) {
3113 my $pl = $cf::PLAYER{$login} or next; 3528 my $pl = $cf::PLAYER{$login} or next;
3114 $pl->valid or next; 3529 $pl->valid or next;
3530 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3115 $pl->save; 3531 $pl->save;
3116 } 3532 }
3117 warn "end emergency player save\n"; 3533 warn "end emergency player save\n";
3118 3534
3119 warn "begin emergency map save\n"; 3535 warn "begin emergency map save\n";
3125 warn "end emergency map save\n"; 3541 warn "end emergency map save\n";
3126 3542
3127 warn "begin emergency database checkpoint\n"; 3543 warn "begin emergency database checkpoint\n";
3128 BDB::db_env_txn_checkpoint $DB_ENV; 3544 BDB::db_env_txn_checkpoint $DB_ENV;
3129 warn "end emergency database checkpoint\n"; 3545 warn "end emergency database checkpoint\n";
3546
3547 warn "begin write uuid\n";
3548 write_uuid_sync 1;
3549 warn "end write uuid\n";
3130 }; 3550 };
3131 3551
3132 warn "leave emergency perl save\n"; 3552 warn "leave emergency perl save\n";
3133} 3553}
3134 3554
3149 warn "reloading..."; 3569 warn "reloading...";
3150 3570
3151 warn "entering sync_job"; 3571 warn "entering sync_job";
3152 3572
3153 cf::sync_job { 3573 cf::sync_job {
3154 cf::write_runtime; # external watchdog should not bark 3574 cf::write_runtime_sync; # external watchdog should not bark
3155 cf::emergency_save; 3575 cf::emergency_save;
3156 cf::write_runtime; # external watchdog should not bark 3576 cf::write_runtime_sync; # external watchdog should not bark
3157 3577
3158 warn "syncing database to disk"; 3578 warn "syncing database to disk";
3159 BDB::db_env_txn_checkpoint $DB_ENV; 3579 BDB::db_env_txn_checkpoint $DB_ENV;
3160 3580
3161 # if anything goes wrong in here, we should simply crash as we already saved 3581 # if anything goes wrong in here, we should simply crash as we already saved
3162
3163 warn "cancelling all WF_AUTOCANCEL watchers";
3164 for (Event::all_watchers) {
3165 $_->cancel if $_->data & WF_AUTOCANCEL;
3166 }
3167 3582
3168 warn "flushing outstanding aio requests"; 3583 warn "flushing outstanding aio requests";
3169 for (;;) { 3584 for (;;) {
3170 BDB::flush; 3585 BDB::flush;
3171 IO::AIO::flush; 3586 IO::AIO::flush;
3172 Coro::cede; 3587 Coro::cede_notself;
3173 last unless IO::AIO::nreqs || BDB::nreqs; 3588 last unless IO::AIO::nreqs || BDB::nreqs;
3174 warn "iterate..."; 3589 warn "iterate...";
3175 } 3590 }
3176 3591
3177 ++$RELOAD; 3592 ++$RELOAD;
3236 warn "reloading cf.pm"; 3651 warn "reloading cf.pm";
3237 require cf; 3652 require cf;
3238 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3653 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239 3654
3240 warn "loading config and database again"; 3655 warn "loading config and database again";
3241 cf::cfg_load; 3656 cf::reload_config;
3242 3657
3243 warn "loading extensions"; 3658 warn "loading extensions";
3244 cf::load_extensions; 3659 cf::load_extensions;
3245 3660
3246 warn "reattaching attachments to objects/players"; 3661 warn "reattaching attachments to objects/players";
3253 warn "leaving sync_job"; 3668 warn "leaving sync_job";
3254 3669
3255 1 3670 1
3256 } or do { 3671 } or do {
3257 warn $@; 3672 warn $@;
3258 warn "error while reloading, exiting."; 3673 cf::cleanup "error while reloading, exiting.";
3259 exit 1;
3260 }; 3674 };
3261 3675
3262 warn "reloaded"; 3676 warn "reloaded";
3263}; 3677};
3264 3678
3266 3680
3267sub reload_perl() { 3681sub reload_perl() {
3268 # doing reload synchronously and two reloads happen back-to-back, 3682 # doing reload synchronously and two reloads happen back-to-back,
3269 # coro crashes during coro_state_free->destroy here. 3683 # coro crashes during coro_state_free->destroy here.
3270 3684
3271 $RELOAD_WATCHER ||= Event->timer ( 3685 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3272 reentrant => 0,
3273 after => 0,
3274 data => WF_AUTOCANCEL,
3275 cb => sub {
3276 do_reload_perl; 3686 do_reload_perl;
3277 undef $RELOAD_WATCHER; 3687 undef $RELOAD_WATCHER;
3278 },
3279 ); 3688 };
3280} 3689}
3281 3690
3282register_command "reload" => sub { 3691register_command "reload" => sub {
3283 my ($who, $arg) = @_; 3692 my ($who, $arg) = @_;
3284 3693
3285 if ($who->flag (FLAG_WIZ)) { 3694 if ($who->flag (FLAG_WIZ)) {
3286 $who->message ("reloading server."); 3695 $who->message ("reloading server.");
3696 async {
3697 $Coro::current->{desc} = "perl_reload";
3287 async { reload_perl }; 3698 reload_perl;
3699 };
3288 } 3700 }
3289}; 3701};
3290 3702
3291unshift @INC, $LIBDIR; 3703unshift @INC, $LIBDIR;
3292 3704
3294 3706
3295our @WAIT_FOR_TICK; 3707our @WAIT_FOR_TICK;
3296our @WAIT_FOR_TICK_BEGIN; 3708our @WAIT_FOR_TICK_BEGIN;
3297 3709
3298sub wait_for_tick { 3710sub wait_for_tick {
3299 return unless $TICK_WATCHER->is_active;
3300 return if $Coro::current == $Coro::main; 3711 return if tick_inhibit || $Coro::current == $Coro::main;
3301 3712
3302 my $signal = new Coro::Signal; 3713 my $signal = new Coro::Signal;
3303 push @WAIT_FOR_TICK, $signal; 3714 push @WAIT_FOR_TICK, $signal;
3304 $signal->wait; 3715 $signal->wait;
3305} 3716}
3306 3717
3307sub wait_for_tick_begin { 3718sub wait_for_tick_begin {
3308 return unless $TICK_WATCHER->is_active;
3309 return if $Coro::current == $Coro::main; 3719 return if tick_inhibit || $Coro::current == $Coro::main;
3310 3720
3311 my $signal = new Coro::Signal; 3721 my $signal = new Coro::Signal;
3312 push @WAIT_FOR_TICK_BEGIN, $signal; 3722 push @WAIT_FOR_TICK_BEGIN, $signal;
3313 $signal->wait; 3723 $signal->wait;
3314} 3724}
3315 3725
3316 my $min = 1e6;#d# 3726sub tick {
3317 my $avg = 10;
3318$TICK_WATCHER = Event->timer (
3319 reentrant => 0,
3320 parked => 1,
3321 prio => 0,
3322 at => $NEXT_TICK || $TICK,
3323 data => WF_AUTOCANCEL,
3324 cb => sub {
3325 if ($Coro::current != $Coro::main) { 3727 if ($Coro::current != $Coro::main) {
3326 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3728 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3327 unless ++$bug_warning > 10; 3729 unless ++$bug_warning > 10;
3328 return; 3730 return;
3329 } 3731 }
3330 3732
3331 $NOW = $tick_start = Event::time;
3332
3333 cf::server_tick; # one server iteration 3733 cf::server_tick; # one server iteration
3334 3734
3335 0 && sync_job {#d# 3735 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3336 for(1..10) { 3736 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3337 my $t = Event::time; 3737 Coro::async_pool {
3338 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3738 $Coro::current->{desc} = "runtime saver";
3339 or die; 3739 write_runtime_sync
3340 3740 or warn "ERROR: unable to write runtime file: $!";
3341 $map->width (50);
3342 $map->height (50);
3343 $map->alloc;
3344 $map->_load_objects ("/tmp/x.map", 1);
3345 my $t = Event::time - $t;
3346
3347 #next unless $t < 0.0013;#d#
3348 if ($t < $min) {
3349 $min = $t;
3350 }
3351 $avg = $avg * 0.99 + $t * 0.01;
3352 }
3353 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3354 exit 0;
3355 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3356 }; 3741 };
3742 }
3357 3743
3358 $RUNTIME += $TICK;
3359 $NEXT_TICK += $TICK;
3360
3361 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3362 $NEXT_RUNTIME_WRITE = $NOW + 10;
3363 Coro::async_pool {
3364 write_runtime
3365 or warn "ERROR: unable to write runtime file: $!";
3366 };
3367 }
3368
3369# my $AFTER = Event::time;
3370# warn $AFTER - $NOW;#d#
3371
3372 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3744 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3373 $sig->send; 3745 $sig->send;
3374 } 3746 }
3375 while (my $sig = shift @WAIT_FOR_TICK) { 3747 while (my $sig = shift @WAIT_FOR_TICK) {
3376 $sig->send; 3748 $sig->send;
3377 } 3749 }
3378 3750
3379 $NOW = Event::time; 3751 $LOAD = ($NOW - $TICK_START) / $TICK;
3380
3381 # if we are delayed by four ticks or more, skip them all
3382 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3383
3384 $TICK_WATCHER->at ($NEXT_TICK);
3385 $TICK_WATCHER->start;
3386
3387 $LOAD = ($NOW - $tick_start) / $TICK;
3388 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3752 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3389 3753
3390 _post_tick; 3754 if (0) {
3391 3755 if ($NEXT_TICK) {
3392 3756 my $jitter = $TICK_START - $NEXT_TICK;
3757 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3758 warn "jitter $JITTER\n";#d#
3759 }
3393 }, 3760 }
3394); 3761}
3395 3762
3396{ 3763{
3397 BDB::max_poll_time $TICK * 0.1; 3764 # configure BDB
3398 $BDB_POLL_WATCHER = Event->io ( 3765
3399 reentrant => 0,
3400 fd => BDB::poll_fileno,
3401 poll => 'r',
3402 prio => 0,
3403 data => WF_AUTOCANCEL,
3404 cb => \&BDB::poll_cb,
3405 );
3406 BDB::min_parallel 8; 3766 BDB::min_parallel 8;
3407 3767 BDB::max_poll_reqs $TICK * 0.1;
3408 BDB::set_sync_prepare { 3768 $Coro::BDB::WATCHER->priority (1);
3409 my $status;
3410 my $current = $Coro::current;
3411 (
3412 sub {
3413 $status = $!;
3414 $current->ready; undef $current;
3415 },
3416 sub {
3417 Coro::schedule while defined $current;
3418 $! = $status;
3419 },
3420 )
3421 };
3422 3769
3423 unless ($DB_ENV) { 3770 unless ($DB_ENV) {
3424 $DB_ENV = BDB::db_env_create; 3771 $DB_ENV = BDB::db_env_create;
3772 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3773 | BDB::LOG_AUTOREMOVE, 1);
3774 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3775 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3425 3776
3426 cf::sync_job { 3777 cf::sync_job {
3427 eval { 3778 eval {
3428 BDB::db_env_open 3779 BDB::db_env_open
3429 $DB_ENV, 3780 $DB_ENV,
3431 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3782 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3432 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3783 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3433 0666; 3784 0666;
3434 3785
3435 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3786 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3436
3437 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3438 $DB_ENV->set_lk_detect;
3439 }; 3787 };
3440 3788
3441 cf::cleanup "db_env_open(db): $@" if $@; 3789 cf::cleanup "db_env_open(db): $@" if $@;
3442 }; 3790 };
3443 } 3791 }
3792
3793 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3794 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3795 };
3796 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3797 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3798 };
3799 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3800 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3801 };
3444} 3802}
3445 3803
3446{ 3804{
3805 # configure IO::AIO
3806
3447 IO::AIO::min_parallel 8; 3807 IO::AIO::min_parallel 8;
3448
3449 undef $Coro::AIO::WATCHER;
3450 IO::AIO::max_poll_time $TICK * 0.1; 3808 IO::AIO::max_poll_time $TICK * 0.1;
3451 $AIO_POLL_WATCHER = Event->io ( 3809 $Coro::AIO::WATCHER->priority (1);
3452 reentrant => 0,
3453 data => WF_AUTOCANCEL,
3454 fd => IO::AIO::poll_fileno,
3455 poll => 'r',
3456 prio => 6,
3457 cb => \&IO::AIO::poll_cb,
3458 );
3459} 3810}
3460 3811
3461my $_log_backtrace; 3812my $_log_backtrace;
3462 3813
3463sub _log_backtrace { 3814sub _log_backtrace {
3467 3818
3468 # limit the # of concurrent backtraces 3819 # limit the # of concurrent backtraces
3469 if ($_log_backtrace < 2) { 3820 if ($_log_backtrace < 2) {
3470 ++$_log_backtrace; 3821 ++$_log_backtrace;
3471 async { 3822 async {
3823 $Coro::current->{desc} = "abt $msg";
3824
3472 my @bt = fork_call { 3825 my @bt = fork_call {
3473 @addr = map { sprintf "%x", $_ } @addr; 3826 @addr = map { sprintf "%x", $_ } @addr;
3474 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3827 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3475 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3828 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3476 or die "addr2line: $!"; 3829 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines