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.326 by root, Tue Jul 31 17:33:15 2007 UTC vs.
Revision 1.419 by root, Sun Apr 13 01:34:09 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 }
390 450
391BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
392 452
393=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
394 454
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 456is 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 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 458acceptable.
399 459
400If it must be done, put the blocking parts into C<sync_job>. This will run 460If 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 461the given BLOCK in another coroutine while waiting for the result. The
406 466
407sub sync_job(&) { 467sub sync_job(&) {
408 my ($job) = @_; 468 my ($job) = @_;
409 469
410 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 471 my $time = EV::time;
412 472
413 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
415 475
416 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 477
418 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
419 479
420 my $busy = 1; 480 my $busy = 1;
421 my @res; 481 my @res;
422 482
423 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 485 @res = eval { $job->() };
425 warn $@ if $@; 486 warn $@ if $@;
426 undef $busy; 487 undef $busy;
427 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
428 489
429 while ($busy) { 490 while ($busy) {
430 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
431 } 495 }
496 }
432 497
433 $time = Event::time - $time; 498 my $time = EV::time - $time;
434 499
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 500 $TICK_START += $time; # do not account sync jobs to server load
439 501
440 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
441 } else { 503 } else {
442 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
443 505
468=item fork_call { }, $args 530=item fork_call { }, $args
469 531
470Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
474 536
475=cut 537=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 538
486sub fork_call(&@) { 539sub fork_call(&@) {
487 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
488 541
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 542 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 545
494 if (my $pid = fork) { 546 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; 547 reset_signals;
508 local $SIG{__WARN__}; 548 &$cb
509 local $SIG{__DIE__}; 549 }, @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 550
516 eval { 551 wantarray ? @res : $res[-1]
517 close $fh1; 552}
518 553
519 my @res = eval { $cb->(@args) }; 554=item $coin = coin_from_name $name
520 555
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 556=cut
522 close $fh2;
523 };
524 557
525 warn $@ if $@; 558our %coin_alias = (
526 _exit 0; 559 "silver" => "silvercoin",
527 } 560 "silvercoin" => "silvercoin",
561 "silvercoins" => "silvercoin",
562 "gold" => "goldcoin",
563 "goldcoin" => "goldcoin",
564 "goldcoins" => "goldcoin",
565 "platinum" => "platinacoin",
566 "platinumcoin" => "platinacoin",
567 "platinumcoins" => "platinacoin",
568 "platina" => "platinacoin",
569 "platinacoin" => "platinacoin",
570 "platinacoins" => "platinacoin",
571 "royalty" => "royalty",
572 "royalties" => "royalty",
573);
574
575sub coin_from_name($) {
576 $coin_alias{$_[0]}
577 ? cf::arch::find $coin_alias{$_[0]}
578 : undef
528} 579}
529 580
530=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
531 582
532Returns a single value from the environment database. 583Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 585=item cf::db_put $family => $key => $value
535 586
536Stores the given C<$value> in the family. It can currently store binary 587Stores 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). 588data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 589
590=item $db = cf::db_table "name"
591
592Create and/or open a new database table. The string must not be "db" and must be unique
593within each server.
594
539=cut 595=cut
596
597sub db_table($) {
598 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV;
600
601 eval {
602 $db->set_flags (BDB::CHKSUM);
603
604 utf8::encode $name;
605 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
606 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
607 cf::cleanup "db_open(db): $!" if $!;
608 };
609 cf::cleanup "db_open(db): $@" if $@;
610
611 $db
612}
540 613
541our $DB; 614our $DB;
542 615
543sub db_init { 616sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 617 cf::sync_job {
548 eval { 618 $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 } 619 };
558} 620}
559 621
560sub db_get($$) { 622sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 623 my $key = "$_[0]/$_[1]";
562 624
612 if (1) { 674 if (1) {
613 $md5 = 675 $md5 =
614 join "\x00", 676 join "\x00",
615 $processversion, 677 $processversion,
616 map { 678 map {
617 Coro::cede; 679 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 680 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 681 } 0.. $#$src;
620 682
621 683
622 my $dbmd5 = db_get cache => "$id/md5"; 684 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
668 730
669In the following description, CLASS can be any of C<global>, C<object> 731In 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 732C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 733Deliantra).
672 734
673=over 4 735=over 4
674 736
675=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
676 738
958 } 1020 }
959 1021
960 0 1022 0
961} 1023}
962 1024
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1026
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1028
967Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
968 1030
974 1036
975=cut 1037=cut
976 1038
977############################################################################# 1039#############################################################################
978# object support 1040# object support
979#
980 1041
1042sub _object_equal($$);
1043sub _object_equal($$) {
1044 my ($a, $b) = @_;
1045
1046 return 0 unless (ref $a) eq (ref $b);
1047
1048 if ("HASH" eq ref $a) {
1049 my @ka = keys %$a;
1050 my @kb = keys %$b;
1051
1052 return 0 if @ka != @kb;
1053
1054 for (0 .. $#ka) {
1055 return 0 unless $ka[$_] eq $kb[$_];
1056 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1057 }
1058
1059 } elsif ("ARRAY" eq ref $a) {
1060
1061 return 0 if @$a != @$b;
1062
1063 for (0 .. $#$a) {
1064 return 0 unless _object_equal $a->[$_], $b->[$_];
1065 }
1066
1067 } elsif ($a ne $b) {
1068 return 0;
1069 }
1070
1071 1
1072}
1073
1074our $SLOW_MERGES;#d#
981sub _can_merge { 1075sub _can_merge {
982 my ($ob1, $ob2) = @_; 1076 my ($ob1, $ob2) = @_;
983 1077
984 local $Storable::canonical = 1; 1078 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1079
988 $fob1 eq $fob2 1080 # we do the slow way here
1081 return _object_equal $ob1, $ob2
989} 1082}
990 1083
991sub reattach { 1084sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1086 my ($obj) = @_;
1015cf::attachable->attach ( 1108cf::attachable->attach (
1016 prio => -1000000, 1109 prio => -1000000,
1017 on_instantiate => sub { 1110 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
1019 1112
1020 $data = from_json $data; 1113 $data = decode_json $data;
1021 1114
1022 for (@$data) { 1115 for (@$data) {
1023 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
1024 1117
1025 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1134sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1135 my ($filename, $rdata, $objs) = @_;
1043 1136
1044 sync_job { 1137 sync_job {
1045 if (length $$rdata) { 1138 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1140 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1141 $decname, length $$rdata, scalar @$objs;
1048 1142
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1144 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1146 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1147 close $fh;
1054 1148
1055 if (@$objs) { 1149 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1155 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1157 }
1071 } 1165 }
1072 } else { 1166 } else {
1073 aio_unlink $filename; 1167 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1075 } 1169 }
1076 } 1170 };
1077} 1171}
1078 1172
1079sub object_freezer_as_string { 1173sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1174 my ($rdata, $objs) = @_;
1081 1175
1093 or return; 1187 or return;
1094 1188
1095 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1191 or return;
1192
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1099 } 1195 }
1100 1196
1197 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1200
1103 return ($data, $av); 1201 ($data, $av)
1104} 1202}
1105 1203
1106=head2 COMMAND CALLBACKS 1204=head2 COMMAND CALLBACKS
1107 1205
1108=over 4 1206=over 4
1186 my ($type, $reply, @payload) = 1284 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1285 "ARRAY" eq ref $msg
1188 ? @$msg 1286 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1287 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1288
1289 my @reply;
1290
1191 if (my $cb = $EXTCMD{$type}) { 1291 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1292 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1293 }
1294
1295 $pl->ext_reply ($reply, @reply)
1296 if $reply;
1297
1197 } else { 1298 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1300 }
1200 1301
1201 cf::override; 1302 cf::override;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1256 1357
1257 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1359 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1361 }
1262 1362
1263 warn $msg; 1363 warn $msg;
1264 } 1364 }
1265 1365
1290use Coro::AIO; 1390use Coro::AIO;
1291 1391
1292=head3 cf::player 1392=head3 cf::player
1293 1393
1294=over 4 1394=over 4
1395
1396=item cf::player::num_playing
1397
1398Returns the official number of playing players, as per the Crossfire metaserver rules.
1399
1400=cut
1401
1402sub num_playing {
1403 scalar grep
1404 $_->ob->map
1405 && !$_->hidden
1406 && !$_->ob->flag (cf::FLAG_WIZ),
1407 cf::player::list
1408}
1295 1409
1296=item cf::player::find $login 1410=item cf::player::find $login
1297 1411
1298Returns the given player object, loading it if necessary (might block). 1412Returns the given player object, loading it if necessary (might block).
1299 1413
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1449 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1450 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1451 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1452 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1453
1340 my $pl = load_pl path $login 1454 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1455 or return;
1456
1457 my $pl = cf::player::load_pl $f
1458 or return;
1459 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1461 $cf::PLAYER{$login} = $pl
1343 } 1462 }
1344 } 1463 }
1345} 1464}
1346 1465
1356 1475
1357 aio_mkdir playerdir $pl, 0770; 1476 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1477 $pl->{last_save} = $cf::RUNTIME;
1359 1478
1360 $pl->save_pl ($path); 1479 $pl->save_pl ($path);
1361 Coro::cede; 1480 cf::cede_to_tick;
1362} 1481}
1363 1482
1364sub new($) { 1483sub new($) {
1365 my ($login) = @_; 1484 my ($login) = @_;
1366 1485
1370 $self->{deny_save} = 1; 1489 $self->{deny_save} = 1;
1371 1490
1372 $cf::PLAYER{$login} = $self; 1491 $cf::PLAYER{$login} = $self;
1373 1492
1374 $self 1493 $self
1494}
1495
1496=item $player->send_msg ($channel, $msg, $color, [extra...])
1497
1498=cut
1499
1500sub send_msg {
1501 my $ns = shift->ns
1502 or return;
1503 $ns->send_msg (@_);
1375} 1504}
1376 1505
1377=item $pl->quit_character 1506=item $pl->quit_character
1378 1507
1379Nukes the player without looking back. If logged in, the connection will 1508Nukes the player without looking back. If logged in, the connection will
1434 or return []; 1563 or return [];
1435 1564
1436 my @logins; 1565 my @logins;
1437 1566
1438 for my $login (@$dirs) { 1567 for my $login (@$dirs) {
1568 my $path = path $login;
1569
1570 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1573 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1574 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 }
1442 1576
1443 utf8::decode $login; 1577 utf8::decode $login;
1444 push @logins, $login; 1578 push @logins, $login;
1445 } 1579 }
1446 1580
1479 1613
1480Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1481 1615
1482=cut 1616=cut
1483 1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1484sub expand_cfpod { 1629sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1486 1631
1487 # escape & and < 1632 my $xml;
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490 1633
1491 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1492 1637
1493 1 while 1638 $group =~ s/&/&amp;/g;
1494 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1498 # replace G<male|female> tags 1643 ([BCGHITU])
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1644 <
1500 $self->gender ? $2 : $1 1645 (?:
1501 }ge 1646 ([^<>]*) (?{ $group = $^N })
1502 # replace H<hint text> 1647 | < $interior >
1503 || s{H<([^\>]*)>} 1648 )
1649 >
1650 %gcsx
1504 { 1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1671 "")
1508 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1510 1683
1684 for ($xml) {
1511 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1513 1687
1514 # compress some whitespace 1688 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1519 1694
1520 $_ 1695 $xml
1521} 1696}
1697
1698no re 'eval';
1522 1699
1523sub hintmode { 1700sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1702 $_[0]{hintmode}
1526} 1703}
1532=cut 1709=cut
1533 1710
1534sub ext_reply($$@) { 1711sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1712 my ($self, $id, @msg) = @_;
1536 1713
1537 if ($self->ns->extcmd == 2) { 1714 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1715}
1545 1716
1546=item $player->ext_msg ($type, @msg) 1717=item $player->ext_msg ($type, @msg)
1547 1718
1548Sends an ext event to the client. 1719Sends an ext event to the client.
1604our $MAX_RESET = 3600; 1775our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1776our $DEFAULT_RESET = 3000;
1606 1777
1607sub generate_random_map { 1778sub generate_random_map {
1608 my ($self, $rmp) = @_; 1779 my ($self, $rmp) = @_;
1780
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782
1609 # mit "rum" bekleckern, nicht 1783 # mit "rum" bekleckern, nicht
1610 $self->_create_random_map ( 1784 $self->_create_random_map (
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1735 1909
1736# the temporary/swap location 1910# the temporary/swap location
1737sub save_path { 1911sub save_path {
1738 my ($self) = @_; 1912 my ($self) = @_;
1739 1913
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 1915 "$TMPDIR/$path.map"
1742} 1916}
1743 1917
1744# the unique path, undef == no special unique path 1918# the unique path, undef == no special unique path
1745sub uniq_path { 1919sub uniq_path {
1746 my ($self) = @_; 1920 my ($self) = @_;
1747 1921
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 1923 "$UNIQUEDIR/$path"
1750} 1924}
1751 1925
1752# and all this just because we cannot iterate over 1926# and all this just because we cannot iterate over
1753# all maps in C++... 1927# all maps in C++...
1776 1950
1777sub load_header_from($) { 1951sub load_header_from($) {
1778 my ($self, $path) = @_; 1952 my ($self, $path) = @_;
1779 1953
1780 utf8::encode $path; 1954 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1955 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1956 or return;
1957
1958 $self->_load_header ($f)
1959 or return;
1960
1961 local $MAP_LOADING{$self->{path}} = $self;
1962 $f->resolve_delayed_derefs;
1786 1963
1787 $self->{load_path} = $path; 1964 $self->{load_path} = $path;
1788 1965
1789 1 1966 1
1790} 1967}
1844sub find { 2021sub find {
1845 my ($path, $origin) = @_; 2022 my ($path, $origin) = @_;
1846 2023
1847 $path = normalise $path, $origin && $origin->path; 2024 $path = normalise $path, $origin && $origin->path;
1848 2025
2026 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 2027 cf::lock_wait "map_find:$path";
1850 2028
1851 $cf::MAP{$path} || do { 2029 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path"; 2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
1853 my $map = new_from_path cf::map $path 2033 my $map = new_from_path cf::map $path
1854 or return; 2034 or return;
1855 2035
1856 $map->{last_save} = $cf::RUNTIME; 2036 $map->{last_save} = $cf::RUNTIME;
1857 2037
1859 or return; 2039 or return;
1860 2040
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 2042 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 2043 #$cf::WAIT_FOR_TICK->wait;
2044 undef $guard1;
2045 undef $guard2;
1864 $map->reset; 2046 $map->reset;
1865 undef $guard;
1866 return find $path; 2047 return find $path;
1867 } 2048 }
1868 2049
1869 $cf::MAP{$path} = $map 2050 $cf::MAP{$path} = $map
1870 } 2051 }
1879 local $self->{deny_reset} = 1; # loading can take a long time 2060 local $self->{deny_reset} = 1; # loading can take a long time
1880 2061
1881 my $path = $self->{path}; 2062 my $path = $self->{path};
1882 2063
1883 { 2064 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2065 my $guard = cf::lock_acquire "map_data:$path";
1885 2066
2067 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2068 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2069
1888 $self->in_memory (cf::MAP_LOADING); 2070 $self->in_memory (cf::MAP_LOADING);
1889 2071
1890 $self->alloc; 2072 $self->alloc;
1891 2073
1892 $self->pre_load; 2074 $self->pre_load;
1893 Coro::cede; 2075 cf::cede_to_tick;
1894 2076
2077 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2079 $self->_load_objects ($f)
1896 or return; 2080 or return;
1897 2081
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 2083 if delete $self->{load_original};
1900 2084
1901 if (my $uniq = $self->uniq_path) { 2085 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2086 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2087 unless (aio_stat $uniq) {
2088 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2089 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2090 $self->_load_objects ($f);
2091 $f->resolve_delayed_derefs;
2092 }
1906 } 2093 }
1907 } 2094 }
1908 2095
1909 Coro::cede; 2096 $f->resolve_delayed_derefs;
2097
2098 cf::cede_to_tick;
1910 # now do the right thing for maps 2099 # now do the right thing for maps
1911 $self->link_multipart_objects; 2100 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2101 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2102 unless $self->difficulty;
1914 Coro::cede; 2103 cf::cede_to_tick;
1915 2104
1916 unless ($self->{deny_activate}) { 2105 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2106 $self->decay_objects;
1918 $self->fix_auto_apply; 2107 $self->fix_auto_apply;
1919 $self->update_buttons; 2108 $self->update_buttons;
1920 Coro::cede; 2109 cf::cede_to_tick;
1921 $self->set_darkness_map; 2110 $self->set_darkness_map;
1922 Coro::cede; 2111 cf::cede_to_tick;
1923 $self->activate; 2112 $self->activate;
1924 } 2113 }
1925 2114
1926 $self->{last_save} = $cf::RUNTIME; 2115 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME); 2116 $self->last_access ($cf::RUNTIME);
1943 2132
1944 $self 2133 $self
1945} 2134}
1946 2135
1947# find and load all maps in the 3x3 area around a map 2136# find and load all maps in the 3x3 area around a map
1948sub load_diag { 2137sub load_neighbours {
1949 my ($map) = @_; 2138 my ($map) = @_;
1950 2139
1951 my @diag; # diagonal neighbours 2140 my @neigh; # diagonal neighbours
1952 2141
1953 for (0 .. 3) { 2142 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 2143 my $neigh = $map->tile_path ($_)
1955 or next; 2144 or next;
1956 $neigh = find $neigh, $map 2145 $neigh = find $neigh, $map
1957 or next; 2146 or next;
1958 $neigh->load; 2147 $neigh->load;
1959 2148
2149 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2150 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2151 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 2152 }
1963 2153
1964 for (@diag) { 2154 for (grep defined $_->[0], @neigh) {
2155 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 2156 my $neigh = find $path, $origin
1966 or next; 2157 or next;
1967 $neigh->load; 2158 $neigh->load;
1968 } 2159 }
1969} 2160}
1970 2161
1975} 2166}
1976 2167
1977sub do_load_sync { 2168sub do_load_sync {
1978 my ($map) = @_; 2169 my ($map) = @_;
1979 2170
2171 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2172 if $Coro::current == $Coro::main;
2173
1980 cf::sync_job { $map->load }; 2174 cf::sync_job { $map->load };
1981} 2175}
1982 2176
1983our %MAP_PREFETCH; 2177our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 2178our $MAP_PREFETCHER = undef;
1985 2179
1986sub find_async { 2180sub find_async {
1987 my ($path, $origin) = @_; 2181 my ($path, $origin, $load) = @_;
1988 2182
1989 $path = normalise $path, $origin && $origin->{path}; 2183 $path = normalise $path, $origin && $origin->{path};
1990 2184
1991 if (my $map = $cf::MAP{$path}) { 2185 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993 } 2187 }
1994 2188
1995 undef $MAP_PREFETCH{$path}; 2189 $MAP_PREFETCH{$path} |= $load;
2190
1996 $MAP_PREFETCHER ||= cf::async { 2191 $MAP_PREFETCHER ||= cf::async {
2192 $Coro::current->{desc} = "map prefetcher";
2193
1997 while (%MAP_PREFETCH) { 2194 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 2195 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 2196 if (my $map = find $k) {
2000 $map->load; 2197 $map->load if $v;
2001 } 2198 }
2002 2199
2003 delete $MAP_PREFETCH{$path}; 2200 delete $MAP_PREFETCH{$k};
2004 } 2201 }
2005 } 2202 }
2006 undef $MAP_PREFETCHER; 2203 undef $MAP_PREFETCHER;
2007 }; 2204 };
2008 $MAP_PREFETCHER->prio (6); 2205 $MAP_PREFETCHER->prio (6);
2011} 2208}
2012 2209
2013sub save { 2210sub save {
2014 my ($self) = @_; 2211 my ($self) = @_;
2015 2212
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 2214
2018 $self->{last_save} = $cf::RUNTIME; 2215 $self->{last_save} = $cf::RUNTIME;
2019 2216
2020 return unless $self->dirty; 2217 return unless $self->dirty;
2021 2218
2027 return if $self->{deny_save}; 2224 return if $self->{deny_save};
2028 2225
2029 local $self->{last_access} = $self->last_access;#d# 2226 local $self->{last_access} = $self->last_access;#d#
2030 2227
2031 cf::async { 2228 cf::async {
2229 $Coro::current->{desc} = "map player save";
2032 $_->contr->save for $self->players; 2230 $_->contr->save for $self->players;
2033 }; 2231 };
2034 2232
2035 if ($uniq) { 2233 if ($uniq) {
2036 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2044 my ($self) = @_; 2242 my ($self) = @_;
2045 2243
2046 # save first because save cedes 2244 # save first because save cedes
2047 $self->save; 2245 $self->save;
2048 2246
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2247 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2248
2051 return if $self->players; 2249 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2250 return if $self->in_memory != cf::MAP_IN_MEMORY;
2053 return if $self->{deny_save}; 2251 return if $self->{deny_save};
2054 2252
2253 $self->in_memory (cf::MAP_SWAPPED);
2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
2055 $self->clear; 2257 $self->clear;
2056 $self->in_memory (cf::MAP_SWAPPED);
2057} 2258}
2058 2259
2059sub reset_at { 2260sub reset_at {
2060 my ($self) = @_; 2261 my ($self) = @_;
2061 2262
2093 if $uniq; 2294 if $uniq;
2094 } 2295 }
2095 2296
2096 delete $cf::MAP{$self->path}; 2297 delete $cf::MAP{$self->path};
2097 2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
2098 $self->clear; 2301 $self->clear;
2099
2100 $_->clear_links_to ($self) for values %cf::MAP;
2101 2302
2102 $self->unlink_save; 2303 $self->unlink_save;
2103 $self->destroy; 2304 $self->destroy;
2104} 2305}
2105 2306
2106my $nuke_counter = "aaaa"; 2307my $nuke_counter = "aaaa";
2107 2308
2108sub nuke { 2309sub nuke {
2109 my ($self) = @_; 2310 my ($self) = @_;
2110 2311
2312 {
2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2314
2111 delete $cf::MAP{$self->path}; 2315 delete $cf::MAP{$self->path};
2112 2316
2113 $self->unlink_save; 2317 $self->unlink_save;
2114 2318
2115 bless $self, "cf::map"; 2319 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2320 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2321 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2322 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2323 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2324
2121 $cf::MAP{$self->path} = $self; 2325 $cf::MAP{$self->path} = $self;
2326 }
2122 2327
2123 $self->reset; # polite request, might not happen 2328 $self->reset; # polite request, might not happen
2124} 2329}
2125 2330
2126=item $maps = cf::map::tmp_maps 2331=item $maps = cf::map::tmp_maps
2168 2373
2169sub unique_maps() { 2374sub unique_maps() {
2170 [ 2375 [
2171 map { 2376 map {
2172 utf8::decode $_; 2377 utf8::decode $_;
2173 /\.map$/ 2378 s/\.map$//; # TODO future compatibility hack
2379 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2380 ? ()
2174 ? normalise $_ 2381 : normalise $_
2175 : ()
2176 } @{ aio_readdir $UNIQUEDIR or [] } 2382 } @{ aio_readdir $UNIQUEDIR or [] }
2177 ] 2383 ]
2178} 2384}
2179 2385
2180package cf;
2181
2182=back 2386=back
2183 2387
2184=head3 cf::object 2388=head3 cf::object
2185 2389
2186=cut 2390=cut
2189 2393
2190=over 4 2394=over 4
2191 2395
2192=item $ob->inv_recursive 2396=item $ob->inv_recursive
2193 2397
2194Returns the inventory of the object _and_ their inventories, recursively. 2398Returns the inventory of the object I<and> their inventories, recursively,
2399but I<not> the object itself.
2195 2400
2196=cut 2401=cut
2197 2402
2198sub inv_recursive_; 2403sub inv_recursive_;
2199sub inv_recursive_ { 2404sub inv_recursive_ {
2200 map { $_, inv_recursive_ $_->inv } @_ 2405 map { $_, inv_recursive_ $_->inv } @_
2201} 2406}
2202 2407
2203sub inv_recursive { 2408sub inv_recursive {
2204 inv_recursive_ inv $_[0] 2409 inv_recursive_ inv $_[0]
2410}
2411
2412=item $ref = $ob->ref
2413
2414Creates and returns a persistent reference to an object that can be stored as a string.
2415
2416=item $ob = cf::object::deref ($refstring)
2417
2418returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2419even if the object actually exists. May block.
2420
2421=cut
2422
2423sub deref {
2424 my ($ref) = @_;
2425
2426 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2427 my ($uuid, $name) = ($1, $2);
2428 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2429 or return;
2430 $pl->ob->uuid eq $uuid
2431 or return;
2432
2433 $pl->ob
2434 } else {
2435 warn "$ref: cannot resolve object reference\n";
2436 undef
2437 }
2205} 2438}
2206 2439
2207package cf; 2440package cf;
2208 2441
2209=back 2442=back
2243 $self->message ($msg, $flags); 2476 $self->message ($msg, $flags);
2244 } 2477 }
2245 } 2478 }
2246} 2479}
2247 2480
2481=item $object->send_msg ($channel, $msg, $color, [extra...])
2482
2483=cut
2484
2485sub cf::object::send_msg {
2486 my $pl = shift->contr
2487 or return;
2488 $pl->send_msg (@_);
2489}
2490
2248=item $player_object->may ("access") 2491=item $player_object->may ("access")
2249 2492
2250Returns wether the given player is authorized to access resource "access" 2493Returns wether the given player is authorized to access resource "access"
2251(e.g. "command_wizcast"). 2494(e.g. "command_wizcast").
2252 2495
2329 # use -1 or undef as default coordinates, not 0, 0 2572 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2573 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2574 if $x <=0 && $y <= 0;
2332 2575
2333 $map->load; 2576 $map->load;
2334 $map->load_diag; 2577 $map->load_neighbours;
2335 2578
2336 return unless $self->contr->active; 2579 return unless $self->contr->active;
2337 $self->activate_recursive; 2580 $self->activate_recursive;
2338 2581
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2582 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2602 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2603
2361 $self->enter_link; 2604 $self->enter_link;
2362 2605
2363 (async { 2606 (async {
2607 $Coro::current->{desc} = "player::goto $path $x $y";
2608
2609 # *tag paths override both path and x|y
2610 if ($path =~ /^\*(.*)$/) {
2611 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2612 my $ob = $obs[rand @obs];
2613
2614 # see if we actually can go there
2615 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2616 $ob = $obs[rand @obs];
2617 } else {
2618 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2619 }
2620 # else put us there anyways for now #d#
2621
2622 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2623 } else {
2624 ($path, $x, $y) = (undef, undef, undef);
2625 }
2626 }
2627
2364 my $map = eval { 2628 my $map = eval {
2365 my $map = cf::map::find $path; 2629 my $map = defined $path ? cf::map::find $path : undef;
2366 2630
2367 if ($map) { 2631 if ($map) {
2368 $map = $map->customise_for ($self); 2632 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2633 $map = $check->($map) if $check && $map;
2370 } else { 2634 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2635 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372 } 2636 }
2373 2637
2374 $map 2638 $map
2375 }; 2639 };
2376 2640
2429 $rmp->{origin_y} = $exit->y; 2693 $rmp->{origin_y} = $exit->y;
2430 } 2694 }
2431 2695
2432 $rmp->{random_seed} ||= $exit->random_seed; 2696 $rmp->{random_seed} ||= $exit->random_seed;
2433 2697
2434 my $data = cf::to_json $rmp; 2698 my $data = cf::encode_json $rmp;
2435 my $md5 = Digest::MD5::md5_hex $data; 2699 my $md5 = Digest::MD5::md5_hex $data;
2436 my $meta = "$RANDOMDIR/$md5.meta"; 2700 my $meta = "$RANDOMDIR/$md5.meta";
2437 2701
2438 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2439 aio_write $fh, 0, (length $data), $data, 0; 2703 aio_write $fh, 0, (length $data), $data, 0;
2466 # if exit is damned, update players death & WoR home-position 2730 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp) 2731 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED); 2732 if $exit->flag (FLAG_DAMNED);
2469 2733
2470 (async { 2734 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2736
2471 $self->deactivate_recursive; # just to be sure 2737 $self->deactivate_recursive; # just to be sure
2472 unless (eval { 2738 unless (eval {
2473 $self->goto ($slaying, $hp, $sp); 2739 $self->goto ($slaying, $hp, $sp);
2474 2740
2475 1; 2741 1;
2510the message, with C<log> being the default. If C<$color> is negative, suppress 2776the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 2777the message unless the client supports the msg packet.
2512 2778
2513=cut 2779=cut
2514 2780
2781# non-persistent channels (usually the info channel)
2782our %CHANNEL = (
2783 "c/identify" => {
2784 id => "infobox",
2785 title => "Identify",
2786 reply => undef,
2787 tooltip => "Items recently identified",
2788 },
2789 "c/examine" => {
2790 id => "infobox",
2791 title => "Examine",
2792 reply => undef,
2793 tooltip => "Signs and other items you examined",
2794 },
2795 "c/book" => {
2796 id => "infobox",
2797 title => "Book",
2798 reply => undef,
2799 tooltip => "The contents of a note or book",
2800 },
2801 "c/lookat" => {
2802 id => "infobox",
2803 title => "Look",
2804 reply => undef,
2805 tooltip => "What you saw there",
2806 },
2807 "c/who" => {
2808 id => "infobox",
2809 title => "Players",
2810 reply => undef,
2811 tooltip => "Shows players who are currently online",
2812 },
2813 "c/body" => {
2814 id => "infobox",
2815 title => "Body Parts",
2816 reply => undef,
2817 tooltip => "Shows which body parts you posess and are available",
2818 },
2819 "c/uptime" => {
2820 id => "infobox",
2821 title => "Uptime",
2822 reply => undef,
2823 tooltip => "How long the server has been running since last restart",
2824 },
2825 "c/mapinfo" => {
2826 id => "infobox",
2827 title => "Map Info",
2828 reply => undef,
2829 tooltip => "Information related to the maps",
2830 },
2831);
2832
2515sub cf::client::send_msg { 2833sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 2834 my ($self, $channel, $msg, $color, @extra) = @_;
2517 2835
2518 $msg = $self->pl->expand_cfpod ($msg); 2836 $msg = $self->pl->expand_cfpod ($msg);
2519 2837
2520 $color &= cf::NDI_CLIENT_MASK; # just in case... 2838 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521 2839
2840 # check predefined channels, for the benefit of C
2841 if ($CHANNEL{$channel}) {
2842 $channel = $CHANNEL{$channel};
2843
2844 $self->ext_msg (channel_info => $channel)
2845 if $self->can_msg;
2846
2847 $channel = $channel->{id};
2848
2522 if (ref $channel) { 2849 } elsif (ref $channel) {
2523 # send meta info to client, if not yet sent 2850 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 2851 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 2852 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 2853 $self->ext_msg (channel_info => $channel)
2854 if $self->can_msg;
2527 } 2855 }
2528 2856
2529 $channel = $channel->{id}; 2857 $channel = $channel->{id};
2530 } 2858 }
2531 2859
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2878 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 } 2879 }
2552 2880
2553 $color &= cf::NDI_COLOR_MASK; 2881 $color &= cf::NDI_COLOR_MASK;
2554 2882
2883 utf8::encode $msg;
2884
2555 if (0 && $msg =~ /\[/) { 2885 if (0 && $msg =~ /\[/) {
2886 # COMMAND/INFO
2556 $self->send_packet ("drawextinfo $color 4 0 $msg") 2887 $self->send_packet ("drawextinfo $color 10 8 $msg")
2557 } else { 2888 } else {
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2889 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559 $self->send_packet ("drawinfo $color $msg") 2890 $self->send_packet ("drawinfo $color $msg")
2560 } 2891 }
2561 } 2892 }
2569=cut 2900=cut
2570 2901
2571sub cf::client::ext_msg($$@) { 2902sub cf::client::ext_msg($$@) {
2572 my ($self, $type, @msg) = @_; 2903 my ($self, $type, @msg) = @_;
2573 2904
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) { 2905 if ($self->extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2906 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove 2907 } elsif ($self->extcmd == 1) { # TODO: remove
2579 push @msg, msgtype => "event_$type"; 2908 push @msg, msgtype => "event_$type";
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2910 }
2911}
2912
2913=item $client->ext_reply ($msgid, @msg)
2914
2915Sends an ext reply to the client.
2916
2917=cut
2918
2919sub cf::client::ext_reply($$@) {
2920 my ($self, $id, @msg) = @_;
2921
2922 if ($self->extcmd == 2) {
2923 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2924 } elsif ($self->extcmd == 1) {
2925 #TODO: version 1, remove
2926 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2927 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2928 }
2582} 2929}
2583 2930
2584=item $success = $client->query ($flags, "text", \&cb) 2931=item $success = $client->query ($flags, "text", \&cb)
2646 my ($type, $reply, @payload) = 2993 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2994 "ARRAY" eq ref $msg
2648 ? @$msg 2995 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2996 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2997
2998 my @reply;
2999
2651 if (my $cb = $EXTICMD{$type}) { 3000 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 3001 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 3002 }
3003
3004 $ns->ext_reply ($reply, @reply)
3005 if $reply;
3006
2657 } else { 3007 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3008 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 3009 }
2660 3010
2661 cf::override; 3011 cf::override;
2708our $safe = new Safe "safe"; 3058our $safe = new Safe "safe";
2709our $safe_hole = new Safe::Hole; 3059our $safe_hole = new Safe::Hole;
2710 3060
2711$SIG{FPE} = 'IGNORE'; 3061$SIG{FPE} = 'IGNORE';
2712 3062
2713$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3063$safe->permit_only (Opcode::opset qw(
3064 :base_core :base_mem :base_orig :base_math
3065 grepstart grepwhile mapstart mapwhile
3066 sort time
3067));
2714 3068
2715# here we export the classes and methods available to script code 3069# here we export the classes and methods available to script code
2716 3070
2717=pod 3071=pod
2718 3072
2719The following functions and methods are available within a safe environment: 3073The following functions and methods are available within a safe environment:
2720 3074
2721 cf::object 3075 cf::object
2722 contr pay_amount pay_player map x y force_find force_add 3076 contr pay_amount pay_player map x y force_find force_add destroy
2723 insert remove 3077 insert remove name archname title slaying race decrease_ob_nr
2724 3078
2725 cf::object::player 3079 cf::object::player
2726 player 3080 player
2727 3081
2728 cf::player 3082 cf::player
2733 3087
2734=cut 3088=cut
2735 3089
2736for ( 3090for (
2737 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3091 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3092 insert remove inv name archname title slaying race
2738 insert remove)], 3093 decrease_ob_nr destroy)],
2739 ["cf::object::player" => qw(player)], 3094 ["cf::object::player" => qw(player)],
2740 ["cf::player" => qw(peaceful)], 3095 ["cf::player" => qw(peaceful)],
2741 ["cf::map" => qw(trigger)], 3096 ["cf::map" => qw(trigger)],
2742) { 3097) {
2743 no strict 'refs'; 3098 no strict 'refs';
2819# the server's init and main functions 3174# the server's init and main functions
2820 3175
2821sub load_facedata($) { 3176sub load_facedata($) {
2822 my ($path) = @_; 3177 my ($path) = @_;
2823 3178
3179 # HACK to clear player env face cache, we need some signal framework
3180 # for this (global event?)
3181 %ext::player_env::MUSIC_FACE_CACHE = ();
3182
3183 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3184
2824 warn "loading facedata from $path\n"; 3185 warn "loading facedata from $path\n";
2825 3186
2826 my $facedata; 3187 my $facedata;
2827 0 < aio_load $path, $facedata 3188 0 < aio_load $path, $facedata
2828 or die "$path: $!"; 3189 or die "$path: $!";
2830 $facedata = Coro::Storable::thaw $facedata; 3191 $facedata = Coro::Storable::thaw $facedata;
2831 3192
2832 $facedata->{version} == 2 3193 $facedata->{version} == 2
2833 or cf::cleanup "$path: version mismatch, cannot proceed."; 3194 or cf::cleanup "$path: version mismatch, cannot proceed.";
2834 3195
3196 # patch in the exptable
3197 $facedata->{resource}{"res/exp_table"} = {
3198 type => FT_RSRC,
3199 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3200 };
3201 cf::cede_to_tick;
3202
2835 { 3203 {
2836 my $faces = $facedata->{faceinfo}; 3204 my $faces = $facedata->{faceinfo};
2837 3205
2838 while (my ($face, $info) = each %$faces) { 3206 while (my ($face, $info) = each %$faces) {
2839 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3207 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3208
2840 cf::face::set_visibility $idx, $info->{visibility}; 3209 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap}; 3210 cf::face::set_magicmap $idx, $info->{magicmap};
2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3211 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3212 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2844 3213
2845 cf::cede_to_tick; 3214 cf::cede_to_tick;
2846 } 3215 }
2847 3216
2848 while (my ($face, $info) = each %$faces) { 3217 while (my ($face, $info) = each %$faces) {
2849 next unless $info->{smooth}; 3218 next unless $info->{smooth};
3219
2850 my $idx = cf::face::find $face 3220 my $idx = cf::face::find $face
2851 or next; 3221 or next;
3222
2852 if (my $smooth = cf::face::find $info->{smooth}) { 3223 if (my $smooth = cf::face::find $info->{smooth}) {
2853 cf::face::set_smooth $idx, $smooth; 3224 cf::face::set_smooth $idx, $smooth;
2854 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3225 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2855 } else { 3226 } else {
2856 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3227 warn "smooth face '$info->{smooth}' not found for face '$face'";
2873 3244
2874 { 3245 {
2875 # TODO: for gcfclient pleasure, we should give resources 3246 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index. 3247 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource}; 3248 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879
2880 my $soundconf = delete $res->{"res/sound.conf"};
2881 3249
2882 while (my ($name, $info) = each %$res) { 3250 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({ 3251 if (defined $info->{type}) {
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3252 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3253 my $data;
2889 3254
2890 if ($info->{type} & 1) { 3255 if ($info->{type} & 1) {
2891 # prepend meta info 3256 # prepend meta info
2892 3257
3258 my $meta = $enc->encode ({
3259 name => $name,
3260 %{ $info->{meta} || {} },
3261 });
3262
2893 my $data = pack "(w/a*)*", $meta, $info->{data}; 3263 $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3264 } else {
3265 $data = $info->{data};
3266 }
2895 3267
2896 cf::face::set_data $idx, 0, $data, $chk; 3268 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3269 cf::face::set_type $idx, $info->{type};
2897 } else { 3270 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3271 $RESOURCE{$name} = $info;
2899 } 3272 }
2900 3273
2901 cf::face::set_type $idx, $info->{type};
2902
2903 cf::cede_to_tick; 3274 cf::cede_to_tick;
2904 } 3275 }
2905
2906 if ($soundconf) {
2907 $soundconf = $enc->decode (delete $soundconf->{data});
2908
2909 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2910 my $sound = $soundconf->{compat}[$_]
2911 or next;
2912
2913 my $face = cf::face::find "sound/$sound->[1]";
2914 cf::sound::set $sound->[0] => $face;
2915 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2916 }
2917
2918 while (my ($k, $v) = each %{$soundconf->{event}}) {
2919 my $face = cf::face::find "sound/$v";
2920 cf::sound::set $k => $face;
2921 }
2922 }
2923 } 3276 }
3277
3278 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2924 3279
2925 1 3280 1
2926} 3281}
3282
3283cf::global->attach (on_resource_update => sub {
3284 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3285 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3286
3287 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3288 my $sound = $soundconf->{compat}[$_]
3289 or next;
3290
3291 my $face = cf::face::find "sound/$sound->[1]";
3292 cf::sound::set $sound->[0] => $face;
3293 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3294 }
3295
3296 while (my ($k, $v) = each %{$soundconf->{event}}) {
3297 my $face = cf::face::find "sound/$v";
3298 cf::sound::set $k => $face;
3299 }
3300 }
3301});
2927 3302
2928register_exticmd fx_want => sub { 3303register_exticmd fx_want => sub {
2929 my ($ns, $want) = @_; 3304 my ($ns, $want) = @_;
2930 3305
2931 while (my ($k, $v) = each %$want) { 3306 while (my ($k, $v) = each %$want) {
2932 $ns->fx_want ($k, $v); 3307 $ns->fx_want ($k, $v);
2933 } 3308 }
2934}; 3309};
2935 3310
2936sub reload_regions { 3311sub reload_regions {
3312 # HACK to clear player env face cache, we need some signal framework
3313 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = ();
3315
2937 load_resource_file "$MAPDIR/regions" 3316 load_resource_file "$MAPDIR/regions"
2938 or die "unable to load regions file\n"; 3317 or die "unable to load regions file\n";
2939 3318
2940 for (cf::region::list) { 3319 for (cf::region::list) {
2941 $_->{match} = qr/$_->{match}/ 3320 $_->{match} = qr/$_->{match}/
2977 3356
2978sub init { 3357sub init {
2979 reload_resources; 3358 reload_resources;
2980} 3359}
2981 3360
2982sub cfg_load { 3361sub reload_config {
2983 open my $fh, "<:utf8", "$CONFDIR/config" 3362 open my $fh, "<:utf8", "$CONFDIR/config"
2984 or return; 3363 or return;
2985 3364
2986 local $/; 3365 local $/;
2987 *CFG = YAML::Syck::Load <$fh>; 3366 *CFG = YAML::Load <$fh>;
2988 3367
2989 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3368 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2990 3369
2991 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3370 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2992 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3371 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3003sub main { 3382sub main {
3004 # we must not ever block the main coroutine 3383 # we must not ever block the main coroutine
3005 local $Coro::idle = sub { 3384 local $Coro::idle = sub {
3006 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3007 (async { 3386 (async {
3008 Event::one_event; 3387 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT;
3009 })->prio (Coro::PRIO_MAX); 3389 })->prio (Coro::PRIO_MAX);
3010 }; 3390 };
3011 3391
3012 cfg_load; 3392 reload_config;
3013 db_init; 3393 db_init;
3014 load_extensions; 3394 load_extensions;
3015 3395
3016 $TICK_WATCHER->start; 3396 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3397 evthread_start IO::AIO::poll_fileno;
3017 Event::loop; 3398 EV::loop;
3018} 3399}
3019 3400
3020############################################################################# 3401#############################################################################
3021# initialisation and cleanup 3402# initialisation and cleanup
3022 3403
3023# install some emergency cleanup handlers 3404# install some emergency cleanup handlers
3024BEGIN { 3405BEGIN {
3406 our %SIGWATCHER = ();
3025 for my $signal (qw(INT HUP TERM)) { 3407 for my $signal (qw(INT HUP TERM)) {
3026 Event->signal ( 3408 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3027 reentrant => 0,
3028 data => WF_AUTOCANCEL,
3029 signal => $signal,
3030 prio => 0,
3031 cb => sub {
3032 cf::cleanup "SIG$signal"; 3409 cf::cleanup "SIG$signal";
3033 },
3034 ); 3410 };
3035 } 3411 }
3036} 3412}
3037 3413
3038sub write_runtime { 3414sub write_runtime_sync {
3039 my $runtime = "$LOCALDIR/runtime"; 3415 my $runtime = "$LOCALDIR/runtime";
3040 3416
3041 # first touch the runtime file to show we are still running: 3417 # first touch the runtime file to show we are still running:
3042 # the fsync below can take a very very long time. 3418 # the fsync below can take a very very long time.
3043 3419
3069 and return; 3445 and return;
3070 3446
3071 warn "runtime file written.\n"; 3447 warn "runtime file written.\n";
3072 3448
3073 1 3449 1
3450}
3451
3452our $uuid_lock;
3453our $uuid_skip;
3454
3455sub write_uuid_sync($) {
3456 $uuid_skip ||= $_[0];
3457
3458 return if $uuid_lock;
3459 local $uuid_lock = 1;
3460
3461 my $uuid = "$LOCALDIR/uuid";
3462
3463 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3464 or return;
3465
3466 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3467 $uuid_skip = 0;
3468
3469 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3470 and return;
3471
3472 # always fsync - this file is important
3473 aio_fsync $fh
3474 and return;
3475
3476 close $fh
3477 or return;
3478
3479 aio_rename "$uuid~", $uuid
3480 and return;
3481
3482 warn "uuid file written ($value).\n";
3483
3484 1
3485
3486}
3487
3488sub write_uuid($$) {
3489 my ($skip, $sync) = @_;
3490
3491 $sync ? write_uuid_sync $skip
3492 : async { write_uuid_sync $skip };
3074} 3493}
3075 3494
3076sub emergency_save() { 3495sub emergency_save() {
3077 my $freeze_guard = cf::freeze_mainloop; 3496 my $freeze_guard = cf::freeze_mainloop;
3078 3497
3084 # and maps saved/destroyed asynchronously. 3503 # and maps saved/destroyed asynchronously.
3085 warn "begin emergency player save\n"; 3504 warn "begin emergency player save\n";
3086 for my $login (keys %cf::PLAYER) { 3505 for my $login (keys %cf::PLAYER) {
3087 my $pl = $cf::PLAYER{$login} or next; 3506 my $pl = $cf::PLAYER{$login} or next;
3088 $pl->valid or next; 3507 $pl->valid or next;
3508 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3089 $pl->save; 3509 $pl->save;
3090 } 3510 }
3091 warn "end emergency player save\n"; 3511 warn "end emergency player save\n";
3092 3512
3093 warn "begin emergency map save\n"; 3513 warn "begin emergency map save\n";
3099 warn "end emergency map save\n"; 3519 warn "end emergency map save\n";
3100 3520
3101 warn "begin emergency database checkpoint\n"; 3521 warn "begin emergency database checkpoint\n";
3102 BDB::db_env_txn_checkpoint $DB_ENV; 3522 BDB::db_env_txn_checkpoint $DB_ENV;
3103 warn "end emergency database checkpoint\n"; 3523 warn "end emergency database checkpoint\n";
3524
3525 warn "begin write uuid\n";
3526 write_uuid_sync 1;
3527 warn "end write uuid\n";
3104 }; 3528 };
3105 3529
3106 warn "leave emergency perl save\n"; 3530 warn "leave emergency perl save\n";
3107} 3531}
3108 3532
3123 warn "reloading..."; 3547 warn "reloading...";
3124 3548
3125 warn "entering sync_job"; 3549 warn "entering sync_job";
3126 3550
3127 cf::sync_job { 3551 cf::sync_job {
3128 cf::write_runtime; # external watchdog should not bark 3552 cf::write_runtime_sync; # external watchdog should not bark
3129 cf::emergency_save; 3553 cf::emergency_save;
3130 cf::write_runtime; # external watchdog should not bark 3554 cf::write_runtime_sync; # external watchdog should not bark
3131 3555
3132 warn "syncing database to disk"; 3556 warn "syncing database to disk";
3133 BDB::db_env_txn_checkpoint $DB_ENV; 3557 BDB::db_env_txn_checkpoint $DB_ENV;
3134 3558
3135 # if anything goes wrong in here, we should simply crash as we already saved 3559 # if anything goes wrong in here, we should simply crash as we already saved
3136
3137 warn "cancelling all WF_AUTOCANCEL watchers";
3138 for (Event::all_watchers) {
3139 $_->cancel if $_->data & WF_AUTOCANCEL;
3140 }
3141 3560
3142 warn "flushing outstanding aio requests"; 3561 warn "flushing outstanding aio requests";
3143 for (;;) { 3562 for (;;) {
3144 BDB::flush; 3563 BDB::flush;
3145 IO::AIO::flush; 3564 IO::AIO::flush;
3146 Coro::cede; 3565 Coro::cede_notself;
3147 last unless IO::AIO::nreqs || BDB::nreqs; 3566 last unless IO::AIO::nreqs || BDB::nreqs;
3148 warn "iterate..."; 3567 warn "iterate...";
3149 } 3568 }
3150 3569
3151 ++$RELOAD; 3570 ++$RELOAD;
3210 warn "reloading cf.pm"; 3629 warn "reloading cf.pm";
3211 require cf; 3630 require cf;
3212 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3631 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3213 3632
3214 warn "loading config and database again"; 3633 warn "loading config and database again";
3215 cf::cfg_load; 3634 cf::reload_config;
3216 3635
3217 warn "loading extensions"; 3636 warn "loading extensions";
3218 cf::load_extensions; 3637 cf::load_extensions;
3219 3638
3220 warn "reattaching attachments to objects/players"; 3639 warn "reattaching attachments to objects/players";
3227 warn "leaving sync_job"; 3646 warn "leaving sync_job";
3228 3647
3229 1 3648 1
3230 } or do { 3649 } or do {
3231 warn $@; 3650 warn $@;
3232 warn "error while reloading, exiting."; 3651 cf::cleanup "error while reloading, exiting.";
3233 exit 1;
3234 }; 3652 };
3235 3653
3236 warn "reloaded"; 3654 warn "reloaded";
3237}; 3655};
3238 3656
3240 3658
3241sub reload_perl() { 3659sub reload_perl() {
3242 # doing reload synchronously and two reloads happen back-to-back, 3660 # doing reload synchronously and two reloads happen back-to-back,
3243 # coro crashes during coro_state_free->destroy here. 3661 # coro crashes during coro_state_free->destroy here.
3244 3662
3245 $RELOAD_WATCHER ||= Event->timer ( 3663 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3246 reentrant => 0,
3247 after => 0,
3248 data => WF_AUTOCANCEL,
3249 cb => sub {
3250 do_reload_perl; 3664 do_reload_perl;
3251 undef $RELOAD_WATCHER; 3665 undef $RELOAD_WATCHER;
3252 },
3253 ); 3666 };
3254} 3667}
3255 3668
3256register_command "reload" => sub { 3669register_command "reload" => sub {
3257 my ($who, $arg) = @_; 3670 my ($who, $arg) = @_;
3258 3671
3259 if ($who->flag (FLAG_WIZ)) { 3672 if ($who->flag (FLAG_WIZ)) {
3260 $who->message ("reloading server."); 3673 $who->message ("reloading server.");
3674 async {
3675 $Coro::current->{desc} = "perl_reload";
3261 async { reload_perl }; 3676 reload_perl;
3677 };
3262 } 3678 }
3263}; 3679};
3264 3680
3265unshift @INC, $LIBDIR; 3681unshift @INC, $LIBDIR;
3266 3682
3268 3684
3269our @WAIT_FOR_TICK; 3685our @WAIT_FOR_TICK;
3270our @WAIT_FOR_TICK_BEGIN; 3686our @WAIT_FOR_TICK_BEGIN;
3271 3687
3272sub wait_for_tick { 3688sub wait_for_tick {
3273 return unless $TICK_WATCHER->is_active; 3689 return if tick_inhibit;
3274 return if $Coro::current == $Coro::main; 3690 return if $Coro::current == $Coro::main;
3275 3691
3276 my $signal = new Coro::Signal; 3692 my $signal = new Coro::Signal;
3277 push @WAIT_FOR_TICK, $signal; 3693 push @WAIT_FOR_TICK, $signal;
3278 $signal->wait; 3694 $signal->wait;
3279} 3695}
3280 3696
3281sub wait_for_tick_begin { 3697sub wait_for_tick_begin {
3282 return unless $TICK_WATCHER->is_active; 3698 return if tick_inhibit;
3283 return if $Coro::current == $Coro::main; 3699 return if $Coro::current == $Coro::main;
3284 3700
3285 my $signal = new Coro::Signal; 3701 my $signal = new Coro::Signal;
3286 push @WAIT_FOR_TICK_BEGIN, $signal; 3702 push @WAIT_FOR_TICK_BEGIN, $signal;
3287 $signal->wait; 3703 $signal->wait;
3288} 3704}
3289 3705
3290 my $min = 1e6;#d# 3706sub tick {
3291 my $avg = 10;
3292$TICK_WATCHER = Event->timer (
3293 reentrant => 0,
3294 parked => 1,
3295 prio => 0,
3296 at => $NEXT_TICK || $TICK,
3297 data => WF_AUTOCANCEL,
3298 cb => sub {
3299 if ($Coro::current != $Coro::main) { 3707 if ($Coro::current != $Coro::main) {
3300 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3708 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3301 unless ++$bug_warning > 10; 3709 unless ++$bug_warning > 10;
3302 return; 3710 return;
3303 } 3711 }
3304 3712
3305 $NOW = $tick_start = Event::time;
3306
3307 cf::server_tick; # one server iteration 3713 cf::server_tick; # one server iteration
3308 3714
3309 0 && sync_job {#d# 3715 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3310 for(1..10) { 3716 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3311 my $t = Event::time; 3717 Coro::async_pool {
3312 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3718 $Coro::current->{desc} = "runtime saver";
3313 or die; 3719 write_runtime_sync
3314 3720 or warn "ERROR: unable to write runtime file: $!";
3315 $map->width (50);
3316 $map->height (50);
3317 $map->alloc;
3318 $map->_load_objects ("/tmp/x.map", 1);
3319 my $t = Event::time - $t;
3320
3321 #next unless $t < 0.0013;#d#
3322 if ($t < $min) {
3323 $min = $t;
3324 }
3325 $avg = $avg * 0.99 + $t * 0.01;
3326 }
3327 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3328 exit 0;
3329 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3330 }; 3721 };
3722 }
3331 3723
3332 $RUNTIME += $TICK;
3333 $NEXT_TICK += $TICK;
3334
3335 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3336 $NEXT_RUNTIME_WRITE = $NOW + 10;
3337 Coro::async_pool {
3338 write_runtime
3339 or warn "ERROR: unable to write runtime file: $!";
3340 };
3341 }
3342
3343# my $AFTER = Event::time;
3344# warn $AFTER - $NOW;#d#
3345
3346 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3724 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3347 $sig->send; 3725 $sig->send;
3348 } 3726 }
3349 while (my $sig = shift @WAIT_FOR_TICK) { 3727 while (my $sig = shift @WAIT_FOR_TICK) {
3350 $sig->send; 3728 $sig->send;
3351 } 3729 }
3352 3730
3353 $NOW = Event::time; 3731 $LOAD = ($NOW - $TICK_START) / $TICK;
3354
3355 # if we are delayed by four ticks or more, skip them all
3356 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3357
3358 $TICK_WATCHER->at ($NEXT_TICK);
3359 $TICK_WATCHER->start;
3360
3361 $LOAD = ($NOW - $tick_start) / $TICK;
3362 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3732 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3363 3733
3364 _post_tick; 3734 if (0) {
3365 3735 if ($NEXT_TICK) {
3366 3736 my $jitter = $TICK_START - $NEXT_TICK;
3737 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3738 warn "jitter $JITTER\n";#d#
3739 }
3367 }, 3740 }
3368); 3741}
3369 3742
3370{ 3743{
3371 BDB::max_poll_time $TICK * 0.1; 3744 # configure BDB
3372 $BDB_POLL_WATCHER = Event->io ( 3745
3373 reentrant => 0,
3374 fd => BDB::poll_fileno,
3375 poll => 'r',
3376 prio => 0,
3377 data => WF_AUTOCANCEL,
3378 cb => \&BDB::poll_cb,
3379 );
3380 BDB::min_parallel 8; 3746 BDB::min_parallel 8;
3381 3747 BDB::max_poll_reqs $TICK * 0.1;
3382 BDB::set_sync_prepare { 3748 $Coro::BDB::WATCHER->priority (1);
3383 my $status;
3384 my $current = $Coro::current;
3385 (
3386 sub {
3387 $status = $!;
3388 $current->ready; undef $current;
3389 },
3390 sub {
3391 Coro::schedule while defined $current;
3392 $! = $status;
3393 },
3394 )
3395 };
3396 3749
3397 unless ($DB_ENV) { 3750 unless ($DB_ENV) {
3398 $DB_ENV = BDB::db_env_create; 3751 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3753 | BDB::LOG_AUTOREMOVE, 1);
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3399 3756
3400 cf::sync_job { 3757 cf::sync_job {
3401 eval { 3758 eval {
3402 BDB::db_env_open 3759 BDB::db_env_open
3403 $DB_ENV, 3760 $DB_ENV,
3405 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3762 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3406 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3763 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3407 0666; 3764 0666;
3408 3765
3409 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3766 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3410
3411 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3412 $DB_ENV->set_lk_detect;
3413 }; 3767 };
3414 3768
3415 cf::cleanup "db_env_open(db): $@" if $@; 3769 cf::cleanup "db_env_open(db): $@" if $@;
3416 }; 3770 };
3417 } 3771 }
3772
3773 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3774 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3775 };
3776 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3777 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3778 };
3779 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3780 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3781 };
3418} 3782}
3419 3783
3420{ 3784{
3785 # configure IO::AIO
3786
3421 IO::AIO::min_parallel 8; 3787 IO::AIO::min_parallel 8;
3422
3423 undef $Coro::AIO::WATCHER;
3424 IO::AIO::max_poll_time $TICK * 0.1; 3788 IO::AIO::max_poll_time $TICK * 0.1;
3425 $AIO_POLL_WATCHER = Event->io ( 3789 $Coro::AIO::WATCHER->priority (1);
3426 reentrant => 0,
3427 data => WF_AUTOCANCEL,
3428 fd => IO::AIO::poll_fileno,
3429 poll => 'r',
3430 prio => 6,
3431 cb => \&IO::AIO::poll_cb,
3432 );
3433} 3790}
3434 3791
3435my $_log_backtrace; 3792my $_log_backtrace;
3436 3793
3437sub _log_backtrace { 3794sub _log_backtrace {
3441 3798
3442 # limit the # of concurrent backtraces 3799 # limit the # of concurrent backtraces
3443 if ($_log_backtrace < 2) { 3800 if ($_log_backtrace < 2) {
3444 ++$_log_backtrace; 3801 ++$_log_backtrace;
3445 async { 3802 async {
3803 $Coro::current->{desc} = "abt $msg";
3804
3446 my @bt = fork_call { 3805 my @bt = fork_call {
3447 @addr = map { sprintf "%x", $_ } @addr; 3806 @addr = map { sprintf "%x", $_ } @addr;
3448 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3807 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3449 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3808 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3450 or die "addr2line: $!"; 3809 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines