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.359 by root, Sat Sep 8 18:15:55 2007 UTC vs.
Revision 1.428 by root, Thu May 1 06:33:19 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, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # 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
325 360
326 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
327} 362}
328 363
329sub freeze_mainloop { 364sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
331 366
332 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
333 $TICK_WATCHER->start; 368}
334 }; 369
335 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
336 $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
337} 383}
338 384
339=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
340 386
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
352our @SLOT_QUEUE; 398our @SLOT_QUEUE;
353our $SLOT_QUEUE; 399our $SLOT_QUEUE;
354 400
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
357 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
358 406
359 while () { 407 while () {
360 next_job: 408 next_job:
361 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
369 } 417 }
370 } 418 }
371 } 419 }
372 420
373 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
374 # 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
375 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 424 $signal->wait;
377 } else { 425 } else {
378 Coro::schedule; 426 Coro::schedule;
379 } 427 }
380 } 428 }
381}; 429};
382 430
383sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main;
433
384 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
385 435
386 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
388 438
402 452
403BEGIN { *async = \&Coro::async_pool } 453BEGIN { *async = \&Coro::async_pool }
404 454
405=item cf::sync_job { BLOCK } 455=item cf::sync_job { BLOCK }
406 456
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 457The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 458is always able to handle events or runnable, as Deliantra is only
409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 459partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 460acceptable.
411 461
412If it must be done, put the blocking parts into C<sync_job>. This will run 462If it must be done, put the blocking parts into C<sync_job>. This will run
413the given BLOCK in another coroutine while waiting for the result. The 463the given BLOCK in another coroutine while waiting for the result. The
418 468
419sub sync_job(&) { 469sub sync_job(&) {
420 my ($job) = @_; 470 my ($job) = @_;
421 471
422 if ($Coro::current == $Coro::main) { 472 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 473 my $time = EV::time;
424 474
425 # this is the main coro, too bad, we have to block 475 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 476 # till the operation succeeds, freezing the server :/
427 477
428 # TODO: use suspend/resume instead 478 LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 479
430 my $freeze_guard = freeze_mainloop; 480 my $freeze_guard = freeze_mainloop;
431 481
432 my $busy = 1; 482 my $busy = 1;
433 my @res; 483 my @res;
434 484
435 (async { 485 (async {
486 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 487 @res = eval { $job->() };
437 warn $@ if $@; 488 warn $@ if $@;
438 undef $busy; 489 undef $busy;
439 })->prio (Coro::PRIO_MAX); 490 })->prio (Coro::PRIO_MAX);
440 491
441 while ($busy) { 492 while ($busy) {
442 Coro::cede or Event::one_event; 493 if (Coro::nready) {
494 Coro::cede_notself;
495 } else {
496 EV::loop EV::LOOP_ONESHOT;
443 } 497 }
498 }
444 499
445 $time = Event::time - $time; 500 my $time = EV::time - $time;
446 501
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load 502 $TICK_START += $time; # do not account sync jobs to server load
451 503
452 wantarray ? @res : $res[0] 504 wantarray ? @res : $res[0]
453 } else { 505 } else {
454 # we are in another coroutine, how wonderful, everything just works 506 # we are in another coroutine, how wonderful, everything just works
455 507
480=item fork_call { }, $args 532=item fork_call { }, $args
481 533
482Executes the given code block with the given arguments in a seperate 534Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 535process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 536Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 537never block itself or use any form of event handling.
486 538
487=cut 539=cut
488 540
489sub fork_call(&@) { 541sub fork_call(&@) {
490 my ($cb, @args) = @_; 542 my ($cb, @args) = @_;
499 }, @args; 551 }, @args;
500 552
501 wantarray ? @res : $res[-1] 553 wantarray ? @res : $res[-1]
502} 554}
503 555
556=item $coin = coin_from_name $name
557
558=cut
559
560our %coin_alias = (
561 "silver" => "silvercoin",
562 "silvercoin" => "silvercoin",
563 "silvercoins" => "silvercoin",
564 "gold" => "goldcoin",
565 "goldcoin" => "goldcoin",
566 "goldcoins" => "goldcoin",
567 "platinum" => "platinacoin",
568 "platinumcoin" => "platinacoin",
569 "platinumcoins" => "platinacoin",
570 "platina" => "platinacoin",
571 "platinacoin" => "platinacoin",
572 "platinacoins" => "platinacoin",
573 "royalty" => "royalty",
574 "royalties" => "royalty",
575);
576
577sub coin_from_name($) {
578 $coin_alias{$_[0]}
579 ? cf::arch::find $coin_alias{$_[0]}
580 : undef
581}
582
504=item $value = cf::db_get $family => $key 583=item $value = cf::db_get $family => $key
505 584
506Returns a single value from the environment database. 585Returns a single value from the environment database.
507 586
508=item cf::db_put $family => $key => $value 587=item cf::db_put $family => $key => $value
509 588
510Stores the given C<$value> in the family. It can currently store binary 589Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 590data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 591
592=item $db = cf::db_table "name"
593
594Create and/or open a new database table. The string must not be "db" and must be unique
595within each server.
596
513=cut 597=cut
598
599sub db_table($) {
600 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV;
602
603 eval {
604 $db->set_flags (BDB::CHKSUM);
605
606 utf8::encode $name;
607 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
608 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
609 cf::cleanup "db_open(db): $!" if $!;
610 };
611 cf::cleanup "db_open(db): $@" if $@;
612
613 $db
614}
514 615
515our $DB; 616our $DB;
516 617
517sub db_init { 618sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 619 cf::sync_job {
522 eval { 620 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 621 };
532} 622}
533 623
534sub db_get($$) { 624sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 625 my $key = "$_[0]/$_[1]";
536 626
640attach callbacks/event handlers (a collection of which is called an "attachment") 730attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 731to it. All such attachable objects support the following methods.
642 732
643In the following description, CLASS can be any of C<global>, C<object> 733In the following description, CLASS can be any of C<global>, C<object>
644C<player>, C<client> or C<map> (i.e. the attachable objects in 734C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 735Deliantra).
646 736
647=over 4 737=over 4
648 738
649=item $attachable->attach ($attachment, key => $value...) 739=item $attachable->attach ($attachment, key => $value...)
650 740
932 } 1022 }
933 1023
934 0 1024 0
935} 1025}
936 1026
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1027=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1028
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1030
941Generate an object-specific event with the given arguments. 1031Generate an object-specific event with the given arguments.
942 1032
948 1038
949=cut 1039=cut
950 1040
951############################################################################# 1041#############################################################################
952# object support 1042# object support
953#
954 1043
1044sub _object_equal($$);
1045sub _object_equal($$) {
1046 my ($a, $b) = @_;
1047
1048 return 0 unless (ref $a) eq (ref $b);
1049
1050 if ("HASH" eq ref $a) {
1051 my @ka = keys %$a;
1052 my @kb = keys %$b;
1053
1054 return 0 if @ka != @kb;
1055
1056 for (0 .. $#ka) {
1057 return 0 unless $ka[$_] eq $kb[$_];
1058 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1059 }
1060
1061 } elsif ("ARRAY" eq ref $a) {
1062
1063 return 0 if @$a != @$b;
1064
1065 for (0 .. $#$a) {
1066 return 0 unless _object_equal $a->[$_], $b->[$_];
1067 }
1068
1069 } elsif ($a ne $b) {
1070 return 0;
1071 }
1072
1073 1
1074}
1075
1076our $SLOW_MERGES;#d#
955sub _can_merge { 1077sub _can_merge {
956 my ($ob1, $ob2) = @_; 1078 my ($ob1, $ob2) = @_;
957 1079
958 local $Storable::canonical = 1; 1080 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1081
962 $fob1 eq $fob2 1082 # we do the slow way here
1083 return _object_equal $ob1, $ob2
963} 1084}
964 1085
965sub reattach { 1086sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1087 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1088 my ($obj) = @_;
989cf::attachable->attach ( 1110cf::attachable->attach (
990 prio => -1000000, 1111 prio => -1000000,
991 on_instantiate => sub { 1112 on_instantiate => sub {
992 my ($obj, $data) = @_; 1113 my ($obj, $data) = @_;
993 1114
994 $data = from_json $data; 1115 $data = decode_json $data;
995 1116
996 for (@$data) { 1117 for (@$data) {
997 my ($name, $args) = @$_; 1118 my ($name, $args) = @$_;
998 1119
999 $obj->attach ($name, %{$args || {} }); 1120 $obj->attach ($name, %{$args || {} });
1013); 1134);
1014 1135
1015sub object_freezer_save { 1136sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1137 my ($filename, $rdata, $objs) = @_;
1017 1138
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1139 sync_job {
1021 if (length $$rdata) { 1140 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1024 1144
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1149 aio_close $fh;
1030 1150
1031 if (@$objs) { 1151 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1157 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1159 }
1040 } else { 1160 } else {
1041 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1042 } 1162 }
1048 } else { 1168 } else {
1049 aio_unlink $filename; 1169 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1170 aio_unlink "$filename.pst";
1051 } 1171 }
1052 }; 1172 };
1053
1054 undef $guard;
1055} 1173}
1056 1174
1057sub object_freezer_as_string { 1175sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1176 my ($rdata, $objs) = @_;
1059 1177
1064 1182
1065sub object_thawer_load { 1183sub object_thawer_load {
1066 my ($filename) = @_; 1184 my ($filename) = @_;
1067 1185
1068 my ($data, $av); 1186 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1187
1072 (aio_load $filename, $data) >= 0 1188 (aio_load $filename, $data) >= 0
1073 or return; 1189 or return;
1074 1190
1075 unless (aio_stat "$filename.pst") { 1191 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1192 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1193 or return;
1078 1194
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1195 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs};
1081 } 1197 }
1082 1198
1199 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1200 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1201 $decname, length $data, scalar @{$av || []};
1085 1202
1086 ($data, $av) 1203 ($data, $av)
1087} 1204}
1088 1205
1089=head2 COMMAND CALLBACKS 1206=head2 COMMAND CALLBACKS
1240 my $msg = $@ ? "$v->{path}: $@\n" 1357 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n"; 1358 : "$v->{base}: extension inactive.\n";
1242 1359
1243 if (exists $v->{meta}{mandatory}) { 1360 if (exists $v->{meta}{mandatory}) {
1244 warn $msg; 1361 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n"; 1362 cf::cleanup "mandatory extension failed to load, exiting.";
1246 exit 1;
1247 } 1363 }
1248 1364
1249 warn $msg; 1365 warn $msg;
1250 } 1366 }
1251 1367
1276use Coro::AIO; 1392use Coro::AIO;
1277 1393
1278=head3 cf::player 1394=head3 cf::player
1279 1395
1280=over 4 1396=over 4
1397
1398=item cf::player::num_playing
1399
1400Returns the official number of playing players, as per the Crossfire metaserver rules.
1401
1402=cut
1403
1404sub num_playing {
1405 scalar grep
1406 $_->ob->map
1407 && !$_->hidden
1408 && !$_->ob->flag (cf::FLAG_WIZ),
1409 cf::player::list
1410}
1281 1411
1282=item cf::player::find $login 1412=item cf::player::find $login
1283 1413
1284Returns the given player object, loading it if necessary (might block). 1414Returns the given player object, loading it if necessary (might block).
1285 1415
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1454 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1455
1326 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1457 or return;
1328 1458
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1331 or return; 1460 or return;
1461
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1335 } 1465 }
1336 } 1466 }
1346 1476
1347 return if $pl->{deny_save}; 1477 return if $pl->{deny_save};
1348 1478
1349 aio_mkdir playerdir $pl, 0770; 1479 aio_mkdir playerdir $pl, 0770;
1350 $pl->{last_save} = $cf::RUNTIME; 1480 $pl->{last_save} = $cf::RUNTIME;
1481
1482 cf::get_slot 0.01;
1351 1483
1352 $pl->save_pl ($path); 1484 $pl->save_pl ($path);
1353 cf::cede_to_tick; 1485 cf::cede_to_tick;
1354} 1486}
1355 1487
1439 1571
1440 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1441 my $path = path $login; 1573 my $path = path $login;
1442 1574
1443 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1446 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1447 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 } 1581 }
1449 1582
1486 1619
1487Expand crossfire pod fragments into protocol xml. 1620Expand crossfire pod fragments into protocol xml.
1488 1621
1489=cut 1622=cut
1490 1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1491sub expand_cfpod { 1635sub expand_cfpod {
1492 ((my $self), (local $_)) = @_; 1636 my ($self, $pod) = @_;
1493 1637
1494 # escape & and < 1638 my $xml;
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497 1639
1498 # this is buggy, it needs to properly take care of nested <'s 1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1499 1643
1500 1 while 1644 $group =~ s/&/&amp;/g;
1501 # replace B<>, I<>, U<> etc. 1645 $group =~ s/</&lt;/g;
1502 s/B<([^\>]*)>/<b>$1<\/b>/ 1646
1503 || s/I<([^\>]*)>/<i>$1<\/i>/ 1647 $xml .= $group;
1504 || s/U<([^\>]*)>/<u>$1<\/u>/ 1648 } elsif ($pod =~ m%\G
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1649 ([BCGHITU])
1506 # replace G<male|female> tags 1650 <
1507 || s{G<([^>|]*)\|([^>]*)>}{ 1651 (?:
1508 $self->gender ? $2 : $1 1652 ([^<>]*) (?{ $group = $^N })
1509 }ge 1653 | < $interior >
1510 # replace H<hint text> 1654 )
1511 || s{H<([^\>]*)>} 1655 >
1656 %gcsx
1512 { 1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "") 1677 "")
1516 [$self->{hintmode}] 1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1517 }ge; 1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1518 1689
1690 for ($xml) {
1519 # create single paragraphs (very hackish) 1691 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g; 1692 s/(?<=\S)\n(?=\w)/ /g;
1521 1693
1522 # compress some whitespace 1694 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends 1695 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines 1696 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines 1697 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines 1698 s/\n+$//; # ending lines
1699 }
1527 1700
1528 $_ 1701 $xml
1529} 1702}
1703
1704no re 'eval';
1530 1705
1531sub hintmode { 1706sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1; 1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode} 1708 $_[0]{hintmode}
1534} 1709}
1606our $MAX_RESET = 3600; 1781our $MAX_RESET = 3600;
1607our $DEFAULT_RESET = 3000; 1782our $DEFAULT_RESET = 3000;
1608 1783
1609sub generate_random_map { 1784sub generate_random_map {
1610 my ($self, $rmp) = @_; 1785 my ($self, $rmp) = @_;
1786
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788
1611 # mit "rum" bekleckern, nicht 1789 # mit "rum" bekleckern, nicht
1612 $self->_create_random_map ( 1790 $self->_create_random_map (
1613 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1614 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1615 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 1915
1738# the temporary/swap location 1916# the temporary/swap location
1739sub save_path { 1917sub save_path {
1740 my ($self) = @_; 1918 my ($self) = @_;
1741 1919
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1920 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$TMPDIR/$path.map" 1921 "$TMPDIR/$path.map"
1744} 1922}
1745 1923
1746# the unique path, undef == no special unique path 1924# the unique path, undef == no special unique path
1747sub uniq_path { 1925sub uniq_path {
1748 my ($self) = @_; 1926 my ($self) = @_;
1749 1927
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$UNIQUEDIR/$path" 1929 "$UNIQUEDIR/$path"
1752} 1930}
1753 1931
1754# and all this just because we cannot iterate over 1932# and all this just because we cannot iterate over
1755# all maps in C++... 1933# all maps in C++...
1891 2069
1892 { 2070 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 2071 my $guard = cf::lock_acquire "map_data:$path";
1894 2072
1895 return unless $self->valid; 2073 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2074 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2075
1898 $self->in_memory (cf::MAP_LOADING); 2076 $self->in_memory (cf::MAP_LOADING);
1899 2077
1900 $self->alloc; 2078 $self->alloc;
1901 2079
1941 } 2119 }
1942 2120
1943 $self->{last_save} = $cf::RUNTIME; 2121 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME); 2122 $self->last_access ($cf::RUNTIME);
1945 2123
1946 $self->in_memory (cf::MAP_IN_MEMORY); 2124 $self->in_memory (cf::MAP_ACTIVE);
1947 } 2125 }
1948 2126
1949 $self->post_load; 2127 $self->post_load;
1950} 2128}
1951 2129
2009 my ($path, $origin, $load) = @_; 2187 my ($path, $origin, $load) = @_;
2010 2188
2011 $path = normalise $path, $origin && $origin->{path}; 2189 $path = normalise $path, $origin && $origin->{path};
2012 2190
2013 if (my $map = $cf::MAP{$path}) { 2191 if (my $map = $cf::MAP{$path}) {
2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2015 } 2193 }
2016 2194
2017 $MAP_PREFETCH{$path} |= $load; 2195 $MAP_PREFETCH{$path} |= $load;
2018 2196
2019 $MAP_PREFETCHER ||= cf::async { 2197 $MAP_PREFETCHER ||= cf::async {
2198 $Coro::current->{desc} = "map prefetcher";
2199
2020 while (%MAP_PREFETCH) { 2200 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2201 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2202 if (my $map = find $k) {
2023 $map->load if $v; 2203 $map->load if $v;
2024 } 2204 }
2050 return if $self->{deny_save}; 2230 return if $self->{deny_save};
2051 2231
2052 local $self->{last_access} = $self->last_access;#d# 2232 local $self->{last_access} = $self->last_access;#d#
2053 2233
2054 cf::async { 2234 cf::async {
2235 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2236 $_->contr->save for $self->players;
2056 }; 2237 };
2238
2239 cf::get_slot 0.02;
2057 2240
2058 if ($uniq) { 2241 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2242 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2060 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2243 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2061 } else { 2244 } else {
2070 $self->save; 2253 $self->save;
2071 2254
2072 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2073 2256
2074 return if $self->players; 2257 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY; 2258 return if $self->in_memory != cf::MAP_ACTIVE;
2076 return if $self->{deny_save}; 2259 return if $self->{deny_save};
2077 2260
2078 $self->in_memory (cf::MAP_SWAPPED); 2261 $self->in_memory (cf::MAP_SWAPPED);
2079 2262
2080 $self->deactivate; 2263 $self->deactivate;
2198 2381
2199sub unique_maps() { 2382sub unique_maps() {
2200 [ 2383 [
2201 map { 2384 map {
2202 utf8::decode $_; 2385 utf8::decode $_;
2203 /\.map$/ 2386 s/\.map$//; # TODO future compatibility hack
2387 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2388 ? ()
2204 ? normalise $_ 2389 : normalise $_
2205 : ()
2206 } @{ aio_readdir $UNIQUEDIR or [] } 2390 } @{ aio_readdir $UNIQUEDIR or [] }
2207 ] 2391 ]
2208} 2392}
2209 2393
2210package cf;
2211
2212=back 2394=back
2213 2395
2214=head3 cf::object 2396=head3 cf::object
2215 2397
2216=cut 2398=cut
2219 2401
2220=over 4 2402=over 4
2221 2403
2222=item $ob->inv_recursive 2404=item $ob->inv_recursive
2223 2405
2224Returns the inventory of the object _and_ their inventories, recursively. 2406Returns the inventory of the object I<and> their inventories, recursively,
2407but I<not> the object itself.
2225 2408
2226=cut 2409=cut
2227 2410
2228sub inv_recursive_; 2411sub inv_recursive_;
2229sub inv_recursive_ { 2412sub inv_recursive_ {
2234 inv_recursive_ inv $_[0] 2417 inv_recursive_ inv $_[0]
2235} 2418}
2236 2419
2237=item $ref = $ob->ref 2420=item $ref = $ob->ref
2238 2421
2239creates and returns a persistent reference to an objetc that can be stored as a string. 2422Creates and returns a persistent reference to an object that can be stored as a string.
2240 2423
2241=item $ob = cf::object::deref ($refstring) 2424=item $ob = cf::object::deref ($refstring)
2242 2425
2243returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2426returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2244even if the object actually exists. May block. 2427even if the object actually exists. May block.
2246=cut 2429=cut
2247 2430
2248sub deref { 2431sub deref {
2249 my ($ref) = @_; 2432 my ($ref) = @_;
2250 2433
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2434 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2); 2435 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2436 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return; 2437 or return;
2258 $pl->ob->uuid eq $uuid 2438 $pl->ob->uuid eq $uuid
2259 or return; 2439 or return;
2279can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2280dialogue with the given NPC character. 2460dialogue with the given NPC character.
2281 2461
2282=cut 2462=cut
2283 2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2477
2284# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2285# with dialog boxes. 2479# with dialog boxes.
2286#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2287sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2288 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
2299 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2300 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2301 2495
2302 } else { 2496 } else {
2303 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2304 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2305 } 2499 }
2306 } 2500 }
2307} 2501}
2308 2502
2309=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2624 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2431 2625
2432 $self->enter_link; 2626 $self->enter_link;
2433 2627
2434 (async { 2628 (async {
2629 $Coro::current->{desc} = "player::goto $path $x $y";
2630
2631 # *tag paths override both path and x|y
2632 if ($path =~ /^\*(.*)$/) {
2633 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2634 my $ob = $obs[rand @obs];
2635
2636 # see if we actually can go there
2637 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2638 $ob = $obs[rand @obs];
2639 } else {
2640 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2641 }
2642 # else put us there anyways for now #d#
2643
2644 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2645 } else {
2646 ($path, $x, $y) = (undef, undef, undef);
2647 }
2648 }
2649
2435 my $map = eval { 2650 my $map = eval {
2436 my $map = cf::map::find $path; 2651 my $map = defined $path ? cf::map::find $path : undef;
2437 2652
2438 if ($map) { 2653 if ($map) {
2439 $map = $map->customise_for ($self); 2654 $map = $map->customise_for ($self);
2440 $map = $check->($map) if $check && $map; 2655 $map = $check->($map) if $check && $map;
2441 } else { 2656 } else {
2442 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2657 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2443 } 2658 }
2444 2659
2445 $map 2660 $map
2446 }; 2661 };
2447 2662
2500 $rmp->{origin_y} = $exit->y; 2715 $rmp->{origin_y} = $exit->y;
2501 } 2716 }
2502 2717
2503 $rmp->{random_seed} ||= $exit->random_seed; 2718 $rmp->{random_seed} ||= $exit->random_seed;
2504 2719
2505 my $data = cf::to_json $rmp; 2720 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2506 my $md5 = Digest::MD5::md5_hex $data; 2721 my $md5 = Digest::MD5::md5_hex $data;
2507 my $meta = "$RANDOMDIR/$md5.meta"; 2722 my $meta = "$RANDOMDIR/$md5.meta";
2508 2723
2509 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2724 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2510 aio_write $fh, 0, (length $data), $data, 0; 2725 aio_write $fh, 0, (length $data), $data, 0;
2537 # if exit is damned, update players death & WoR home-position 2752 # if exit is damned, update players death & WoR home-position
2538 $self->contr->savebed ($slaying, $hp, $sp) 2753 $self->contr->savebed ($slaying, $hp, $sp)
2539 if $exit->flag (FLAG_DAMNED); 2754 if $exit->flag (FLAG_DAMNED);
2540 2755
2541 (async { 2756 (async {
2757 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2758
2542 $self->deactivate_recursive; # just to be sure 2759 $self->deactivate_recursive; # just to be sure
2543 unless (eval { 2760 unless (eval {
2544 $self->goto ($slaying, $hp, $sp); 2761 $self->goto ($slaying, $hp, $sp);
2545 2762
2546 1; 2763 1;
2581the message, with C<log> being the default. If C<$color> is negative, suppress 2798the message, with C<log> being the default. If C<$color> is negative, suppress
2582the message unless the client supports the msg packet. 2799the message unless the client supports the msg packet.
2583 2800
2584=cut 2801=cut
2585 2802
2803# non-persistent channels (usually the info channel)
2586our %CHANNEL = ( 2804our %CHANNEL = (
2587 "c/identify" => { 2805 "c/identify" => {
2588 id => "identify", 2806 id => "infobox",
2589 title => "Identify", 2807 title => "Identify",
2590 reply => undef, 2808 reply => undef,
2591 tooltip => "Items recently identified", 2809 tooltip => "Items recently identified",
2592 }, 2810 },
2593 "c/examine" => { 2811 "c/examine" => {
2594 id => "examine", 2812 id => "infobox",
2595 title => "Examine", 2813 title => "Examine",
2596 reply => undef, 2814 reply => undef,
2597 tooltip => "Signs and other items you examined", 2815 tooltip => "Signs and other items you examined",
2598 }, 2816 },
2817 "c/book" => {
2818 id => "infobox",
2819 title => "Book",
2820 reply => undef,
2821 tooltip => "The contents of a note or book",
2822 },
2823 "c/lookat" => {
2824 id => "infobox",
2825 title => "Look",
2826 reply => undef,
2827 tooltip => "What you saw there",
2828 },
2829 "c/who" => {
2830 id => "infobox",
2831 title => "Players",
2832 reply => undef,
2833 tooltip => "Shows players who are currently online",
2834 },
2835 "c/body" => {
2836 id => "infobox",
2837 title => "Body Parts",
2838 reply => undef,
2839 tooltip => "Shows which body parts you posess and are available",
2840 },
2841 "c/uptime" => {
2842 id => "infobox",
2843 title => "Uptime",
2844 reply => undef,
2845 tooltip => "How long the server has been running since last restart",
2846 },
2847 "c/mapinfo" => {
2848 id => "infobox",
2849 title => "Map Info",
2850 reply => undef,
2851 tooltip => "Information related to the maps",
2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2599); 2859);
2600 2860
2601sub cf::client::send_msg { 2861sub cf::client::send_msg {
2602 my ($self, $channel, $msg, $color, @extra) = @_; 2862 my ($self, $channel, $msg, $color, @extra) = @_;
2603 2863
2604 $msg = $self->pl->expand_cfpod ($msg); 2864 $msg = $self->pl->expand_cfpod ($msg);
2605 2865
2606 $color &= cf::NDI_CLIENT_MASK; # just in case... 2866 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607 2867
2608 # check predefined channels, for the benefit of C 2868 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2869 if ($CHANNEL{$channel}) {
2870 $channel = $CHANNEL{$channel};
2610 2871
2872 $self->ext_msg (channel_info => $channel)
2873 if $self->can_msg;
2874
2875 $channel = $channel->{id};
2876
2611 if (ref $channel) { 2877 } elsif (ref $channel) {
2612 # send meta info to client, if not yet sent 2878 # send meta info to client, if not yet sent
2613 unless (exists $self->{channel}{$channel->{id}}) { 2879 unless (exists $self->{channel}{$channel->{id}}) {
2614 $self->{channel}{$channel->{id}} = $channel; 2880 $self->{channel}{$channel->{id}} = $channel;
2615 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg; 2882 if $self->can_msg;
2833=pod 3099=pod
2834 3100
2835The following functions and methods are available within a safe environment: 3101The following functions and methods are available within a safe environment:
2836 3102
2837 cf::object 3103 cf::object
2838 contr pay_amount pay_player map x y force_find force_add 3104 contr pay_amount pay_player map x y force_find force_add destroy
2839 insert remove name archname title slaying race decrease_ob_nr 3105 insert remove name archname title slaying race decrease split
2840 3106
2841 cf::object::player 3107 cf::object::player
2842 player 3108 player
2843 3109
2844 cf::player 3110 cf::player
2850=cut 3116=cut
2851 3117
2852for ( 3118for (
2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2854 insert remove inv name archname title slaying race 3120 insert remove inv name archname title slaying race
2855 decrease_ob_nr)], 3121 decrease split destroy)],
2856 ["cf::object::player" => qw(player)], 3122 ["cf::object::player" => qw(player)],
2857 ["cf::player" => qw(peaceful)], 3123 ["cf::player" => qw(peaceful)],
2858 ["cf::map" => qw(trigger)], 3124 ["cf::map" => qw(trigger)],
2859) { 3125) {
2860 no strict 'refs'; 3126 no strict 'refs';
2965 { 3231 {
2966 my $faces = $facedata->{faceinfo}; 3232 my $faces = $facedata->{faceinfo};
2967 3233
2968 while (my ($face, $info) = each %$faces) { 3234 while (my ($face, $info) = each %$faces) {
2969 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3235 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3236
2970 cf::face::set_visibility $idx, $info->{visibility}; 3237 cf::face::set_visibility $idx, $info->{visibility};
2971 cf::face::set_magicmap $idx, $info->{magicmap}; 3238 cf::face::set_magicmap $idx, $info->{magicmap};
2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3239 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3240 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2974 3241
2975 cf::cede_to_tick; 3242 cf::cede_to_tick;
2976 } 3243 }
2977 3244
2978 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
2979 next unless $info->{smooth}; 3246 next unless $info->{smooth};
3247
2980 my $idx = cf::face::find $face 3248 my $idx = cf::face::find $face
2981 or next; 3249 or next;
3250
2982 if (my $smooth = cf::face::find $info->{smooth}) { 3251 if (my $smooth = cf::face::find $info->{smooth}) {
2983 cf::face::set_smooth $idx, $smooth; 3252 cf::face::set_smooth $idx, $smooth;
2984 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3253 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2985 } else { 3254 } else {
2986 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3255 warn "smooth face '$info->{smooth}' not found for face '$face'";
3004 { 3273 {
3005 # TODO: for gcfclient pleasure, we should give resources 3274 # TODO: for gcfclient pleasure, we should give resources
3006 # that gcfclient doesn't grok a >10000 face index. 3275 # that gcfclient doesn't grok a >10000 face index.
3007 my $res = $facedata->{resource}; 3276 my $res = $facedata->{resource};
3008 3277
3009 my $soundconf = delete $res->{"res/sound.conf"};
3010
3011 while (my ($name, $info) = each %$res) { 3278 while (my ($name, $info) = each %$res) {
3279 if (defined $info->{type}) {
3012 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3280 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3013 my $data; 3281 my $data;
3014 3282
3015 if ($info->{type} & 1) { 3283 if ($info->{type} & 1) {
3016 # prepend meta info 3284 # prepend meta info
3017 3285
3018 my $meta = $enc->encode ({ 3286 my $meta = $enc->encode ({
3019 name => $name, 3287 name => $name,
3020 %{ $info->{meta} || {} }, 3288 %{ $info->{meta} || {} },
3021 }); 3289 });
3022 3290
3023 $data = pack "(w/a*)*", $meta, $info->{data}; 3291 $data = pack "(w/a*)*", $meta, $info->{data};
3292 } else {
3293 $data = $info->{data};
3294 }
3295
3296 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3297 cf::face::set_type $idx, $info->{type};
3024 } else { 3298 } else {
3025 $data = $info->{data}; 3299 $RESOURCE{$name} = $info;
3026 } 3300 }
3027 3301
3028 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3029 cf::face::set_type $idx, $info->{type};
3030
3031 cf::cede_to_tick; 3302 cf::cede_to_tick;
3032 } 3303 }
3033
3034 if ($soundconf) {
3035 $soundconf = $enc->decode (delete $soundconf->{data});
3036
3037 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3038 my $sound = $soundconf->{compat}[$_]
3039 or next;
3040
3041 my $face = cf::face::find "sound/$sound->[1]";
3042 cf::sound::set $sound->[0] => $face;
3043 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3044 }
3045
3046 while (my ($k, $v) = each %{$soundconf->{event}}) {
3047 my $face = cf::face::find "sound/$v";
3048 cf::sound::set $k => $face;
3049 }
3050 }
3051 } 3304 }
3305
3306 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3052 3307
3053 1 3308 1
3054} 3309}
3310
3311cf::global->attach (on_resource_update => sub {
3312 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3313 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3314
3315 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3316 my $sound = $soundconf->{compat}[$_]
3317 or next;
3318
3319 my $face = cf::face::find "sound/$sound->[1]";
3320 cf::sound::set $sound->[0] => $face;
3321 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3322 }
3323
3324 while (my ($k, $v) = each %{$soundconf->{event}}) {
3325 my $face = cf::face::find "sound/$v";
3326 cf::sound::set $k => $face;
3327 }
3328 }
3329});
3055 3330
3056register_exticmd fx_want => sub { 3331register_exticmd fx_want => sub {
3057 my ($ns, $want) = @_; 3332 my ($ns, $want) = @_;
3058 3333
3059 while (my ($k, $v) = each %$want) { 3334 while (my ($k, $v) = each %$want) {
3060 $ns->fx_want ($k, $v); 3335 $ns->fx_want ($k, $v);
3061 } 3336 }
3062}; 3337};
3338
3339sub load_resource_file($) {
3340 my $guard = lock_acquire "load_resource_file";
3341
3342 my $status = load_resource_file_ $_[0];
3343 get_slot 0.1, 100;
3344 cf::arch::commit_load;
3345
3346 $status
3347}
3063 3348
3064sub reload_regions { 3349sub reload_regions {
3065 # HACK to clear player env face cache, we need some signal framework 3350 # HACK to clear player env face cache, we need some signal framework
3066 # for this (global event?) 3351 # for this (global event?)
3067 %ext::player_env::MUSIC_FACE_CACHE = (); 3352 %ext::player_env::MUSIC_FACE_CACHE = ();
3081} 3366}
3082 3367
3083sub reload_archetypes { 3368sub reload_archetypes {
3084 load_resource_file "$DATADIR/archetypes" 3369 load_resource_file "$DATADIR/archetypes"
3085 or die "unable to load archetypes\n"; 3370 or die "unable to load archetypes\n";
3086 #d# NEED to laod twice to resolve forward references
3087 # this really needs to be done in an extra post-pass
3088 # (which needs to be synchronous, so solve it differently)
3089 load_resource_file "$DATADIR/archetypes"
3090 or die "unable to load archetypes\n";
3091} 3371}
3092 3372
3093sub reload_treasures { 3373sub reload_treasures {
3094 load_resource_file "$DATADIR/treasures" 3374 load_resource_file "$DATADIR/treasures"
3095 or die "unable to load treasurelists\n"; 3375 or die "unable to load treasurelists\n";
3096} 3376}
3097 3377
3098sub reload_resources { 3378sub reload_resources {
3099 warn "reloading resource files...\n"; 3379 warn "reloading resource files...\n";
3100 3380
3381 reload_facedata;
3382 reload_archetypes;
3101 reload_regions; 3383 reload_regions;
3102 reload_facedata;
3103 #reload_archetypes;#d#
3104 reload_archetypes;
3105 reload_treasures; 3384 reload_treasures;
3106 3385
3107 warn "finished reloading resource files\n"; 3386 warn "finished reloading resource files\n";
3108} 3387}
3109 3388
3110sub init { 3389sub init {
3390 my $guard = freeze_mainloop;
3391
3111 reload_resources; 3392 reload_resources;
3112} 3393}
3113 3394
3114sub reload_config { 3395sub reload_config {
3115 open my $fh, "<:utf8", "$CONFDIR/config" 3396 open my $fh, "<:utf8", "$CONFDIR/config"
3116 or return; 3397 or return;
3117 3398
3118 local $/; 3399 local $/;
3119 *CFG = YAML::Syck::Load <$fh>; 3400 *CFG = YAML::Load <$fh>;
3120 3401
3121 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3402 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3122 3403
3123 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3404 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3124 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3405 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3135sub main { 3416sub main {
3136 # we must not ever block the main coroutine 3417 # we must not ever block the main coroutine
3137 local $Coro::idle = sub { 3418 local $Coro::idle = sub {
3138 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3419 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3139 (async { 3420 (async {
3140 Event::one_event; 3421 $Coro::current->{desc} = "IDLE BUG HANDLER";
3422 EV::loop EV::LOOP_ONESHOT;
3141 })->prio (Coro::PRIO_MAX); 3423 })->prio (Coro::PRIO_MAX);
3142 }; 3424 };
3143 3425
3426 {
3427 my $guard = freeze_mainloop;
3144 reload_config; 3428 reload_config;
3145 db_init; 3429 db_init;
3146 load_extensions; 3430 load_extensions;
3147 3431
3148 $TICK_WATCHER->start; 3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 evthread_start IO::AIO::poll_fileno;
3434 }
3435
3149 Event::loop; 3436 EV::loop;
3150} 3437}
3151 3438
3152############################################################################# 3439#############################################################################
3153# initialisation and cleanup 3440# initialisation and cleanup
3154 3441
3155# install some emergency cleanup handlers 3442# install some emergency cleanup handlers
3156BEGIN { 3443BEGIN {
3444 our %SIGWATCHER = ();
3157 for my $signal (qw(INT HUP TERM)) { 3445 for my $signal (qw(INT HUP TERM)) {
3158 Event->signal ( 3446 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3159 reentrant => 0,
3160 data => WF_AUTOCANCEL,
3161 signal => $signal,
3162 prio => 0,
3163 cb => sub {
3164 cf::cleanup "SIG$signal"; 3447 cf::cleanup "SIG$signal";
3165 },
3166 ); 3448 };
3167 } 3449 }
3168} 3450}
3169 3451
3170sub write_runtime { 3452sub write_runtime_sync {
3171 my $runtime = "$LOCALDIR/runtime"; 3453 my $runtime = "$LOCALDIR/runtime";
3172 3454
3173 # first touch the runtime file to show we are still running: 3455 # first touch the runtime file to show we are still running:
3174 # the fsync below can take a very very long time. 3456 # the fsync below can take a very very long time.
3175 3457
3201 and return; 3483 and return;
3202 3484
3203 warn "runtime file written.\n"; 3485 warn "runtime file written.\n";
3204 3486
3205 1 3487 1
3488}
3489
3490our $uuid_lock;
3491our $uuid_skip;
3492
3493sub write_uuid_sync($) {
3494 $uuid_skip ||= $_[0];
3495
3496 return if $uuid_lock;
3497 local $uuid_lock = 1;
3498
3499 my $uuid = "$LOCALDIR/uuid";
3500
3501 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3502 or return;
3503
3504 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3505 $uuid_skip = 0;
3506
3507 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3508 and return;
3509
3510 # always fsync - this file is important
3511 aio_fsync $fh
3512 and return;
3513
3514 close $fh
3515 or return;
3516
3517 aio_rename "$uuid~", $uuid
3518 and return;
3519
3520 warn "uuid file written ($value).\n";
3521
3522 1
3523
3524}
3525
3526sub write_uuid($$) {
3527 my ($skip, $sync) = @_;
3528
3529 $sync ? write_uuid_sync $skip
3530 : async { write_uuid_sync $skip };
3206} 3531}
3207 3532
3208sub emergency_save() { 3533sub emergency_save() {
3209 my $freeze_guard = cf::freeze_mainloop; 3534 my $freeze_guard = cf::freeze_mainloop;
3210 3535
3216 # and maps saved/destroyed asynchronously. 3541 # and maps saved/destroyed asynchronously.
3217 warn "begin emergency player save\n"; 3542 warn "begin emergency player save\n";
3218 for my $login (keys %cf::PLAYER) { 3543 for my $login (keys %cf::PLAYER) {
3219 my $pl = $cf::PLAYER{$login} or next; 3544 my $pl = $cf::PLAYER{$login} or next;
3220 $pl->valid or next; 3545 $pl->valid or next;
3546 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3221 $pl->save; 3547 $pl->save;
3222 } 3548 }
3223 warn "end emergency player save\n"; 3549 warn "end emergency player save\n";
3224 3550
3225 warn "begin emergency map save\n"; 3551 warn "begin emergency map save\n";
3231 warn "end emergency map save\n"; 3557 warn "end emergency map save\n";
3232 3558
3233 warn "begin emergency database checkpoint\n"; 3559 warn "begin emergency database checkpoint\n";
3234 BDB::db_env_txn_checkpoint $DB_ENV; 3560 BDB::db_env_txn_checkpoint $DB_ENV;
3235 warn "end emergency database checkpoint\n"; 3561 warn "end emergency database checkpoint\n";
3562
3563 warn "begin write uuid\n";
3564 write_uuid_sync 1;
3565 warn "end write uuid\n";
3236 }; 3566 };
3237 3567
3238 warn "leave emergency perl save\n"; 3568 warn "leave emergency perl save\n";
3239} 3569}
3240 3570
3255 warn "reloading..."; 3585 warn "reloading...";
3256 3586
3257 warn "entering sync_job"; 3587 warn "entering sync_job";
3258 3588
3259 cf::sync_job { 3589 cf::sync_job {
3260 cf::write_runtime; # external watchdog should not bark 3590 cf::write_runtime_sync; # external watchdog should not bark
3261 cf::emergency_save; 3591 cf::emergency_save;
3262 cf::write_runtime; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3263 3593
3264 warn "syncing database to disk"; 3594 warn "syncing database to disk";
3265 BDB::db_env_txn_checkpoint $DB_ENV; 3595 BDB::db_env_txn_checkpoint $DB_ENV;
3266 3596
3267 # if anything goes wrong in here, we should simply crash as we already saved 3597 # if anything goes wrong in here, we should simply crash as we already saved
3268
3269 warn "cancelling all WF_AUTOCANCEL watchers";
3270 for (Event::all_watchers) {
3271 $_->cancel if $_->data & WF_AUTOCANCEL;
3272 }
3273 3598
3274 warn "flushing outstanding aio requests"; 3599 warn "flushing outstanding aio requests";
3275 for (;;) { 3600 for (;;) {
3276 BDB::flush; 3601 BDB::flush;
3277 IO::AIO::flush; 3602 IO::AIO::flush;
3278 Coro::cede; 3603 Coro::cede_notself;
3279 last unless IO::AIO::nreqs || BDB::nreqs; 3604 last unless IO::AIO::nreqs || BDB::nreqs;
3280 warn "iterate..."; 3605 warn "iterate...";
3281 } 3606 }
3282 3607
3283 ++$RELOAD; 3608 ++$RELOAD;
3359 warn "leaving sync_job"; 3684 warn "leaving sync_job";
3360 3685
3361 1 3686 1
3362 } or do { 3687 } or do {
3363 warn $@; 3688 warn $@;
3364 warn "error while reloading, exiting."; 3689 cf::cleanup "error while reloading, exiting.";
3365 exit 1;
3366 }; 3690 };
3367 3691
3368 warn "reloaded"; 3692 warn "reloaded";
3369}; 3693};
3370 3694
3372 3696
3373sub reload_perl() { 3697sub reload_perl() {
3374 # doing reload synchronously and two reloads happen back-to-back, 3698 # doing reload synchronously and two reloads happen back-to-back,
3375 # coro crashes during coro_state_free->destroy here. 3699 # coro crashes during coro_state_free->destroy here.
3376 3700
3377 $RELOAD_WATCHER ||= Event->timer ( 3701 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3378 reentrant => 0,
3379 after => 0,
3380 data => WF_AUTOCANCEL,
3381 cb => sub {
3382 do_reload_perl; 3702 do_reload_perl;
3383 undef $RELOAD_WATCHER; 3703 undef $RELOAD_WATCHER;
3384 },
3385 ); 3704 };
3386} 3705}
3387 3706
3388register_command "reload" => sub { 3707register_command "reload" => sub {
3389 my ($who, $arg) = @_; 3708 my ($who, $arg) = @_;
3390 3709
3391 if ($who->flag (FLAG_WIZ)) { 3710 if ($who->flag (FLAG_WIZ)) {
3392 $who->message ("reloading server."); 3711 $who->message ("reloading server.");
3712 async {
3713 $Coro::current->{desc} = "perl_reload";
3393 async { reload_perl }; 3714 reload_perl;
3715 };
3394 } 3716 }
3395}; 3717};
3396 3718
3397unshift @INC, $LIBDIR; 3719unshift @INC, $LIBDIR;
3398 3720
3400 3722
3401our @WAIT_FOR_TICK; 3723our @WAIT_FOR_TICK;
3402our @WAIT_FOR_TICK_BEGIN; 3724our @WAIT_FOR_TICK_BEGIN;
3403 3725
3404sub wait_for_tick { 3726sub wait_for_tick {
3405 return unless $TICK_WATCHER->is_active;
3406 return if $Coro::current == $Coro::main; 3727 return if tick_inhibit || $Coro::current == $Coro::main;
3407 3728
3408 my $signal = new Coro::Signal; 3729 my $signal = new Coro::Signal;
3409 push @WAIT_FOR_TICK, $signal; 3730 push @WAIT_FOR_TICK, $signal;
3410 $signal->wait; 3731 $signal->wait;
3411} 3732}
3412 3733
3413sub wait_for_tick_begin { 3734sub wait_for_tick_begin {
3414 return unless $TICK_WATCHER->is_active;
3415 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3416 3736
3417 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3418 push @WAIT_FOR_TICK_BEGIN, $signal; 3738 push @WAIT_FOR_TICK_BEGIN, $signal;
3419 $signal->wait; 3739 $signal->wait;
3420} 3740}
3421 3741
3422 my $min = 1e6;#d# 3742sub tick {
3423 my $avg = 10;
3424$TICK_WATCHER = Event->timer (
3425 reentrant => 0,
3426 parked => 1,
3427 prio => 0,
3428 at => $NEXT_TICK || $TICK,
3429 data => WF_AUTOCANCEL,
3430 cb => sub {
3431 if ($Coro::current != $Coro::main) { 3743 if ($Coro::current != $Coro::main) {
3432 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3744 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3433 unless ++$bug_warning > 10; 3745 unless ++$bug_warning > 10;
3434 return; 3746 return;
3435 } 3747 }
3436 3748
3437 $NOW = $tick_start = Event::time;
3438
3439 cf::server_tick; # one server iteration 3749 cf::server_tick; # one server iteration
3440 3750
3441 0 && sync_job {#d# 3751 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3442 for(1..10) { 3752 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3443 my $t = Event::time; 3753 Coro::async_pool {
3444 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3754 $Coro::current->{desc} = "runtime saver";
3445 or die; 3755 write_runtime_sync
3446 3756 or warn "ERROR: unable to write runtime file: $!";
3447 $map->width (50);
3448 $map->height (50);
3449 $map->alloc;
3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3451 my $t = Event::time - $t;
3452
3453 #next unless $t < 0.0013;#d#
3454 if ($t < $min) {
3455 $min = $t;
3456 }
3457 $avg = $avg * 0.99 + $t * 0.01;
3458 }
3459 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3460 exit 0;
3461 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3462 }; 3757 };
3758 }
3463 3759
3464 $RUNTIME += $TICK;
3465 $NEXT_TICK += $TICK;
3466
3467 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3468 $NEXT_RUNTIME_WRITE = $NOW + 10;
3469 Coro::async_pool {
3470 write_runtime
3471 or warn "ERROR: unable to write runtime file: $!";
3472 };
3473 }
3474
3475# my $AFTER = Event::time;
3476# warn $AFTER - $NOW;#d#
3477
3478 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3760 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3479 $sig->send; 3761 $sig->send;
3480 } 3762 }
3481 while (my $sig = shift @WAIT_FOR_TICK) { 3763 while (my $sig = shift @WAIT_FOR_TICK) {
3482 $sig->send; 3764 $sig->send;
3483 } 3765 }
3484 3766
3485 $NOW = Event::time; 3767 $LOAD = ($NOW - $TICK_START) / $TICK;
3486
3487 # if we are delayed by four ticks or more, skip them all
3488 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3489
3490 $TICK_WATCHER->at ($NEXT_TICK);
3491 $TICK_WATCHER->start;
3492
3493 $LOAD = ($NOW - $tick_start) / $TICK;
3494 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3768 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3495 3769
3496 _post_tick; 3770 if (0) {
3497 3771 if ($NEXT_TICK) {
3498 3772 my $jitter = $TICK_START - $NEXT_TICK;
3773 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3774 warn "jitter $JITTER\n";#d#
3775 }
3499 }, 3776 }
3500); 3777}
3501 3778
3502{ 3779{
3503 BDB::max_poll_time $TICK * 0.1; 3780 # configure BDB
3504 $BDB_POLL_WATCHER = Event->io ( 3781
3505 reentrant => 0,
3506 fd => BDB::poll_fileno,
3507 poll => 'r',
3508 prio => 0,
3509 data => WF_AUTOCANCEL,
3510 cb => \&BDB::poll_cb,
3511 );
3512 BDB::min_parallel 8; 3782 BDB::min_parallel 8;
3513 3783 BDB::max_poll_reqs $TICK * 0.1;
3514 BDB::set_sync_prepare { 3784 $Coro::BDB::WATCHER->priority (1);
3515 my $status;
3516 my $current = $Coro::current;
3517 (
3518 sub {
3519 $status = $!;
3520 $current->ready; undef $current;
3521 },
3522 sub {
3523 Coro::schedule while defined $current;
3524 $! = $status;
3525 },
3526 )
3527 };
3528 3785
3529 unless ($DB_ENV) { 3786 unless ($DB_ENV) {
3530 $DB_ENV = BDB::db_env_create; 3787 $DB_ENV = BDB::db_env_create;
3788 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3789 | BDB::LOG_AUTOREMOVE, 1);
3790 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3791 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3531 3792
3532 cf::sync_job { 3793 cf::sync_job {
3533 eval { 3794 eval {
3534 BDB::db_env_open 3795 BDB::db_env_open
3535 $DB_ENV, 3796 $DB_ENV,
3537 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3798 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3538 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3799 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3539 0666; 3800 0666;
3540 3801
3541 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3802 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3542
3543 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3544 $DB_ENV->set_lk_detect;
3545 }; 3803 };
3546 3804
3547 cf::cleanup "db_env_open(db): $@" if $@; 3805 cf::cleanup "db_env_open(db): $@" if $@;
3548 }; 3806 };
3549 } 3807 }
3808
3809 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3810 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3811 };
3812 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3813 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3814 };
3815 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3816 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3817 };
3550} 3818}
3551 3819
3552{ 3820{
3821 # configure IO::AIO
3822
3553 IO::AIO::min_parallel 8; 3823 IO::AIO::min_parallel 8;
3554
3555 undef $Coro::AIO::WATCHER;
3556 IO::AIO::max_poll_time $TICK * 0.1; 3824 IO::AIO::max_poll_time $TICK * 0.1;
3557 $AIO_POLL_WATCHER = Event->io ( 3825 $Coro::AIO::WATCHER->priority (1);
3558 reentrant => 0,
3559 data => WF_AUTOCANCEL,
3560 fd => IO::AIO::poll_fileno,
3561 poll => 'r',
3562 prio => 6,
3563 cb => \&IO::AIO::poll_cb,
3564 );
3565} 3826}
3566 3827
3567my $_log_backtrace; 3828my $_log_backtrace;
3568 3829
3569sub _log_backtrace { 3830sub _log_backtrace {
3573 3834
3574 # limit the # of concurrent backtraces 3835 # limit the # of concurrent backtraces
3575 if ($_log_backtrace < 2) { 3836 if ($_log_backtrace < 2) {
3576 ++$_log_backtrace; 3837 ++$_log_backtrace;
3577 async { 3838 async {
3839 $Coro::current->{desc} = "abt $msg";
3840
3578 my @bt = fork_call { 3841 my @bt = fork_call {
3579 @addr = map { sprintf "%x", $_ } @addr; 3842 @addr = map { sprintf "%x", $_ } @addr;
3580 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3843 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3581 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3844 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3582 or die "addr2line: $!"; 3845 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines