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.352 by root, Sun Sep 2 04:57:14 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.64 (); 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;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::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
41Compress::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
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 64
48$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
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 104our $DB_ENV;
86 105
87our %CFG; 106our %CFG;
88 107
89our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 109our $RUNTIME;
110our $NOW;
91 111
92our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
95 115
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 118
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
102 123
103binmode STDOUT; 124binmode STDOUT;
104binmode STDERR; 125binmode STDERR;
105 126
106# read virtual server time, if available 127# read virtual server time, if available
159 180
160The raw value load value from the last tick. 181The raw value load value from the last tick.
161 182
162=item %cf::CFG 183=item %cf::CFG
163 184
164Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 186from wherever your confdir points to.
166 187
167=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
168 189
169These 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
187 $msg .= "\n" 208 $msg .= "\n"
188 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
189 210
190 $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;
191 212
192 utf8::encode $msg;
193 LOG llevError, $msg; 213 LOG llevError, $msg;
194 }; 214 };
195} 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#?
196 231
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
213)) { 248)) {
214 no strict 'refs'; 249 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 251}
217 252
218$Event::DIED = sub { 253$EV::DIED = sub {
219 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
220}; 255};
221 256
222############################################################################# 257#############################################################################
223 258
246 $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;
247 $d 282 $d
248 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
249} 284}
250 285
251=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
252 287
253Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
254 289
255=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
256 291
257Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
258 293
259=cut 294=cut
260 295
261our $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
262 297
263sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
265 300
266=item cf::lock_wait $string 301=item cf::lock_wait $string
267 302
268Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
269 304
285Return 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.
286 321
287=cut 322=cut
288 323
289our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
290 326
291sub lock_wait($) { 327sub lock_wait($) {
292 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#
293 334
294 # wait for lock, if any 335 # wait for lock, if any
295 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 338 Coro::schedule;
303 344
304 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
305 lock_wait $key; 346 lock_wait $key;
306 347
307 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
308 350
309 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
312 } 355 }
313} 356}
314 357
317 360
318 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
319} 362}
320 363
321sub freeze_mainloop { 364sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
323 366
324 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
325 $TICK_WATCHER->start; 368}
326 }; 369
327 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
328 $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
329} 383}
330 384
331=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
332 386
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
344our @SLOT_QUEUE; 398our @SLOT_QUEUE;
345our $SLOT_QUEUE; 399our $SLOT_QUEUE;
346 400
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
349 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
350 406
351 while () { 407 while () {
352 next_job: 408 next_job:
353 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
361 } 417 }
362 } 418 }
363 } 419 }
364 420
365 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
366 # 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
367 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 424 $signal->wait;
369 } else { 425 } else {
370 Coro::schedule; 426 Coro::schedule;
371 } 427 }
394 450
395BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
396 452
397=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
398 454
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
401partly 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
402acceptable. 458acceptable.
403 459
404If 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
405the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
410 466
411sub sync_job(&) { 467sub sync_job(&) {
412 my ($job) = @_; 468 my ($job) = @_;
413 469
414 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 471 my $time = EV::time;
416 472
417 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
419 475
420 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 477
422 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
423 479
424 my $busy = 1; 480 my $busy = 1;
425 my @res; 481 my @res;
426 482
427 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 485 @res = eval { $job->() };
429 warn $@ if $@; 486 warn $@ if $@;
430 undef $busy; 487 undef $busy;
431 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
432 489
433 while ($busy) { 490 while ($busy) {
434 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
435 } 495 }
496 }
436 497
437 $time = Event::time - $time; 498 my $time = EV::time - $time;
438 499
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
443 501
444 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
445 } else { 503 } else {
446 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
447 505
472=item fork_call { }, $args 530=item fork_call { }, $args
473 531
474Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
478 536
479=cut 537=cut
480 538
481sub fork_call(&@) { 539sub fork_call(&@) {
482 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
483 541
484 # we seemingly have to make a local copy of the whole thing, 542 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 543 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 544 # TODO: investigate and fix (likely this will be rather laborious)
487 545
488 my @res = Coro::Util::fork_eval { 546 my @res = Coro::Util::fork_eval {
489 reset_signals; 547 reset_signals;
490 &$cb 548 &$cb
491 }, @args; 549 }, @args;
492 550
493 wantarray ? @res : $res[-1] 551 wantarray ? @res : $res[-1]
494} 552}
495 553
554=item $coin = coin_from_name $name
555
556=cut
557
558our %coin_alias = (
559 "silver" => "silvercoin",
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
579}
580
496=item $value = cf::db_get $family => $key 581=item $value = cf::db_get $family => $key
497 582
498Returns a single value from the environment database. 583Returns a single value from the environment database.
499 584
500=item cf::db_put $family => $key => $value 585=item cf::db_put $family => $key => $value
501 586
502Stores 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
503data 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).
504 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
505=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}
506 613
507our $DB; 614our $DB;
508 615
509sub db_init { 616sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 617 cf::sync_job {
514 eval { 618 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 619 };
524} 620}
525 621
526sub db_get($$) { 622sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 623 my $key = "$_[0]/$_[1]";
528 624
632attach callbacks/event handlers (a collection of which is called an "attachment") 728attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 729to it. All such attachable objects support the following methods.
634 730
635In 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>
636C<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
637Crossfire TRT). 733Deliantra).
638 734
639=over 4 735=over 4
640 736
641=item $attachable->attach ($attachment, key => $value...) 737=item $attachable->attach ($attachment, key => $value...)
642 738
924 } 1020 }
925 1021
926 0 1022 0
927} 1023}
928 1024
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1025=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1026
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1028
933Generate an object-specific event with the given arguments. 1029Generate an object-specific event with the given arguments.
934 1030
940 1036
941=cut 1037=cut
942 1038
943############################################################################# 1039#############################################################################
944# object support 1040# object support
945#
946 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#
947sub _can_merge { 1075sub _can_merge {
948 my ($ob1, $ob2) = @_; 1076 my ($ob1, $ob2) = @_;
949 1077
950 local $Storable::canonical = 1; 1078 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1079
954 $fob1 eq $fob2 1080 # we do the slow way here
1081 return _object_equal $ob1, $ob2
955} 1082}
956 1083
957sub reattach { 1084sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1085 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1086 my ($obj) = @_;
981cf::attachable->attach ( 1108cf::attachable->attach (
982 prio => -1000000, 1109 prio => -1000000,
983 on_instantiate => sub { 1110 on_instantiate => sub {
984 my ($obj, $data) = @_; 1111 my ($obj, $data) = @_;
985 1112
986 $data = from_json $data; 1113 $data = decode_json $data;
987 1114
988 for (@$data) { 1115 for (@$data) {
989 my ($name, $args) = @$_; 1116 my ($name, $args) = @$_;
990 1117
991 $obj->attach ($name, %{$args || {} }); 1118 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1134sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1135 my ($filename, $rdata, $objs) = @_;
1009 1136
1010 sync_job { 1137 sync_job {
1011 if (length $$rdata) { 1138 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1140 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1141 $decname, length $$rdata, scalar @$objs;
1014 1142
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1144 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1146 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1147 close $fh;
1020 1148
1021 if (@$objs) { 1149 if (@$objs) {
1022 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) {
1023 chmod SAVE_MODE, $fh; 1151 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1153 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1155 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1156 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1157 }
1037 } 1165 }
1038 } else { 1166 } else {
1039 aio_unlink $filename; 1167 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1041 } 1169 }
1042 } 1170 };
1043} 1171}
1044 1172
1045sub object_freezer_as_string { 1173sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1174 my ($rdata, $objs) = @_;
1047 1175
1059 or return; 1187 or return;
1060 1188
1061 unless (aio_stat "$filename.pst") { 1189 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1190 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1191 or return;
1192
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1193 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs};
1065 } 1195 }
1066 1196
1197 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1198 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1199 $decname, length $data, scalar @{$av || []};
1200
1069 return ($data, $av); 1201 ($data, $av)
1070} 1202}
1071 1203
1072=head2 COMMAND CALLBACKS 1204=head2 COMMAND CALLBACKS
1073 1205
1074=over 4 1206=over 4
1223 my $msg = $@ ? "$v->{path}: $@\n" 1355 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n"; 1356 : "$v->{base}: extension inactive.\n";
1225 1357
1226 if (exists $v->{meta}{mandatory}) { 1358 if (exists $v->{meta}{mandatory}) {
1227 warn $msg; 1359 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n"; 1360 cf::cleanup "mandatory extension failed to load, exiting.";
1229 exit 1;
1230 } 1361 }
1231 1362
1232 warn $msg; 1363 warn $msg;
1233 } 1364 }
1234 1365
1259use Coro::AIO; 1390use Coro::AIO;
1260 1391
1261=head3 cf::player 1392=head3 cf::player
1262 1393
1263=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}
1264 1409
1265=item cf::player::find $login 1410=item cf::player::find $login
1266 1411
1267Returns the given player object, loading it if necessary (might block). 1412Returns the given player object, loading it if necessary (might block).
1268 1413
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1449 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1450 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1451 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1452 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1453
1309 my $pl = load_pl path $login 1454 my $f = new_from_file cf::object::thawer path $login
1310 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;
1311 $cf::PLAYER{$login} = $pl 1461 $cf::PLAYER{$login} = $pl
1312 } 1462 }
1313 } 1463 }
1314} 1464}
1315 1465
1413 or return []; 1563 or return [];
1414 1564
1415 my @logins; 1565 my @logins;
1416 1566
1417 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") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1573 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1574 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 }
1421 1576
1422 utf8::decode $login; 1577 utf8::decode $login;
1423 push @logins, $login; 1578 push @logins, $login;
1424 } 1579 }
1425 1580
1458 1613
1459Expand crossfire pod fragments into protocol xml. 1614Expand crossfire pod fragments into protocol xml.
1460 1615
1461=cut 1616=cut
1462 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
1463sub expand_cfpod { 1629sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1630 my ($self, $pod) = @_;
1465 1631
1466 # escape & and < 1632 my $xml;
1467 s/&/&amp;/g;
1468 s/(?<![BIUGHT])</&lt;/g;
1469 1633
1470 # this is buggy, it needs to properly take care of nested <'s 1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1471 1637
1472 1 while 1638 $group =~ s/&/&amp;/g;
1473 # replace B<>, I<>, U<> etc. 1639 $group =~ s/</&lt;/g;
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1640
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1641 $xml .= $group;
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1642 } elsif ($pod =~ m%\G
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1643 ([BCGHITU])
1478 # replace G<male|female> tags 1644 <
1479 || s{G<([^>|]*)\|([^>]*)>}{ 1645 (?:
1480 $self->gender ? $2 : $1 1646 ([^<>]*) (?{ $group = $^N })
1481 }ge 1647 | < $interior >
1482 # replace H<hint text> 1648 )
1483 || s{H<([^\>]*)>} 1649 >
1650 %gcsx
1484 { 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") {
1485 ("<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>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "") 1671 "")
1488 [$self->{hintmode}] 1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1489 }ge; 1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1490 1683
1684 for ($xml) {
1491 # create single paragraphs (very hackish) 1685 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g; 1686 s/(?<=\S)\n(?=\w)/ /g;
1493 1687
1494 # compress some whitespace 1688 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends 1689 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines 1690 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines 1691 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines 1692 s/\n+$//; # ending lines
1693 }
1499 1694
1500 $_ 1695 $xml
1501} 1696}
1697
1698no re 'eval';
1502 1699
1503sub hintmode { 1700sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1; 1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode} 1702 $_[0]{hintmode}
1506} 1703}
1578our $MAX_RESET = 3600; 1775our $MAX_RESET = 3600;
1579our $DEFAULT_RESET = 3000; 1776our $DEFAULT_RESET = 3000;
1580 1777
1581sub generate_random_map { 1778sub generate_random_map {
1582 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
1583 # mit "rum" bekleckern, nicht 1783 # mit "rum" bekleckern, nicht
1584 $self->_create_random_map ( 1784 $self->_create_random_map (
1585 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1586 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1587 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1709 1909
1710# the temporary/swap location 1910# the temporary/swap location
1711sub save_path { 1911sub save_path {
1712 my ($self) = @_; 1912 my ($self) = @_;
1713 1913
1714 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1715 "$TMPDIR/$path.map" 1915 "$TMPDIR/$path.map"
1716} 1916}
1717 1917
1718# the unique path, undef == no special unique path 1918# the unique path, undef == no special unique path
1719sub uniq_path { 1919sub uniq_path {
1720 my ($self) = @_; 1920 my ($self) = @_;
1721 1921
1722 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1723 "$UNIQUEDIR/$path" 1923 "$UNIQUEDIR/$path"
1724} 1924}
1725 1925
1726# and all this just because we cannot iterate over 1926# and all this just because we cannot iterate over
1727# all maps in C++... 1927# all maps in C++...
1750 1950
1751sub load_header_from($) { 1951sub load_header_from($) {
1752 my ($self, $path) = @_; 1952 my ($self, $path) = @_;
1753 1953
1754 utf8::encode $path; 1954 utf8::encode $path;
1755 #aio_open $path, O_RDONLY, 0 1955 my $f = new_from_file cf::object::thawer $path
1756 # or return;
1757
1758 $self->_load_header ($path)
1759 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;
1760 1963
1761 $self->{load_path} = $path; 1964 $self->{load_path} = $path;
1762 1965
1763 1 1966 1
1764} 1967}
1818sub find { 2021sub find {
1819 my ($path, $origin) = @_; 2022 my ($path, $origin) = @_;
1820 2023
1821 $path = normalise $path, $origin && $origin->path; 2024 $path = normalise $path, $origin && $origin->path;
1822 2025
2026 cf::lock_wait "map_data:$path";#d#remove
1823 cf::lock_wait "map_find:$path"; 2027 cf::lock_wait "map_find:$path";
1824 2028
1825 $cf::MAP{$path} || do { 2029 $cf::MAP{$path} || do {
1826 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
1827 my $map = new_from_path cf::map $path 2033 my $map = new_from_path cf::map $path
1828 or return; 2034 or return;
1829 2035
1830 $map->{last_save} = $cf::RUNTIME; 2036 $map->{last_save} = $cf::RUNTIME;
1831 2037
1833 or return; 2039 or return;
1834 2040
1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1836 # doing this can freeze the server in a sync job, obviously 2042 # doing this can freeze the server in a sync job, obviously
1837 #$cf::WAIT_FOR_TICK->wait; 2043 #$cf::WAIT_FOR_TICK->wait;
2044 undef $guard1;
2045 undef $guard2;
1838 $map->reset; 2046 $map->reset;
1839 undef $guard;
1840 return find $path; 2047 return find $path;
1841 } 2048 }
1842 2049
1843 $cf::MAP{$path} = $map 2050 $cf::MAP{$path} = $map
1844 } 2051 }
1853 local $self->{deny_reset} = 1; # loading can take a long time 2060 local $self->{deny_reset} = 1; # loading can take a long time
1854 2061
1855 my $path = $self->{path}; 2062 my $path = $self->{path};
1856 2063
1857 { 2064 {
1858 my $guard1 = cf::lock_acquire "map_data:$path"; 2065 my $guard = cf::lock_acquire "map_data:$path";
1859 my $guard2 = cf::lock_acquire "map_load:$path";
1860 2066
2067 return unless $self->valid;
1861 return if $self->in_memory != cf::MAP_SWAPPED; 2068 return unless $self->in_memory == cf::MAP_SWAPPED;
1862 2069
1863 $self->in_memory (cf::MAP_LOADING); 2070 $self->in_memory (cf::MAP_LOADING);
1864 2071
1865 $self->alloc; 2072 $self->alloc;
1866 2073
1867 $self->pre_load; 2074 $self->pre_load;
1868 cf::cede_to_tick; 2075 cf::cede_to_tick;
1869 2076
2077 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block;
1870 $self->_load_objects ($self->{load_path}, 1) 2079 $self->_load_objects ($f)
1871 or return; 2080 or return;
1872 2081
1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1874 if delete $self->{load_original}; 2083 if delete $self->{load_original};
1875 2084
1876 if (my $uniq = $self->uniq_path) { 2085 if (my $uniq = $self->uniq_path) {
1877 utf8::encode $uniq; 2086 utf8::encode $uniq;
1878 if (aio_open $uniq, O_RDONLY, 0) { 2087 unless (aio_stat $uniq) {
2088 if (my $f = new_from_file cf::object::thawer $uniq) {
1879 $self->clear_unique_items; 2089 $self->clear_unique_items;
1880 $self->_load_objects ($uniq, 0); 2090 $self->_load_objects ($f);
2091 $f->resolve_delayed_derefs;
2092 }
1881 } 2093 }
1882 } 2094 }
2095
2096 $f->resolve_delayed_derefs;
1883 2097
1884 cf::cede_to_tick; 2098 cf::cede_to_tick;
1885 # now do the right thing for maps 2099 # now do the right thing for maps
1886 $self->link_multipart_objects; 2100 $self->link_multipart_objects;
1887 $self->difficulty ($self->estimate_difficulty) 2101 $self->difficulty ($self->estimate_difficulty)
1973 } 2187 }
1974 2188
1975 $MAP_PREFETCH{$path} |= $load; 2189 $MAP_PREFETCH{$path} |= $load;
1976 2190
1977 $MAP_PREFETCHER ||= cf::async { 2191 $MAP_PREFETCHER ||= cf::async {
2192 $Coro::current->{desc} = "map prefetcher";
2193
1978 while (%MAP_PREFETCH) { 2194 while (%MAP_PREFETCH) {
1979 while (my ($k, $v) = each %MAP_PREFETCH) { 2195 while (my ($k, $v) = each %MAP_PREFETCH) {
1980 if (my $map = find $k) { 2196 if (my $map = find $k) {
1981 $map->load if $v; 2197 $map->load if $v;
1982 } 2198 }
2008 return if $self->{deny_save}; 2224 return if $self->{deny_save};
2009 2225
2010 local $self->{last_access} = $self->last_access;#d# 2226 local $self->{last_access} = $self->last_access;#d#
2011 2227
2012 cf::async { 2228 cf::async {
2229 $Coro::current->{desc} = "map player save";
2013 $_->contr->save for $self->players; 2230 $_->contr->save for $self->players;
2014 }; 2231 };
2015 2232
2016 if ($uniq) { 2233 if ($uniq) {
2017 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2031 2248
2032 return if $self->players; 2249 return if $self->players;
2033 return if $self->in_memory != cf::MAP_IN_MEMORY; 2250 return if $self->in_memory != cf::MAP_IN_MEMORY;
2034 return if $self->{deny_save}; 2251 return if $self->{deny_save};
2035 2252
2253 $self->in_memory (cf::MAP_SWAPPED);
2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
2036 $self->clear; 2257 $self->clear;
2037 $self->in_memory (cf::MAP_SWAPPED);
2038} 2258}
2039 2259
2040sub reset_at { 2260sub reset_at {
2041 my ($self) = @_; 2261 my ($self) = @_;
2042 2262
2074 if $uniq; 2294 if $uniq;
2075 } 2295 }
2076 2296
2077 delete $cf::MAP{$self->path}; 2297 delete $cf::MAP{$self->path};
2078 2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2301 $self->clear;
2080
2081 $_->clear_links_to ($self) for values %cf::MAP;
2082 2302
2083 $self->unlink_save; 2303 $self->unlink_save;
2084 $self->destroy; 2304 $self->destroy;
2085} 2305}
2086 2306
2153 2373
2154sub unique_maps() { 2374sub unique_maps() {
2155 [ 2375 [
2156 map { 2376 map {
2157 utf8::decode $_; 2377 utf8::decode $_;
2158 /\.map$/ 2378 s/\.map$//; # TODO future compatibility hack
2379 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2380 ? ()
2159 ? normalise $_ 2381 : normalise $_
2160 : ()
2161 } @{ aio_readdir $UNIQUEDIR or [] } 2382 } @{ aio_readdir $UNIQUEDIR or [] }
2162 ] 2383 ]
2163} 2384}
2164 2385
2165package cf;
2166
2167=back 2386=back
2168 2387
2169=head3 cf::object 2388=head3 cf::object
2170 2389
2171=cut 2390=cut
2174 2393
2175=over 4 2394=over 4
2176 2395
2177=item $ob->inv_recursive 2396=item $ob->inv_recursive
2178 2397
2179Returns 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.
2180 2400
2181=cut 2401=cut
2182 2402
2183sub inv_recursive_; 2403sub inv_recursive_;
2184sub inv_recursive_ { 2404sub inv_recursive_ {
2185 map { $_, inv_recursive_ $_->inv } @_ 2405 map { $_, inv_recursive_ $_->inv } @_
2186} 2406}
2187 2407
2188sub inv_recursive { 2408sub inv_recursive {
2189 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 }
2190} 2438}
2191 2439
2192package cf; 2440package cf;
2193 2441
2194=back 2442=back
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2602 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2355 2603
2356 $self->enter_link; 2604 $self->enter_link;
2357 2605
2358 (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
2359 my $map = eval { 2628 my $map = eval {
2360 my $map = cf::map::find $path; 2629 my $map = defined $path ? cf::map::find $path : undef;
2361 2630
2362 if ($map) { 2631 if ($map) {
2363 $map = $map->customise_for ($self); 2632 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map; 2633 $map = $check->($map) if $check && $map;
2365 } else { 2634 } else {
2366 $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);
2367 } 2636 }
2368 2637
2369 $map 2638 $map
2370 }; 2639 };
2371 2640
2424 $rmp->{origin_y} = $exit->y; 2693 $rmp->{origin_y} = $exit->y;
2425 } 2694 }
2426 2695
2427 $rmp->{random_seed} ||= $exit->random_seed; 2696 $rmp->{random_seed} ||= $exit->random_seed;
2428 2697
2429 my $data = cf::to_json $rmp; 2698 my $data = cf::encode_json $rmp;
2430 my $md5 = Digest::MD5::md5_hex $data; 2699 my $md5 = Digest::MD5::md5_hex $data;
2431 my $meta = "$RANDOMDIR/$md5.meta"; 2700 my $meta = "$RANDOMDIR/$md5.meta";
2432 2701
2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2434 aio_write $fh, 0, (length $data), $data, 0; 2703 aio_write $fh, 0, (length $data), $data, 0;
2461 # if exit is damned, update players death & WoR home-position 2730 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp) 2731 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED); 2732 if $exit->flag (FLAG_DAMNED);
2464 2733
2465 (async { 2734 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2736
2466 $self->deactivate_recursive; # just to be sure 2737 $self->deactivate_recursive; # just to be sure
2467 unless (eval { 2738 unless (eval {
2468 $self->goto ($slaying, $hp, $sp); 2739 $self->goto ($slaying, $hp, $sp);
2469 2740
2470 1; 2741 1;
2505the 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
2506the message unless the client supports the msg packet. 2777the message unless the client supports the msg packet.
2507 2778
2508=cut 2779=cut
2509 2780
2781# non-persistent channels (usually the info channel)
2510our %CHANNEL = ( 2782our %CHANNEL = (
2511 "c/identify" => { 2783 "c/identify" => {
2512 id => "identify", 2784 id => "infobox",
2513 title => "Identify", 2785 title => "Identify",
2514 reply => undef, 2786 reply => undef,
2515 tooltip => "Items recently identified", 2787 tooltip => "Items recently identified",
2516 }, 2788 },
2517 "c/examine" => { 2789 "c/examine" => {
2518 id => "examine", 2790 id => "infobox",
2519 title => "Examine", 2791 title => "Examine",
2520 reply => undef, 2792 reply => undef,
2521 tooltip => "Signs and other items you examined", 2793 tooltip => "Signs and other items you examined",
2522 }, 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 },
2523); 2831);
2524 2832
2525sub cf::client::send_msg { 2833sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_; 2834 my ($self, $channel, $msg, $color, @extra) = @_;
2527 2835
2528 $msg = $self->pl->expand_cfpod ($msg); 2836 $msg = $self->pl->expand_cfpod ($msg);
2529 2837
2530 $color &= cf::NDI_CLIENT_MASK; # just in case... 2838 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531 2839
2532 # check predefined channels, for the benefit of C 2840 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2841 if ($CHANNEL{$channel}) {
2842 $channel = $CHANNEL{$channel};
2534 2843
2844 $self->ext_msg (channel_info => $channel)
2845 if $self->can_msg;
2846
2847 $channel = $channel->{id};
2848
2535 if (ref $channel) { 2849 } elsif (ref $channel) {
2536 # send meta info to client, if not yet sent 2850 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) { 2851 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel; 2852 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel); 2853 $self->ext_msg (channel_info => $channel)
2854 if $self->can_msg;
2540 } 2855 }
2541 2856
2542 $channel = $channel->{id}; 2857 $channel = $channel->{id};
2543 } 2858 }
2544 2859
2756=pod 3071=pod
2757 3072
2758The following functions and methods are available within a safe environment: 3073The following functions and methods are available within a safe environment:
2759 3074
2760 cf::object 3075 cf::object
2761 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
2762 insert remove name archname title slaying race decrease_ob_nr 3077 insert remove name archname title slaying race decrease_ob_nr
2763 3078
2764 cf::object::player 3079 cf::object::player
2765 player 3080 player
2766 3081
2773=cut 3088=cut
2774 3089
2775for ( 3090for (
2776 ["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
2777 insert remove inv name archname title slaying race 3092 insert remove inv name archname title slaying race
2778 decrease_ob_nr)], 3093 decrease_ob_nr destroy)],
2779 ["cf::object::player" => qw(player)], 3094 ["cf::object::player" => qw(player)],
2780 ["cf::player" => qw(peaceful)], 3095 ["cf::player" => qw(peaceful)],
2781 ["cf::map" => qw(trigger)], 3096 ["cf::map" => qw(trigger)],
2782) { 3097) {
2783 no strict 'refs'; 3098 no strict 'refs';
2888 { 3203 {
2889 my $faces = $facedata->{faceinfo}; 3204 my $faces = $facedata->{faceinfo};
2890 3205
2891 while (my ($face, $info) = each %$faces) { 3206 while (my ($face, $info) = each %$faces) {
2892 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3207 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3208
2893 cf::face::set_visibility $idx, $info->{visibility}; 3209 cf::face::set_visibility $idx, $info->{visibility};
2894 cf::face::set_magicmap $idx, $info->{magicmap}; 3210 cf::face::set_magicmap $idx, $info->{magicmap};
2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3211 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3212 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2897 3213
2898 cf::cede_to_tick; 3214 cf::cede_to_tick;
2899 } 3215 }
2900 3216
2901 while (my ($face, $info) = each %$faces) { 3217 while (my ($face, $info) = each %$faces) {
2902 next unless $info->{smooth}; 3218 next unless $info->{smooth};
3219
2903 my $idx = cf::face::find $face 3220 my $idx = cf::face::find $face
2904 or next; 3221 or next;
3222
2905 if (my $smooth = cf::face::find $info->{smooth}) { 3223 if (my $smooth = cf::face::find $info->{smooth}) {
2906 cf::face::set_smooth $idx, $smooth; 3224 cf::face::set_smooth $idx, $smooth;
2907 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3225 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2908 } else { 3226 } else {
2909 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3227 warn "smooth face '$info->{smooth}' not found for face '$face'";
2927 { 3245 {
2928 # TODO: for gcfclient pleasure, we should give resources 3246 # TODO: for gcfclient pleasure, we should give resources
2929 # that gcfclient doesn't grok a >10000 face index. 3247 # that gcfclient doesn't grok a >10000 face index.
2930 my $res = $facedata->{resource}; 3248 my $res = $facedata->{resource};
2931 3249
2932 my $soundconf = delete $res->{"res/sound.conf"};
2933
2934 while (my ($name, $info) = each %$res) { 3250 while (my ($name, $info) = each %$res) {
3251 if (defined $info->{type}) {
2935 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3252 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data; 3253 my $data;
2937 3254
2938 if ($info->{type} & 1) { 3255 if ($info->{type} & 1) {
2939 # prepend meta info 3256 # prepend meta info
2940 3257
2941 my $meta = $enc->encode ({ 3258 my $meta = $enc->encode ({
2942 name => $name, 3259 name => $name,
2943 %{ $info->{meta} || {} }, 3260 %{ $info->{meta} || {} },
2944 }); 3261 });
2945 3262
2946 $data = pack "(w/a*)*", $meta, $info->{data}; 3263 $data = pack "(w/a*)*", $meta, $info->{data};
3264 } else {
3265 $data = $info->{data};
3266 }
3267
3268 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3269 cf::face::set_type $idx, $info->{type};
2947 } else { 3270 } else {
2948 $data = $info->{data}; 3271 $RESOURCE{$name} = $info;
2949 } 3272 }
2950 3273
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2954 cf::cede_to_tick; 3274 cf::cede_to_tick;
2955 } 3275 }
2956
2957 if ($soundconf) {
2958 $soundconf = $enc->decode (delete $soundconf->{data});
2959
2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2961 my $sound = $soundconf->{compat}[$_]
2962 or next;
2963
2964 my $face = cf::face::find "sound/$sound->[1]";
2965 cf::sound::set $sound->[0] => $face;
2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2967 }
2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2972 }
2973 }
2974 } 3276 }
3277
3278 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2975 3279
2976 1 3280 1
2977} 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});
2978 3302
2979register_exticmd fx_want => sub { 3303register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_; 3304 my ($ns, $want) = @_;
2981 3305
2982 while (my ($k, $v) = each %$want) { 3306 while (my ($k, $v) = each %$want) {
3037sub reload_config { 3361sub reload_config {
3038 open my $fh, "<:utf8", "$CONFDIR/config" 3362 open my $fh, "<:utf8", "$CONFDIR/config"
3039 or return; 3363 or return;
3040 3364
3041 local $/; 3365 local $/;
3042 *CFG = YAML::Syck::Load <$fh>; 3366 *CFG = YAML::Load <$fh>;
3043 3367
3044 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3368 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3045 3369
3046 $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};
3047 $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};
3058sub main { 3382sub main {
3059 # we must not ever block the main coroutine 3383 # we must not ever block the main coroutine
3060 local $Coro::idle = sub { 3384 local $Coro::idle = sub {
3061 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#
3062 (async { 3386 (async {
3063 Event::one_event; 3387 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT;
3064 })->prio (Coro::PRIO_MAX); 3389 })->prio (Coro::PRIO_MAX);
3065 }; 3390 };
3066 3391
3067 reload_config; 3392 reload_config;
3068 db_init; 3393 db_init;
3069 load_extensions; 3394 load_extensions;
3070 3395
3071 $TICK_WATCHER->start; 3396 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3397 evthread_start IO::AIO::poll_fileno;
3072 Event::loop; 3398 EV::loop;
3073} 3399}
3074 3400
3075############################################################################# 3401#############################################################################
3076# initialisation and cleanup 3402# initialisation and cleanup
3077 3403
3078# install some emergency cleanup handlers 3404# install some emergency cleanup handlers
3079BEGIN { 3405BEGIN {
3406 our %SIGWATCHER = ();
3080 for my $signal (qw(INT HUP TERM)) { 3407 for my $signal (qw(INT HUP TERM)) {
3081 Event->signal ( 3408 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3082 reentrant => 0,
3083 data => WF_AUTOCANCEL,
3084 signal => $signal,
3085 prio => 0,
3086 cb => sub {
3087 cf::cleanup "SIG$signal"; 3409 cf::cleanup "SIG$signal";
3088 },
3089 ); 3410 };
3090 } 3411 }
3091} 3412}
3092 3413
3093sub write_runtime { 3414sub write_runtime_sync {
3094 my $runtime = "$LOCALDIR/runtime"; 3415 my $runtime = "$LOCALDIR/runtime";
3095 3416
3096 # first touch the runtime file to show we are still running: 3417 # first touch the runtime file to show we are still running:
3097 # the fsync below can take a very very long time. 3418 # the fsync below can take a very very long time.
3098 3419
3124 and return; 3445 and return;
3125 3446
3126 warn "runtime file written.\n"; 3447 warn "runtime file written.\n";
3127 3448
3128 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 };
3129} 3493}
3130 3494
3131sub emergency_save() { 3495sub emergency_save() {
3132 my $freeze_guard = cf::freeze_mainloop; 3496 my $freeze_guard = cf::freeze_mainloop;
3133 3497
3139 # and maps saved/destroyed asynchronously. 3503 # and maps saved/destroyed asynchronously.
3140 warn "begin emergency player save\n"; 3504 warn "begin emergency player save\n";
3141 for my $login (keys %cf::PLAYER) { 3505 for my $login (keys %cf::PLAYER) {
3142 my $pl = $cf::PLAYER{$login} or next; 3506 my $pl = $cf::PLAYER{$login} or next;
3143 $pl->valid or next; 3507 $pl->valid or next;
3508 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3144 $pl->save; 3509 $pl->save;
3145 } 3510 }
3146 warn "end emergency player save\n"; 3511 warn "end emergency player save\n";
3147 3512
3148 warn "begin emergency map save\n"; 3513 warn "begin emergency map save\n";
3154 warn "end emergency map save\n"; 3519 warn "end emergency map save\n";
3155 3520
3156 warn "begin emergency database checkpoint\n"; 3521 warn "begin emergency database checkpoint\n";
3157 BDB::db_env_txn_checkpoint $DB_ENV; 3522 BDB::db_env_txn_checkpoint $DB_ENV;
3158 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";
3159 }; 3528 };
3160 3529
3161 warn "leave emergency perl save\n"; 3530 warn "leave emergency perl save\n";
3162} 3531}
3163 3532
3178 warn "reloading..."; 3547 warn "reloading...";
3179 3548
3180 warn "entering sync_job"; 3549 warn "entering sync_job";
3181 3550
3182 cf::sync_job { 3551 cf::sync_job {
3183 cf::write_runtime; # external watchdog should not bark 3552 cf::write_runtime_sync; # external watchdog should not bark
3184 cf::emergency_save; 3553 cf::emergency_save;
3185 cf::write_runtime; # external watchdog should not bark 3554 cf::write_runtime_sync; # external watchdog should not bark
3186 3555
3187 warn "syncing database to disk"; 3556 warn "syncing database to disk";
3188 BDB::db_env_txn_checkpoint $DB_ENV; 3557 BDB::db_env_txn_checkpoint $DB_ENV;
3189 3558
3190 # 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
3191
3192 warn "cancelling all WF_AUTOCANCEL watchers";
3193 for (Event::all_watchers) {
3194 $_->cancel if $_->data & WF_AUTOCANCEL;
3195 }
3196 3560
3197 warn "flushing outstanding aio requests"; 3561 warn "flushing outstanding aio requests";
3198 for (;;) { 3562 for (;;) {
3199 BDB::flush; 3563 BDB::flush;
3200 IO::AIO::flush; 3564 IO::AIO::flush;
3201 Coro::cede; 3565 Coro::cede_notself;
3202 last unless IO::AIO::nreqs || BDB::nreqs; 3566 last unless IO::AIO::nreqs || BDB::nreqs;
3203 warn "iterate..."; 3567 warn "iterate...";
3204 } 3568 }
3205 3569
3206 ++$RELOAD; 3570 ++$RELOAD;
3282 warn "leaving sync_job"; 3646 warn "leaving sync_job";
3283 3647
3284 1 3648 1
3285 } or do { 3649 } or do {
3286 warn $@; 3650 warn $@;
3287 warn "error while reloading, exiting."; 3651 cf::cleanup "error while reloading, exiting.";
3288 exit 1;
3289 }; 3652 };
3290 3653
3291 warn "reloaded"; 3654 warn "reloaded";
3292}; 3655};
3293 3656
3295 3658
3296sub reload_perl() { 3659sub reload_perl() {
3297 # doing reload synchronously and two reloads happen back-to-back, 3660 # doing reload synchronously and two reloads happen back-to-back,
3298 # coro crashes during coro_state_free->destroy here. 3661 # coro crashes during coro_state_free->destroy here.
3299 3662
3300 $RELOAD_WATCHER ||= Event->timer ( 3663 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3301 reentrant => 0,
3302 after => 0,
3303 data => WF_AUTOCANCEL,
3304 cb => sub {
3305 do_reload_perl; 3664 do_reload_perl;
3306 undef $RELOAD_WATCHER; 3665 undef $RELOAD_WATCHER;
3307 },
3308 ); 3666 };
3309} 3667}
3310 3668
3311register_command "reload" => sub { 3669register_command "reload" => sub {
3312 my ($who, $arg) = @_; 3670 my ($who, $arg) = @_;
3313 3671
3314 if ($who->flag (FLAG_WIZ)) { 3672 if ($who->flag (FLAG_WIZ)) {
3315 $who->message ("reloading server."); 3673 $who->message ("reloading server.");
3674 async {
3675 $Coro::current->{desc} = "perl_reload";
3316 async { reload_perl }; 3676 reload_perl;
3677 };
3317 } 3678 }
3318}; 3679};
3319 3680
3320unshift @INC, $LIBDIR; 3681unshift @INC, $LIBDIR;
3321 3682
3323 3684
3324our @WAIT_FOR_TICK; 3685our @WAIT_FOR_TICK;
3325our @WAIT_FOR_TICK_BEGIN; 3686our @WAIT_FOR_TICK_BEGIN;
3326 3687
3327sub wait_for_tick { 3688sub wait_for_tick {
3328 return unless $TICK_WATCHER->is_active; 3689 return if tick_inhibit;
3329 return if $Coro::current == $Coro::main; 3690 return if $Coro::current == $Coro::main;
3330 3691
3331 my $signal = new Coro::Signal; 3692 my $signal = new Coro::Signal;
3332 push @WAIT_FOR_TICK, $signal; 3693 push @WAIT_FOR_TICK, $signal;
3333 $signal->wait; 3694 $signal->wait;
3334} 3695}
3335 3696
3336sub wait_for_tick_begin { 3697sub wait_for_tick_begin {
3337 return unless $TICK_WATCHER->is_active; 3698 return if tick_inhibit;
3338 return if $Coro::current == $Coro::main; 3699 return if $Coro::current == $Coro::main;
3339 3700
3340 my $signal = new Coro::Signal; 3701 my $signal = new Coro::Signal;
3341 push @WAIT_FOR_TICK_BEGIN, $signal; 3702 push @WAIT_FOR_TICK_BEGIN, $signal;
3342 $signal->wait; 3703 $signal->wait;
3343} 3704}
3344 3705
3345 my $min = 1e6;#d# 3706sub tick {
3346 my $avg = 10;
3347$TICK_WATCHER = Event->timer (
3348 reentrant => 0,
3349 parked => 1,
3350 prio => 0,
3351 at => $NEXT_TICK || $TICK,
3352 data => WF_AUTOCANCEL,
3353 cb => sub {
3354 if ($Coro::current != $Coro::main) { 3707 if ($Coro::current != $Coro::main) {
3355 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"
3356 unless ++$bug_warning > 10; 3709 unless ++$bug_warning > 10;
3357 return; 3710 return;
3358 } 3711 }
3359 3712
3360 $NOW = $tick_start = Event::time;
3361
3362 cf::server_tick; # one server iteration 3713 cf::server_tick; # one server iteration
3363 3714
3364 0 && sync_job {#d# 3715 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3365 for(1..10) { 3716 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3366 my $t = Event::time; 3717 Coro::async_pool {
3367 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3718 $Coro::current->{desc} = "runtime saver";
3368 or die; 3719 write_runtime_sync
3369 3720 or warn "ERROR: unable to write runtime file: $!";
3370 $map->width (50);
3371 $map->height (50);
3372 $map->alloc;
3373 $map->_load_objects ("/tmp/x.map", 1);
3374 my $t = Event::time - $t;
3375
3376 #next unless $t < 0.0013;#d#
3377 if ($t < $min) {
3378 $min = $t;
3379 }
3380 $avg = $avg * 0.99 + $t * 0.01;
3381 }
3382 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3383 exit 0;
3384 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3385 }; 3721 };
3722 }
3386 3723
3387 $RUNTIME += $TICK;
3388 $NEXT_TICK += $TICK;
3389
3390 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3391 $NEXT_RUNTIME_WRITE = $NOW + 10;
3392 Coro::async_pool {
3393 write_runtime
3394 or warn "ERROR: unable to write runtime file: $!";
3395 };
3396 }
3397
3398# my $AFTER = Event::time;
3399# warn $AFTER - $NOW;#d#
3400
3401 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3724 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3402 $sig->send; 3725 $sig->send;
3403 } 3726 }
3404 while (my $sig = shift @WAIT_FOR_TICK) { 3727 while (my $sig = shift @WAIT_FOR_TICK) {
3405 $sig->send; 3728 $sig->send;
3406 } 3729 }
3407 3730
3408 $NOW = Event::time; 3731 $LOAD = ($NOW - $TICK_START) / $TICK;
3409
3410 # if we are delayed by four ticks or more, skip them all
3411 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3412
3413 $TICK_WATCHER->at ($NEXT_TICK);
3414 $TICK_WATCHER->start;
3415
3416 $LOAD = ($NOW - $tick_start) / $TICK;
3417 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3732 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3418 3733
3419 _post_tick; 3734 if (0) {
3420 3735 if ($NEXT_TICK) {
3421 3736 my $jitter = $TICK_START - $NEXT_TICK;
3737 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3738 warn "jitter $JITTER\n";#d#
3739 }
3422 }, 3740 }
3423); 3741}
3424 3742
3425{ 3743{
3426 BDB::max_poll_time $TICK * 0.1; 3744 # configure BDB
3427 $BDB_POLL_WATCHER = Event->io ( 3745
3428 reentrant => 0,
3429 fd => BDB::poll_fileno,
3430 poll => 'r',
3431 prio => 0,
3432 data => WF_AUTOCANCEL,
3433 cb => \&BDB::poll_cb,
3434 );
3435 BDB::min_parallel 8; 3746 BDB::min_parallel 8;
3436 3747 BDB::max_poll_reqs $TICK * 0.1;
3437 BDB::set_sync_prepare { 3748 $Coro::BDB::WATCHER->priority (1);
3438 my $status;
3439 my $current = $Coro::current;
3440 (
3441 sub {
3442 $status = $!;
3443 $current->ready; undef $current;
3444 },
3445 sub {
3446 Coro::schedule while defined $current;
3447 $! = $status;
3448 },
3449 )
3450 };
3451 3749
3452 unless ($DB_ENV) { 3750 unless ($DB_ENV) {
3453 $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);
3454 3756
3455 cf::sync_job { 3757 cf::sync_job {
3456 eval { 3758 eval {
3457 BDB::db_env_open 3759 BDB::db_env_open
3458 $DB_ENV, 3760 $DB_ENV,
3460 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
3461 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3763 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3462 0666; 3764 0666;
3463 3765
3464 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3766 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3465
3466 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3467 $DB_ENV->set_lk_detect;
3468 }; 3767 };
3469 3768
3470 cf::cleanup "db_env_open(db): $@" if $@; 3769 cf::cleanup "db_env_open(db): $@" if $@;
3471 }; 3770 };
3472 } 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 };
3473} 3782}
3474 3783
3475{ 3784{
3785 # configure IO::AIO
3786
3476 IO::AIO::min_parallel 8; 3787 IO::AIO::min_parallel 8;
3477
3478 undef $Coro::AIO::WATCHER;
3479 IO::AIO::max_poll_time $TICK * 0.1; 3788 IO::AIO::max_poll_time $TICK * 0.1;
3480 $AIO_POLL_WATCHER = Event->io ( 3789 $Coro::AIO::WATCHER->priority (1);
3481 reentrant => 0,
3482 data => WF_AUTOCANCEL,
3483 fd => IO::AIO::poll_fileno,
3484 poll => 'r',
3485 prio => 6,
3486 cb => \&IO::AIO::poll_cb,
3487 );
3488} 3790}
3489 3791
3490my $_log_backtrace; 3792my $_log_backtrace;
3491 3793
3492sub _log_backtrace { 3794sub _log_backtrace {
3496 3798
3497 # limit the # of concurrent backtraces 3799 # limit the # of concurrent backtraces
3498 if ($_log_backtrace < 2) { 3800 if ($_log_backtrace < 2) {
3499 ++$_log_backtrace; 3801 ++$_log_backtrace;
3500 async { 3802 async {
3803 $Coro::current->{desc} = "abt $msg";
3804
3501 my @bt = fork_call { 3805 my @bt = fork_call {
3502 @addr = map { sprintf "%x", $_ } @addr; 3806 @addr = map { sprintf "%x", $_ } @addr;
3503 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3807 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3504 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 |"
3505 or die "addr2line: $!"; 3809 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines