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.358 by root, Fri Sep 7 18:10:52 2007 UTC vs.
Revision 1.442 by root, Sun Aug 31 09:03:31 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::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 68Compress::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 69
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 107our $DB_ENV;
86 108
87our %CFG; 109our %CFG;
88 110
89our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 112our $RUNTIME;
113our $NOW;
91 114
92our (%PLAYER, %PLAYER_LOADING); # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 116our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
95 118
96# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 121
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
102 126
103binmode STDOUT; 127binmode STDOUT;
104binmode STDERR; 128binmode STDERR;
105 129
106# read virtual server time, if available 130# read virtual server time, if available
159 183
160The raw value load value from the last tick. 184The raw value load value from the last tick.
161 185
162=item %cf::CFG 186=item %cf::CFG
163 187
164Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 189from wherever your confdir points to.
166 190
167=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
168 192
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 211 $msg .= "\n"
188 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
189 213
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 215
192 utf8::encode $msg;
193 LOG llevError, $msg; 216 LOG llevError, $msg;
194 }; 217 };
195} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
196 234
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 245for my $pkg (qw(
208 cf::global cf::attachable 246 cf::global cf::attachable
209 cf::object cf::object::player 247 cf::object cf::object::player
210 cf::client cf::player 248 cf::client cf::player
211 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
212 cf::map cf::party cf::region 251 cf::party cf::region
213)) { 252)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 254}
217 255
218$Event::DIED = sub { 256$EV::DIED = sub {
219 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
220}; 258};
221 259
222############################################################################# 260#############################################################################
223 261
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 285 $d
248 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
249} 287}
250 288
251=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
252 290
253Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
254 292
255=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
256 294
257Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
258 296
259=cut 297=cut
260 298
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 300
263sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
265 303
266=item cf::lock_wait $string 304=item cf::lock_wait $string
267 305
268Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
269 307
325 363
326 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
327} 365}
328 366
329sub freeze_mainloop { 367sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
331 369
332 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
333 $TICK_WATCHER->start; 371}
334 }; 372
335 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
336 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
337} 386}
338 387
339=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
340 389
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
352our @SLOT_QUEUE; 401our @SLOT_QUEUE;
353our $SLOT_QUEUE; 402our $SLOT_QUEUE;
354 403
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
357 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
358 409
359 while () { 410 while () {
360 next_job: 411 next_job:
361 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
369 } 420 }
370 } 421 }
371 } 422 }
372 423
373 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 427 $signal->wait;
377 } else { 428 } else {
378 Coro::schedule; 429 Coro::schedule;
379 } 430 }
380 } 431 }
381}; 432};
382 433
383sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
384 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
385 438
386 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
388 441
402 455
403BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
404 457
405=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
406 459
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 461is 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 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 463acceptable.
411 464
412If it must be done, put the blocking parts into C<sync_job>. This will run 465If 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 466the given BLOCK in another coroutine while waiting for the result. The
418 471
419sub sync_job(&) { 472sub sync_job(&) {
420 my ($job) = @_; 473 my ($job) = @_;
421 474
422 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 476 my $time = EV::time;
424 477
425 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
427 480
428 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 482
430 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
431 484
432 my $busy = 1; 485 my $busy = 1;
433 my @res; 486 my @res;
434 487
435 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 490 @res = eval { $job->() };
437 warn $@ if $@; 491 warn $@ if $@;
438 undef $busy; 492 undef $busy;
439 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
440 494
441 while ($busy) { 495 while ($busy) {
442 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
443 } 500 }
501 }
444 502
445 $time = Event::time - $time; 503 my $time = EV::time - $time;
446 504
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 505 $TICK_START += $time; # do not account sync jobs to server load
451 506
452 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
453 } else { 508 } else {
454 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
455 510
480=item fork_call { }, $args 535=item fork_call { }, $args
481 536
482Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
486 541
487=cut 542=cut
488 543
489sub fork_call(&@) { 544sub fork_call(&@) {
490 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
499 }, @args; 554 }, @args;
500 555
501 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
502} 557}
503 558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
584}
585
504=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
505 587
506Returns a single value from the environment database. 588Returns a single value from the environment database.
507 589
508=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
509 591
510Stores the given C<$value> in the family. It can currently store binary 592Stores 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). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
513=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
514 618
515our $DB; 619our $DB;
516 620
517sub db_init { 621sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 622 cf::sync_job {
522 eval { 623 $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 } 624 };
532} 625}
533 626
534sub db_get($$) { 627sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
536 629
640attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
642 735
643In the following description, CLASS can be any of C<global>, C<object> 736In 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 737C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 738Deliantra).
646 739
647=over 4 740=over 4
648 741
649=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
650 743
932 } 1025 }
933 1026
934 0 1027 0
935} 1028}
936 1029
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1031
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1033
941Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
942 1035
948 1041
949=cut 1042=cut
950 1043
951############################################################################# 1044#############################################################################
952# object support 1045# object support
953#
954 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
955sub _can_merge { 1080sub _can_merge {
956 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
957 1082
958 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1084
962 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
963} 1087}
964 1088
965sub reattach { 1089sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1091 my ($obj) = @_;
968 1092
1093 # no longer needed after getting rid of delete_package?
969 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
970 1095
971 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
972 1097
973 @$registry = (); 1098 @$registry = ();
974 1099
989cf::attachable->attach ( 1114cf::attachable->attach (
990 prio => -1000000, 1115 prio => -1000000,
991 on_instantiate => sub { 1116 on_instantiate => sub {
992 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
993 1118
994 $data = from_json $data; 1119 $data = decode_json $data;
995 1120
996 for (@$data) { 1121 for (@$data) {
997 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
998 1123
999 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1013); 1138);
1014 1139
1015sub object_freezer_save { 1140sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
1017 1142
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1143 sync_job {
1021 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1024 1148
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1153 aio_close $fh;
1030 1154
1031 if (@$objs) { 1155 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1161 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1163 }
1040 } else { 1164 } else {
1041 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1042 } 1166 }
1048 } else { 1172 } else {
1049 aio_unlink $filename; 1173 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
1051 } 1175 }
1052 }; 1176 };
1053
1054 undef $guard;
1055} 1177}
1056 1178
1057sub object_freezer_as_string { 1179sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
1059 1181
1064 1186
1065sub object_thawer_load { 1187sub object_thawer_load {
1066 my ($filename) = @_; 1188 my ($filename) = @_;
1067 1189
1068 my ($data, $av); 1190 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1191
1072 (aio_load $filename, $data) >= 0 1192 (aio_load $filename, $data) >= 0
1073 or return; 1193 or return;
1074 1194
1075 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1197 or return;
1078 1198
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1081 } 1201 }
1082 1202
1203 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1085 1206
1086 ($data, $av) 1207 ($data, $av)
1087} 1208}
1088 1209
1089=head2 COMMAND CALLBACKS 1210=head2 COMMAND CALLBACKS
1214 1335
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217 1338
1218 $ext{source} = 1339 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1221 . $source 1342 . $source
1222 . "\n};\n1"; 1343 . "\n};\n1";
1223 1344
1224 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1240 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1242 1363
1243 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1244 warn $msg; 1365 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1246 exit 1;
1247 } 1367 }
1248 1368
1249 warn $msg; 1369 warn $msg;
1250 } 1370 }
1251 1371
1276use Coro::AIO; 1396use Coro::AIO;
1277 1397
1278=head3 cf::player 1398=head3 cf::player
1279 1399
1280=over 4 1400=over 4
1401
1402=item cf::player::num_playing
1403
1404Returns the official number of playing players, as per the Crossfire metaserver rules.
1405
1406=cut
1407
1408sub num_playing {
1409 scalar grep
1410 $_->ob->map
1411 && !$_->hidden
1412 && !$_->ob->flag (cf::FLAG_WIZ),
1413 cf::player::list
1414}
1281 1415
1282=item cf::player::find $login 1416=item cf::player::find $login
1283 1417
1284Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
1285 1419
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1459
1326 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1461 or return;
1328 1462
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1331 or return; 1464 or return;
1465
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1335 } 1469 }
1336 } 1470 }
1346 1480
1347 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1348 1482
1349 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1350 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1351 1487
1352 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1353 cf::cede_to_tick; 1489 cf::cede_to_tick;
1354} 1490}
1355 1491
1391 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1392 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1393 1529
1394 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1395 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1396 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1397 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1398 1536
1399 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1400 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1439 1577
1440 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1441 my $path = path $login; 1579 my $path = path $login;
1442 1580
1443 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1446 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1447 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 } 1587 }
1449 1588
1487Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1488 1627
1489=cut 1628=cut
1490 1629
1491sub expand_cfpod { 1630sub expand_cfpod {
1492 ((my $self), (local $_)) = @_; 1631 my ($self, $pod) = @_;
1493 1632
1494 # escape & and < 1633 my @nest = [qr<\G$>, undef, ""];
1495 s/&/&amp;/g; 1634 my $xml;
1496 s/(?<![BIUGHT])</&lt;/g;
1497 1635
1498 # this is buggy, it needs to properly take care of nested <'s 1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1499 1648
1500 1 while 1649 my $cb;
1501 # replace B<>, I<>, U<> etc. 1650
1502 s/B<([^\>]*)>/<b>$1<\/b>/ 1651 if ($code eq "B") {
1503 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $cb = sub { "<b>$_[0]</b>" };
1504 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($code eq "C") {
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1654 $cb = sub { "<tt>$_[0]</tt>" };
1506 # replace G<male|female> tags 1655 } elsif ($code eq "E") {
1507 || s{G<([^>|]*)\|([^>]*)>}{ 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1508 $self->gender ? $2 : $1 1657 } elsif ($code eq "G") {
1509 }ge 1658 $cb = sub {
1510 # replace H<hint text> 1659 my ($male, $female) = split /\|/, $_[0];
1511 || s{H<([^\>]*)>} 1660 $self->gender ? $female : $male
1512 { 1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "") 1667 "",
1516 [$self->{hintmode}] 1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1517 }ge; 1707 }
1708 }
1709 }
1518 1710
1519 # create single paragraphs (very hackish) 1711 $xml
1520 s/(?<=\S)\n(?=\w)/ /g;
1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1528 $_
1529} 1712}
1530 1713
1531sub hintmode { 1714sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode} 1716 $_[0]{hintmode}
1606our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1607our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1608 1791
1609sub generate_random_map { 1792sub generate_random_map {
1610 my ($self, $rmp) = @_; 1793 my ($self, $rmp) = @_;
1794
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796
1611 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1612 $self->_create_random_map ( 1798 $self->_create_random_map (
1613 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1614 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1615 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 1923
1738# the temporary/swap location 1924# the temporary/swap location
1739sub save_path { 1925sub save_path {
1740 my ($self) = @_; 1926 my ($self) = @_;
1741 1927
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1744} 1930}
1745 1931
1746# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1747sub uniq_path { 1933sub uniq_path {
1748 my ($self) = @_; 1934 my ($self) = @_;
1749 1935
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1752} 1938}
1753 1939
1754# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1755# all maps in C++... 1941# all maps in C++...
1853 2039
1854 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
1855 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1856 2042
1857 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
1860 2046
1861 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1862 or return; 2048 or return;
1863 2049
1864 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
1867 or return; 2053 or return;
1868 2054
1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1870 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1871 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
1872 undef $guard1; 2059 undef $guard1;
1873 undef $guard2;
1874 $map->reset; 2060 $map->reset;
1875 return find $path; 2061 return find $path;
1876 } 2062 }
1877 2063
1878 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
1891 2077
1892 { 2078 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 2079 my $guard = cf::lock_acquire "map_data:$path";
1894 2080
1895 return unless $self->valid; 2081 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2082 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2083
1898 $self->in_memory (cf::MAP_LOADING); 2084 $self->in_memory (cf::MAP_LOADING);
1899 2085
1900 $self->alloc; 2086 $self->alloc;
1901 2087
1905 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block; 2092 $f->skip_block;
1907 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
1908 or return; 2094 or return;
1909 2095
1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
1911 if delete $self->{load_original}; 2097 if delete $self->{load_original};
1912 2098
1913 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
1914 utf8::encode $uniq; 2100 utf8::encode $uniq;
1915 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
1941 } 2127 }
1942 2128
1943 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
1945 2131
1946 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
1947 } 2133 }
1948 2134
1949 $self->post_load; 2135 $self->post_load;
1950} 2136}
1951 2137
2009 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2010 2196
2011 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2012 2198
2013 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2015 } 2201 }
2016 2202
2017 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2018 2204
2019 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2206 $Coro::current->{desc} = "map prefetcher";
2207
2020 while (%MAP_PREFETCH) { 2208 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2209 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2210 if (my $map = find $k) {
2023 $map->load if $v; 2211 $map->load if $v;
2024 } 2212 }
2050 return if $self->{deny_save}; 2238 return if $self->{deny_save};
2051 2239
2052 local $self->{last_access} = $self->last_access;#d# 2240 local $self->{last_access} = $self->last_access;#d#
2053 2241
2054 cf::async { 2242 cf::async {
2243 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2056 }; 2245 };
2246
2247 cf::get_slot 0.02;
2057 2248
2058 if ($uniq) { 2249 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2060 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2061 } else { 2252 } else {
2070 $self->save; 2261 $self->save;
2071 2262
2072 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2073 2264
2074 return if $self->players; 2265 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2076 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2077 2268
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2078 $self->deactivate; 2271 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2273 $self->clear;
2080 $self->in_memory (cf::MAP_SWAPPED);
2081} 2274}
2082 2275
2083sub reset_at { 2276sub reset_at {
2084 my ($self) = @_; 2277 my ($self) = @_;
2085 2278
2118 } 2311 }
2119 2312
2120 delete $cf::MAP{$self->path}; 2313 delete $cf::MAP{$self->path};
2121 2314
2122 $self->deactivate; 2315 $self->deactivate;
2316 $_->clear_links_to ($self) for values %cf::MAP;
2123 $self->clear; 2317 $self->clear;
2124
2125 $_->clear_links_to ($self) for values %cf::MAP;
2126 2318
2127 $self->unlink_save; 2319 $self->unlink_save;
2128 $self->destroy; 2320 $self->destroy;
2129} 2321}
2130 2322
2197 2389
2198sub unique_maps() { 2390sub unique_maps() {
2199 [ 2391 [
2200 map { 2392 map {
2201 utf8::decode $_; 2393 utf8::decode $_;
2202 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2203 ? normalise $_ 2397 : normalise $_
2204 : ()
2205 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2206 ] 2399 ]
2207} 2400}
2208 2401
2209package cf;
2210
2211=back 2402=back
2212 2403
2213=head3 cf::object 2404=head3 cf::object
2214 2405
2215=cut 2406=cut
2218 2409
2219=over 4 2410=over 4
2220 2411
2221=item $ob->inv_recursive 2412=item $ob->inv_recursive
2222 2413
2223Returns the inventory of the object _and_ their inventories, recursively. 2414Returns the inventory of the object I<and> their inventories, recursively,
2415but I<not> the object itself.
2224 2416
2225=cut 2417=cut
2226 2418
2227sub inv_recursive_; 2419sub inv_recursive_;
2228sub inv_recursive_ { 2420sub inv_recursive_ {
2233 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2234} 2426}
2235 2427
2236=item $ref = $ob->ref 2428=item $ref = $ob->ref
2237 2429
2238creates and returns a persistent reference to an objetc that can be stored as a string. 2430Creates and returns a persistent reference to an object that can be stored as a string.
2239 2431
2240=item $ob = cf::object::deref ($refstring) 2432=item $ob = cf::object::deref ($refstring)
2241 2433
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2434returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block. 2435even if the object actually exists. May block.
2245=cut 2437=cut
2246 2438
2247sub deref { 2439sub deref {
2248 my ($ref) = @_; 2440 my ($ref) = @_;
2249 2441
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2442 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2); 2443 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2444 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return; 2445 or return;
2257 $pl->ob->uuid eq $uuid 2446 $pl->ob->uuid eq $uuid
2258 or return; 2447 or return;
2278can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2279dialogue with the given NPC character. 2468dialogue with the given NPC character.
2280 2469
2281=cut 2470=cut
2282 2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2485
2283# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2284# with dialog boxes. 2487# with dialog boxes.
2285#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2286sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2287 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
2298 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2299 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2300 2503
2301 } else { 2504 } else {
2302 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2303 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2304 } 2507 }
2305 } 2508 }
2306} 2509}
2307 2510
2308=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
2416her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2417that has to return the map if sucecssful, and then unfreezes the player on 2620that has to return the map if sucecssful, and then unfreezes the player on
2418the new (success) or old (failed) map position. In either case, $done will 2621the new (success) or old (failed) map position. In either case, $done will
2419be called at the end of this process. 2622be called at the end of this process.
2420 2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2626
2421=cut 2627=cut
2422 2628
2423our $GOTOGEN; 2629our $GOTOGEN;
2424 2630
2425sub cf::object::player::goto { 2631sub cf::object::player::goto {
2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2430 2636
2431 $self->enter_link; 2637 $self->enter_link;
2432 2638
2433 (async { 2639 (async {
2640 $Coro::current->{desc} = "player::goto $path $x $y";
2641
2642 # *tag paths override both path and x|y
2643 if ($path =~ /^\*(.*)$/) {
2644 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2645 my $ob = $obs[rand @obs];
2646
2647 # see if we actually can go there
2648 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2649 $ob = $obs[rand @obs];
2650 } else {
2651 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2652 }
2653 # else put us there anyways for now #d#
2654
2655 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2656 } else {
2657 ($path, $x, $y) = (undef, undef, undef);
2658 }
2659 }
2660
2434 my $map = eval { 2661 my $map = eval {
2435 my $map = cf::map::find $path; 2662 my $map = defined $path ? cf::map::find $path : undef;
2436 2663
2437 if ($map) { 2664 if ($map) {
2438 $map = $map->customise_for ($self); 2665 $map = $map->customise_for ($self);
2439 $map = $check->($map) if $check && $map; 2666 $map = $check->($map) if $check && $map;
2440 } else { 2667 } else {
2441 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2668 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2442 } 2669 }
2443 2670
2444 $map 2671 $map
2445 }; 2672 };
2446 2673
2482} 2709}
2483 2710
2484sub prepare_random_map { 2711sub prepare_random_map {
2485 my ($exit) = @_; 2712 my ($exit) = @_;
2486 2713
2487 my $guard = cf::lock_acquire "exit_prepare:$exit";
2488
2489 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2490 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2491 # that depends on the exit object 2716 # that depends on the exit object
2492 2717
2493 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
2495 if ($exit->map) { 2720 if ($exit->map) {
2496 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2497 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2498 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2499 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2500 } 2727 }
2501 2728
2502 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2503 2730
2504 my $data = cf::to_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2505 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2506 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2507 2734
2508 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2509 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2510 undef $fh; 2737 undef $fh;
2511 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2512 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2513 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2514 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2515 } 2746 }
2516} 2747}
2517 2748
2518sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2519 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2520 2751
2521 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2522 2753
2523 if ($exit->slaying eq "/!") {
2524 #TODO: this should de-fi-ni-te-ly not be a sync-job
2525 # the problem is that $exit might not survive long enough
2526 # so it needs to be done right now, right here
2527 cf::sync_job { prepare_random_map $exit };
2528 }
2529
2530 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2531 my $hp = $exit->stats->hp;
2532 my $sp = $exit->stats->sp;
2533
2534 $self->enter_link; 2754 $self->enter_link;
2535 2755
2536 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED);
2539
2540 (async { 2756 (async {
2541 $self->deactivate_recursive; # just to be sure 2757 $Coro::current->{desc} = "enter_exit";
2758
2542 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2543 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2544 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2545 1; 2780 1
2546 }) { 2781 }) {
2547 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2548 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2549 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2550 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
2580the message, with C<log> being the default. If C<$color> is negative, suppress 2815the message, with C<log> being the default. If C<$color> is negative, suppress
2581the message unless the client supports the msg packet. 2816the message unless the client supports the msg packet.
2582 2817
2583=cut 2818=cut
2584 2819
2820# non-persistent channels (usually the info channel)
2585our %CHANNEL = ( 2821our %CHANNEL = (
2586 "c/identify" => { 2822 "c/identify" => {
2587 id => "identify", 2823 id => "infobox",
2588 title => "Identify", 2824 title => "Identify",
2589 reply => undef, 2825 reply => undef,
2590 tooltip => "Items recently identified", 2826 tooltip => "Items recently identified",
2591 }, 2827 },
2592 "c/examine" => { 2828 "c/examine" => {
2593 id => "examine", 2829 id => "infobox",
2594 title => "Examine", 2830 title => "Examine",
2595 reply => undef, 2831 reply => undef,
2596 tooltip => "Signs and other items you examined", 2832 tooltip => "Signs and other items you examined",
2597 }, 2833 },
2834 "c/book" => {
2835 id => "infobox",
2836 title => "Book",
2837 reply => undef,
2838 tooltip => "The contents of a note or book",
2839 },
2840 "c/lookat" => {
2841 id => "infobox",
2842 title => "Look",
2843 reply => undef,
2844 tooltip => "What you saw there",
2845 },
2846 "c/who" => {
2847 id => "infobox",
2848 title => "Players",
2849 reply => undef,
2850 tooltip => "Shows players who are currently online",
2851 },
2852 "c/body" => {
2853 id => "infobox",
2854 title => "Body Parts",
2855 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available",
2857 },
2858 "c/uptime" => {
2859 id => "infobox",
2860 title => "Uptime",
2861 reply => undef,
2862 tooltip => "How long the server has been running since last restart",
2863 },
2864 "c/mapinfo" => {
2865 id => "infobox",
2866 title => "Map Info",
2867 reply => undef,
2868 tooltip => "Information related to the maps",
2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2598); 2876);
2599 2877
2600sub cf::client::send_msg { 2878sub cf::client::send_msg {
2601 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2602 2880
2603 $msg = $self->pl->expand_cfpod ($msg); 2881 $msg = $self->pl->expand_cfpod ($msg);
2604 2882
2605 $color &= cf::NDI_CLIENT_MASK; # just in case... 2883 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606 2884
2607 # check predefined channels, for the benefit of C 2885 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2886 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel};
2609 2888
2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id};
2893
2610 if (ref $channel) { 2894 } elsif (ref $channel) {
2611 # send meta info to client, if not yet sent 2895 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) { 2896 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel; 2897 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel) 2898 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg; 2899 if $self->can_msg;
2832=pod 3116=pod
2833 3117
2834The following functions and methods are available within a safe environment: 3118The following functions and methods are available within a safe environment:
2835 3119
2836 cf::object 3120 cf::object
2837 contr pay_amount pay_player map x y force_find force_add 3121 contr pay_amount pay_player map x y force_find force_add destroy
2838 insert remove name archname title slaying race decrease_ob_nr 3122 insert remove name archname title slaying race decrease split
2839 3123
2840 cf::object::player 3124 cf::object::player
2841 player 3125 player
2842 3126
2843 cf::player 3127 cf::player
2848 3132
2849=cut 3133=cut
2850 3134
2851for ( 3135for (
2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3136 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race 3137 insert remove inv nrof name archname title slaying race
2854 decrease_ob_nr)], 3138 decrease split destroy change_exp)],
2855 ["cf::object::player" => qw(player)], 3139 ["cf::object::player" => qw(player)],
2856 ["cf::player" => qw(peaceful)], 3140 ["cf::player" => qw(peaceful)],
2857 ["cf::map" => qw(trigger)], 3141 ["cf::map" => qw(trigger)],
2858) { 3142) {
2859 no strict 'refs'; 3143 no strict 'refs';
2964 { 3248 {
2965 my $faces = $facedata->{faceinfo}; 3249 my $faces = $facedata->{faceinfo};
2966 3250
2967 while (my ($face, $info) = each %$faces) { 3251 while (my ($face, $info) = each %$faces) {
2968 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3252 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253
2969 cf::face::set_visibility $idx, $info->{visibility}; 3254 cf::face::set_visibility $idx, $info->{visibility};
2970 cf::face::set_magicmap $idx, $info->{magicmap}; 3255 cf::face::set_magicmap $idx, $info->{magicmap};
2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3256 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3257 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2973 3258
2974 cf::cede_to_tick; 3259 cf::cede_to_tick;
2975 } 3260 }
2976 3261
2977 while (my ($face, $info) = each %$faces) { 3262 while (my ($face, $info) = each %$faces) {
2978 next unless $info->{smooth}; 3263 next unless $info->{smooth};
3264
2979 my $idx = cf::face::find $face 3265 my $idx = cf::face::find $face
2980 or next; 3266 or next;
3267
2981 if (my $smooth = cf::face::find $info->{smooth}) { 3268 if (my $smooth = cf::face::find $info->{smooth}) {
2982 cf::face::set_smooth $idx, $smooth; 3269 cf::face::set_smooth $idx, $smooth;
2983 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3270 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2984 } else { 3271 } else {
2985 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3272 warn "smooth face '$info->{smooth}' not found for face '$face'";
3003 { 3290 {
3004 # TODO: for gcfclient pleasure, we should give resources 3291 # TODO: for gcfclient pleasure, we should give resources
3005 # that gcfclient doesn't grok a >10000 face index. 3292 # that gcfclient doesn't grok a >10000 face index.
3006 my $res = $facedata->{resource}; 3293 my $res = $facedata->{resource};
3007 3294
3008 my $soundconf = delete $res->{"res/sound.conf"};
3009
3010 while (my ($name, $info) = each %$res) { 3295 while (my ($name, $info) = each %$res) {
3296 if (defined $info->{type}) {
3011 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3297 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data; 3298 my $data;
3013 3299
3014 if ($info->{type} & 1) { 3300 if ($info->{type} & 1) {
3015 # prepend meta info 3301 # prepend meta info
3016 3302
3017 my $meta = $enc->encode ({ 3303 my $meta = $enc->encode ({
3018 name => $name, 3304 name => $name,
3019 %{ $info->{meta} || {} }, 3305 %{ $info->{meta} || {} },
3020 }); 3306 });
3021 3307
3022 $data = pack "(w/a*)*", $meta, $info->{data}; 3308 $data = pack "(w/a*)*", $meta, $info->{data};
3309 } else {
3310 $data = $info->{data};
3311 }
3312
3313 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3314 cf::face::set_type $idx, $info->{type};
3023 } else { 3315 } else {
3024 $data = $info->{data}; 3316 $RESOURCE{$name} = $info;
3025 } 3317 }
3026 3318
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3028 cf::face::set_type $idx, $info->{type};
3029
3030 cf::cede_to_tick; 3319 cf::cede_to_tick;
3031 } 3320 }
3032
3033 if ($soundconf) {
3034 $soundconf = $enc->decode (delete $soundconf->{data});
3035
3036 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3037 my $sound = $soundconf->{compat}[$_]
3038 or next;
3039
3040 my $face = cf::face::find "sound/$sound->[1]";
3041 cf::sound::set $sound->[0] => $face;
3042 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3043 }
3044
3045 while (my ($k, $v) = each %{$soundconf->{event}}) {
3046 my $face = cf::face::find "sound/$v";
3047 cf::sound::set $k => $face;
3048 }
3049 }
3050 } 3321 }
3322
3323 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3051 3324
3052 1 3325 1
3053} 3326}
3327
3328cf::global->attach (on_resource_update => sub {
3329 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3330 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3331
3332 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3333 my $sound = $soundconf->{compat}[$_]
3334 or next;
3335
3336 my $face = cf::face::find "sound/$sound->[1]";
3337 cf::sound::set $sound->[0] => $face;
3338 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3339 }
3340
3341 while (my ($k, $v) = each %{$soundconf->{event}}) {
3342 my $face = cf::face::find "sound/$v";
3343 cf::sound::set $k => $face;
3344 }
3345 }
3346});
3054 3347
3055register_exticmd fx_want => sub { 3348register_exticmd fx_want => sub {
3056 my ($ns, $want) = @_; 3349 my ($ns, $want) = @_;
3057 3350
3058 while (my ($k, $v) = each %$want) { 3351 while (my ($k, $v) = each %$want) {
3059 $ns->fx_want ($k, $v); 3352 $ns->fx_want ($k, $v);
3060 } 3353 }
3061}; 3354};
3355
3356sub load_resource_file($) {
3357 my $guard = lock_acquire "load_resource_file";
3358
3359 my $status = load_resource_file_ $_[0];
3360 get_slot 0.1, 100;
3361 cf::arch::commit_load;
3362
3363 $status
3364}
3062 3365
3063sub reload_regions { 3366sub reload_regions {
3064 # HACK to clear player env face cache, we need some signal framework 3367 # HACK to clear player env face cache, we need some signal framework
3065 # for this (global event?) 3368 # for this (global event?)
3066 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3080} 3383}
3081 3384
3082sub reload_archetypes { 3385sub reload_archetypes {
3083 load_resource_file "$DATADIR/archetypes" 3386 load_resource_file "$DATADIR/archetypes"
3084 or die "unable to load archetypes\n"; 3387 or die "unable to load archetypes\n";
3085 #d# NEED to laod twice to resolve forward references
3086 # this really needs to be done in an extra post-pass
3087 # (which needs to be synchronous, so solve it differently)
3088 load_resource_file "$DATADIR/archetypes"
3089 or die "unable to load archetypes\n";
3090} 3388}
3091 3389
3092sub reload_treasures { 3390sub reload_treasures {
3093 load_resource_file "$DATADIR/treasures" 3391 load_resource_file "$DATADIR/treasures"
3094 or die "unable to load treasurelists\n"; 3392 or die "unable to load treasurelists\n";
3095} 3393}
3096 3394
3097sub reload_resources { 3395sub reload_resources {
3098 warn "reloading resource files...\n"; 3396 warn "reloading resource files...\n";
3099 3397
3398 reload_facedata;
3399 reload_archetypes;
3100 reload_regions; 3400 reload_regions;
3101 reload_facedata;
3102 #reload_archetypes;#d#
3103 reload_archetypes;
3104 reload_treasures; 3401 reload_treasures;
3105 3402
3106 warn "finished reloading resource files\n"; 3403 warn "finished reloading resource files\n";
3107} 3404}
3108 3405
3109sub init { 3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3110 reload_resources; 3411 reload_resources;
3111} 3412}
3112 3413
3113sub reload_config { 3414sub reload_config {
3114 open my $fh, "<:utf8", "$CONFDIR/config" 3415 open my $fh, "<:utf8", "$CONFDIR/config"
3115 or return; 3416 or return;
3116 3417
3117 local $/; 3418 local $/;
3118 *CFG = YAML::Syck::Load <$fh>; 3419 *CFG = YAML::Load <$fh>;
3119 3420
3120 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3121 3422
3122 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3123 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3134sub main { 3435sub main {
3135 # we must not ever block the main coroutine 3436 # we must not ever block the main coroutine
3136 local $Coro::idle = sub { 3437 local $Coro::idle = sub {
3137 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3138 (async { 3439 (async {
3139 Event::one_event; 3440 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT;
3140 })->prio (Coro::PRIO_MAX); 3442 })->prio (Coro::PRIO_MAX);
3141 }; 3443 };
3142 3444
3445 {
3446 my $guard = freeze_mainloop;
3143 reload_config; 3447 reload_config;
3144 db_init; 3448 db_init;
3145 load_extensions; 3449 load_extensions;
3146 3450
3147 $TICK_WATCHER->start; 3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3452 }
3453
3148 Event::loop; 3454 EV::loop;
3149} 3455}
3150 3456
3151############################################################################# 3457#############################################################################
3152# initialisation and cleanup 3458# initialisation and cleanup
3153 3459
3154# install some emergency cleanup handlers 3460# install some emergency cleanup handlers
3155BEGIN { 3461BEGIN {
3462 our %SIGWATCHER = ();
3156 for my $signal (qw(INT HUP TERM)) { 3463 for my $signal (qw(INT HUP TERM)) {
3157 Event->signal ( 3464 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3158 reentrant => 0,
3159 data => WF_AUTOCANCEL,
3160 signal => $signal,
3161 prio => 0,
3162 cb => sub {
3163 cf::cleanup "SIG$signal"; 3465 cf::cleanup "SIG$signal";
3164 },
3165 ); 3466 };
3166 } 3467 }
3167} 3468}
3168 3469
3169sub write_runtime { 3470sub write_runtime_sync {
3170 my $runtime = "$LOCALDIR/runtime"; 3471 my $runtime = "$LOCALDIR/runtime";
3171 3472
3172 # first touch the runtime file to show we are still running: 3473 # first touch the runtime file to show we are still running:
3173 # the fsync below can take a very very long time. 3474 # the fsync below can take a very very long time.
3174 3475
3200 and return; 3501 and return;
3201 3502
3202 warn "runtime file written.\n"; 3503 warn "runtime file written.\n";
3203 3504
3204 1 3505 1
3506}
3507
3508our $uuid_lock;
3509our $uuid_skip;
3510
3511sub write_uuid_sync($) {
3512 $uuid_skip ||= $_[0];
3513
3514 return if $uuid_lock;
3515 local $uuid_lock = 1;
3516
3517 my $uuid = "$LOCALDIR/uuid";
3518
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return;
3521
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3523 $uuid_skip = 0;
3524
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return;
3527
3528 # always fsync - this file is important
3529 aio_fsync $fh
3530 and return;
3531
3532 close $fh
3533 or return;
3534
3535 aio_rename "$uuid~", $uuid
3536 and return;
3537
3538 warn "uuid file written ($value).\n";
3539
3540 1
3541
3542}
3543
3544sub write_uuid($$) {
3545 my ($skip, $sync) = @_;
3546
3547 $sync ? write_uuid_sync $skip
3548 : async { write_uuid_sync $skip };
3205} 3549}
3206 3550
3207sub emergency_save() { 3551sub emergency_save() {
3208 my $freeze_guard = cf::freeze_mainloop; 3552 my $freeze_guard = cf::freeze_mainloop;
3209 3553
3215 # and maps saved/destroyed asynchronously. 3559 # and maps saved/destroyed asynchronously.
3216 warn "begin emergency player save\n"; 3560 warn "begin emergency player save\n";
3217 for my $login (keys %cf::PLAYER) { 3561 for my $login (keys %cf::PLAYER) {
3218 my $pl = $cf::PLAYER{$login} or next; 3562 my $pl = $cf::PLAYER{$login} or next;
3219 $pl->valid or next; 3563 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3220 $pl->save; 3565 $pl->save;
3221 } 3566 }
3222 warn "end emergency player save\n"; 3567 warn "end emergency player save\n";
3223 3568
3224 warn "begin emergency map save\n"; 3569 warn "begin emergency map save\n";
3230 warn "end emergency map save\n"; 3575 warn "end emergency map save\n";
3231 3576
3232 warn "begin emergency database checkpoint\n"; 3577 warn "begin emergency database checkpoint\n";
3233 BDB::db_env_txn_checkpoint $DB_ENV; 3578 BDB::db_env_txn_checkpoint $DB_ENV;
3234 warn "end emergency database checkpoint\n"; 3579 warn "end emergency database checkpoint\n";
3580
3581 warn "begin write uuid\n";
3582 write_uuid_sync 1;
3583 warn "end write uuid\n";
3235 }; 3584 };
3236 3585
3237 warn "leave emergency perl save\n"; 3586 warn "leave emergency perl save\n";
3238} 3587}
3239 3588
3241 my ($make_core) = @_; 3590 my ($make_core) = @_;
3242 3591
3243 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3244 if $make_core; 3593 if $make_core;
3245} 3594}
3595
3596# a safer delete_package, copied from Symbol
3597sub clear_package($) {
3598 my $pkg = shift;
3599
3600 # expand to full symbol table name if needed
3601 unless ($pkg =~ /^main::.*::$/) {
3602 $pkg = "main$pkg" if $pkg =~ /^::/;
3603 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3604 $pkg .= '::' unless $pkg =~ /::$/;
3605 }
3606
3607 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3608 my $stem_symtab = *{$stem}{HASH};
3609
3610 defined $stem_symtab and exists $stem_symtab->{$leaf}
3611 or return;
3612
3613 # clear all symbols
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 }
3619 warn "cleared package #$pkg\n";#d#
3620}
3621
3622our $RELOAD; # how many times to reload
3246 3623
3247sub do_reload_perl() { 3624sub do_reload_perl() {
3248 # can/must only be called in main 3625 # can/must only be called in main
3249 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3250 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3251 return; 3628 return;
3252 } 3629 }
3253 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3254 warn "reloading..."; 3634 warn "reloading...";
3255 3635
3256 warn "entering sync_job"; 3636 warn "entering sync_job";
3257 3637
3258 cf::sync_job { 3638 cf::sync_job {
3259 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3260 cf::emergency_save; 3640 cf::emergency_save;
3261 cf::write_runtime; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3262 3642
3263 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3264 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3265 3645
3266 # if anything goes wrong in here, we should simply crash as we already saved 3646 # if anything goes wrong in here, we should simply crash as we already saved
3267 3647
3268 warn "cancelling all WF_AUTOCANCEL watchers";
3269 for (Event::all_watchers) {
3270 $_->cancel if $_->data & WF_AUTOCANCEL;
3271 }
3272
3273 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
3274 for (;;) {
3275 BDB::flush;
3276 IO::AIO::flush;
3277 Coro::cede;
3278 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3279 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3280 }
3281
3282 ++$RELOAD;
3283
3284 warn "cancelling all extension coros";
3285 $_->cancel for values %EXT_CORO;
3286 %EXT_CORO = ();
3287
3288 warn "removing commands";
3289 %COMMAND = ();
3290
3291 warn "removing ext/exti commands";
3292 %EXTCMD = ();
3293 %EXTICMD = ();
3294
3295 warn "unloading/nuking all extensions";
3296 for my $pkg (@EXTS) {
3297 warn "... unloading $pkg";
3298
3299 if (my $cb = $pkg->can ("unload")) {
3300 eval {
3301 $cb->($pkg);
3302 1
3303 } or warn "$pkg unloaded, but with errors: $@";
3304 } 3651 }
3305 3652
3306 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3307 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3308 } 3655 %EXT_CORO = ();
3309 3656
3310 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3311 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3312 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3313 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3314 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3315 delete $INC{$k};
3316 3667
3317 $k =~ s/\.pm$//;
3318 $k =~ s/\//::/g;
3319
3320 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3321 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3322 } 3677 }
3323 3678
3324 Symbol::delete_package $k; 3679 warn "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682
3683 warn "... unloading $k";
3684 delete $INC{$k};
3685
3686 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g;
3688
3689 if (my $cb = $k->can ("unload_module")) {
3690 $cb->();
3691 }
3692
3693 clear_package $k;
3325 } 3694 }
3326 3695
3327 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3328 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3329 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3330 3699
3331 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3332 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3333 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3334 3703
3335 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3336 # and global variables created in xs 3705 # and global variables created in xs
3337 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3338 3707
3339 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3340 3709
3341 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3342 require cf; 3711 require cf;
3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3344 3713
3345 warn "loading config and database again"; 3714 warn "loading config and database again";
3346 cf::reload_config; 3715 cf::reload_config;
3347 3716
3348 warn "loading extensions"; 3717 warn "loading extensions";
3349 cf::load_extensions; 3718 cf::load_extensions;
3350 3719
3351 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3352 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3353 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3354 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3355 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3356 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3357 3726
3358 warn "leaving sync_job"; 3727 warn "leaving sync_job";
3359 3728
3360 1 3729 1
3361 } or do { 3730 } or do {
3362 warn $@; 3731 warn $@;
3363 warn "error while reloading, exiting."; 3732 cf::cleanup "error while reloading, exiting.";
3364 exit 1;
3365 }; 3733 };
3366 3734
3367 warn "reloaded"; 3735 warn "reloaded";
3736 --$RELOAD;
3737 }
3368}; 3738};
3369 3739
3370our $RELOAD_WATCHER; # used only during reload 3740our $RELOAD_WATCHER; # used only during reload
3371 3741
3372sub reload_perl() { 3742sub reload_perl() {
3373 # doing reload synchronously and two reloads happen back-to-back, 3743 # doing reload synchronously and two reloads happen back-to-back,
3374 # coro crashes during coro_state_free->destroy here. 3744 # coro crashes during coro_state_free->destroy here.
3375 3745
3376 $RELOAD_WATCHER ||= Event->timer ( 3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3377 reentrant => 0,
3378 after => 0,
3379 data => WF_AUTOCANCEL,
3380 cb => sub {
3381 do_reload_perl; 3747 do_reload_perl;
3382 undef $RELOAD_WATCHER; 3748 undef $RELOAD_WATCHER;
3383 },
3384 ); 3749 };
3385} 3750}
3386 3751
3387register_command "reload" => sub { 3752register_command "reload" => sub {
3388 my ($who, $arg) = @_; 3753 my ($who, $arg) = @_;
3389 3754
3390 if ($who->flag (FLAG_WIZ)) { 3755 if ($who->flag (FLAG_WIZ)) {
3391 $who->message ("reloading server."); 3756 $who->message ("reloading server.");
3757 async {
3758 $Coro::current->{desc} = "perl_reload";
3392 async { reload_perl }; 3759 reload_perl;
3760 };
3393 } 3761 }
3394}; 3762};
3395 3763
3396unshift @INC, $LIBDIR; 3764unshift @INC, $LIBDIR;
3397 3765
3399 3767
3400our @WAIT_FOR_TICK; 3768our @WAIT_FOR_TICK;
3401our @WAIT_FOR_TICK_BEGIN; 3769our @WAIT_FOR_TICK_BEGIN;
3402 3770
3403sub wait_for_tick { 3771sub wait_for_tick {
3404 return unless $TICK_WATCHER->is_active;
3405 return if $Coro::current == $Coro::main; 3772 return if tick_inhibit || $Coro::current == $Coro::main;
3406 3773
3407 my $signal = new Coro::Signal; 3774 my $signal = new Coro::Signal;
3408 push @WAIT_FOR_TICK, $signal; 3775 push @WAIT_FOR_TICK, $signal;
3409 $signal->wait; 3776 $signal->wait;
3410} 3777}
3411 3778
3412sub wait_for_tick_begin { 3779sub wait_for_tick_begin {
3413 return unless $TICK_WATCHER->is_active;
3414 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
3415 3781
3416 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
3417 push @WAIT_FOR_TICK_BEGIN, $signal; 3783 push @WAIT_FOR_TICK_BEGIN, $signal;
3418 $signal->wait; 3784 $signal->wait;
3419} 3785}
3420 3786
3421 my $min = 1e6;#d# 3787sub tick {
3422 my $avg = 10;
3423$TICK_WATCHER = Event->timer (
3424 reentrant => 0,
3425 parked => 1,
3426 prio => 0,
3427 at => $NEXT_TICK || $TICK,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 if ($Coro::current != $Coro::main) { 3788 if ($Coro::current != $Coro::main) {
3431 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3789 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3432 unless ++$bug_warning > 10; 3790 unless ++$bug_warning > 10;
3433 return; 3791 return;
3434 } 3792 }
3435 3793
3436 $NOW = $tick_start = Event::time;
3437
3438 cf::server_tick; # one server iteration 3794 cf::server_tick; # one server iteration
3439 3795
3440 0 && sync_job {#d# 3796 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3441 for(1..10) { 3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3442 my $t = Event::time; 3798 Coro::async_pool {
3443 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3799 $Coro::current->{desc} = "runtime saver";
3444 or die; 3800 write_runtime_sync
3445 3801 or warn "ERROR: unable to write runtime file: $!";
3446 $map->width (50);
3447 $map->height (50);
3448 $map->alloc;
3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3450 my $t = Event::time - $t;
3451
3452 #next unless $t < 0.0013;#d#
3453 if ($t < $min) {
3454 $min = $t;
3455 }
3456 $avg = $avg * 0.99 + $t * 0.01;
3457 }
3458 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3459 exit 0;
3460 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3461 }; 3802 };
3803 }
3462 3804
3463 $RUNTIME += $TICK;
3464 $NEXT_TICK += $TICK;
3465
3466 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3467 $NEXT_RUNTIME_WRITE = $NOW + 10;
3468 Coro::async_pool {
3469 write_runtime
3470 or warn "ERROR: unable to write runtime file: $!";
3471 };
3472 }
3473
3474# my $AFTER = Event::time;
3475# warn $AFTER - $NOW;#d#
3476
3477 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3805 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3478 $sig->send; 3806 $sig->send;
3479 } 3807 }
3480 while (my $sig = shift @WAIT_FOR_TICK) { 3808 while (my $sig = shift @WAIT_FOR_TICK) {
3481 $sig->send; 3809 $sig->send;
3482 } 3810 }
3483 3811
3484 $NOW = Event::time; 3812 $LOAD = ($NOW - $TICK_START) / $TICK;
3485
3486 # if we are delayed by four ticks or more, skip them all
3487 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3488
3489 $TICK_WATCHER->at ($NEXT_TICK);
3490 $TICK_WATCHER->start;
3491
3492 $LOAD = ($NOW - $tick_start) / $TICK;
3493 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3813 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3494 3814
3495 _post_tick; 3815 if (0) {
3496 3816 if ($NEXT_TICK) {
3497 3817 my $jitter = $TICK_START - $NEXT_TICK;
3818 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3819 warn "jitter $JITTER\n";#d#
3820 }
3498 }, 3821 }
3499); 3822}
3500 3823
3501{ 3824{
3502 BDB::max_poll_time $TICK * 0.1; 3825 # configure BDB
3503 $BDB_POLL_WATCHER = Event->io ( 3826
3504 reentrant => 0,
3505 fd => BDB::poll_fileno,
3506 poll => 'r',
3507 prio => 0,
3508 data => WF_AUTOCANCEL,
3509 cb => \&BDB::poll_cb,
3510 );
3511 BDB::min_parallel 8; 3827 BDB::min_parallel 8;
3512 3828 BDB::max_poll_reqs $TICK * 0.1;
3513 BDB::set_sync_prepare { 3829 $AnyEvent::BDB::WATCHER->priority (1);
3514 my $status;
3515 my $current = $Coro::current;
3516 (
3517 sub {
3518 $status = $!;
3519 $current->ready; undef $current;
3520 },
3521 sub {
3522 Coro::schedule while defined $current;
3523 $! = $status;
3524 },
3525 )
3526 };
3527 3830
3528 unless ($DB_ENV) { 3831 unless ($DB_ENV) {
3529 $DB_ENV = BDB::db_env_create; 3832 $DB_ENV = BDB::db_env_create;
3833 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3834 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3835 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3836 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3837 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3530 3838
3531 cf::sync_job { 3839 cf::sync_job {
3532 eval { 3840 eval {
3533 BDB::db_env_open 3841 BDB::db_env_open
3534 $DB_ENV, 3842 $DB_ENV,
3536 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3844 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3537 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3845 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3538 0666; 3846 0666;
3539 3847
3540 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3848 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3541
3542 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3543 $DB_ENV->set_lk_detect;
3544 }; 3849 };
3545 3850
3546 cf::cleanup "db_env_open(db): $@" if $@; 3851 cf::cleanup "db_env_open(db): $@" if $@;
3547 }; 3852 };
3548 } 3853 }
3854
3855 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3856 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3857 };
3858 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3859 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3860 };
3861 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3862 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3863 };
3549} 3864}
3550 3865
3551{ 3866{
3867 # configure IO::AIO
3868
3552 IO::AIO::min_parallel 8; 3869 IO::AIO::min_parallel 8;
3553
3554 undef $Coro::AIO::WATCHER;
3555 IO::AIO::max_poll_time $TICK * 0.1; 3870 IO::AIO::max_poll_time $TICK * 0.1;
3556 $AIO_POLL_WATCHER = Event->io ( 3871 undef $AnyEvent::AIO::WATCHER;
3557 reentrant => 0,
3558 data => WF_AUTOCANCEL,
3559 fd => IO::AIO::poll_fileno,
3560 poll => 'r',
3561 prio => 6,
3562 cb => \&IO::AIO::poll_cb,
3563 );
3564} 3872}
3565 3873
3566my $_log_backtrace; 3874my $_log_backtrace;
3567 3875
3568sub _log_backtrace { 3876sub _log_backtrace {
3572 3880
3573 # limit the # of concurrent backtraces 3881 # limit the # of concurrent backtraces
3574 if ($_log_backtrace < 2) { 3882 if ($_log_backtrace < 2) {
3575 ++$_log_backtrace; 3883 ++$_log_backtrace;
3576 async { 3884 async {
3885 $Coro::current->{desc} = "abt $msg";
3886
3577 my @bt = fork_call { 3887 my @bt = fork_call {
3578 @addr = map { sprintf "%x", $_ } @addr; 3888 @addr = map { sprintf "%x", $_ } @addr;
3579 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3889 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3580 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3890 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3581 or die "addr2line: $!"; 3891 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines