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.434 by root, Thu May 29 03:27:37 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;
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 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB;
23use Coro::Storable; 46use Coro::Storable;
24use Coro::Util (); 47use Coro::Util ();
25 48
26use JSON::XS (); 49use JSON::XS 2.01 ();
27use BDB (); 50use BDB ();
28use Data::Dumper; 51use Data::Dumper;
29use Digest::MD5; 52use Digest::MD5;
30use Fcntl; 53use Fcntl;
31use YAML::Syck (); 54use YAML ();
32use IO::AIO 2.32 (); 55use IO::AIO ();
33use Time::HiRes; 56use Time::HiRes;
34use Compress::LZF; 57use Compress::LZF;
35use Digest::MD5 (); 58use Digest::MD5 ();
59
60AnyEvent::detect;
61
62IO::AIO::max_poll_reqs 1;#d#
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';
… …
213)) { 251)) {
214 no strict 'refs'; 252 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) = @_;
… …
989cf::attachable->attach ( 1113cf::attachable->attach (
990 prio => -1000000, 1114 prio => -1000000,
991 on_instantiate => sub { 1115 on_instantiate => sub {
992 my ($obj, $data) = @_; 1116 my ($obj, $data) = @_;
993 1117
994 $data = from_json $data; 1118 $data = decode_json $data;
995 1119
996 for (@$data) { 1120 for (@$data) {
997 my ($name, $args) = @$_; 1121 my ($name, $args) = @$_;
998 1122
999 $obj->attach ($name, %{$args || {} }); 1123 $obj->attach ($name, %{$args || {} });
… …
1013); 1137);
1014 1138
1015sub object_freezer_save { 1139sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1140 my ($filename, $rdata, $objs) = @_;
1017 1141
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1142 sync_job {
1021 if (length $$rdata) { 1143 if (length $$rdata) {
1144 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1145 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1146 $decname, length $$rdata, scalar @$objs;
1024 1147
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1149 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1151 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1152 aio_close $fh;
1030 1153
1031 if (@$objs) { 1154 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1158 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1160 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1161 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1162 }
1040 } else { 1163 } else {
1041 aio_unlink "$filename.pst"; 1164 aio_unlink "$filename.pst";
1042 } 1165 }
… …
1048 } else { 1171 } else {
1049 aio_unlink $filename; 1172 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1173 aio_unlink "$filename.pst";
1051 } 1174 }
1052 }; 1175 };
1053
1054 undef $guard;
1055} 1176}
1056 1177
1057sub object_freezer_as_string { 1178sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1179 my ($rdata, $objs) = @_;
1059 1180
… …
1064 1185
1065sub object_thawer_load { 1186sub object_thawer_load {
1066 my ($filename) = @_; 1187 my ($filename) = @_;
1067 1188
1068 my ($data, $av); 1189 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1190
1072 (aio_load $filename, $data) >= 0 1191 (aio_load $filename, $data) >= 0
1073 or return; 1192 or return;
1074 1193
1075 unless (aio_stat "$filename.pst") { 1194 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1195 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1196 or return;
1078 1197
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1198 my $st = eval { Coro::Storable::thaw $av };
1199 $av = $st->{objs};
1081 } 1200 }
1082 1201
1202 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1203 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1204 $decname, length $data, scalar @{$av || []};
1085 1205
1086 ($data, $av) 1206 ($data, $av)
1087} 1207}
1088 1208
1089=head2 COMMAND CALLBACKS 1209=head2 COMMAND CALLBACKS
… …
1240 my $msg = $@ ? "$v->{path}: $@\n" 1360 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n"; 1361 : "$v->{base}: extension inactive.\n";
1242 1362
1243 if (exists $v->{meta}{mandatory}) { 1363 if (exists $v->{meta}{mandatory}) {
1244 warn $msg; 1364 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n"; 1365 cf::cleanup "mandatory extension failed to load, exiting.";
1246 exit 1;
1247 } 1366 }
1248 1367
1249 warn $msg; 1368 warn $msg;
1250 } 1369 }
1251 1370
… …
1276use Coro::AIO; 1395use Coro::AIO;
1277 1396
1278=head3 cf::player 1397=head3 cf::player
1279 1398
1280=over 4 1399=over 4
1400
1401=item cf::player::num_playing
1402
1403Returns the official number of playing players, as per the Crossfire metaserver rules.
1404
1405=cut
1406
1407sub num_playing {
1408 scalar grep
1409 $_->ob->map
1410 && !$_->hidden
1411 && !$_->ob->flag (cf::FLAG_WIZ),
1412 cf::player::list
1413}
1281 1414
1282=item cf::player::find $login 1415=item cf::player::find $login
1283 1416
1284Returns the given player object, loading it if necessary (might block). 1417Returns the given player object, loading it if necessary (might block).
1285 1418
… …
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1457 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1458
1326 my $f = new_from_file cf::object::thawer path $login 1459 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1460 or return;
1328 1461
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1462 my $pl = cf::player::load_pl $f
1331 or return; 1463 or return;
1464
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1465 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1466 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1467 $cf::PLAYER{$login} = $pl
1335 } 1468 }
1336 } 1469 }
… …
1346 1479
1347 return if $pl->{deny_save}; 1480 return if $pl->{deny_save};
1348 1481
1349 aio_mkdir playerdir $pl, 0770; 1482 aio_mkdir playerdir $pl, 0770;
1350 $pl->{last_save} = $cf::RUNTIME; 1483 $pl->{last_save} = $cf::RUNTIME;
1484
1485 cf::get_slot 0.01;
1351 1486
1352 $pl->save_pl ($path); 1487 $pl->save_pl ($path);
1353 cf::cede_to_tick; 1488 cf::cede_to_tick;
1354} 1489}
1355 1490
… …
1391 $pl->{deny_save} = 1; 1526 $pl->{deny_save} = 1;
1392 $pl->password ("*"); # this should lock out the player until we nuked the dir 1527 $pl->password ("*"); # this should lock out the player until we nuked the dir
1393 1528
1394 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1395 $pl->deactivate; 1530 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score;
1396 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1533 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1397 $pl->ns->destroy if $pl->ns; 1534 $pl->ns->destroy if $pl->ns;
1398 1535
1399 my $path = playerdir $pl; 1536 my $path = playerdir $pl;
1400 my $temp = "$path~$cf::RUNTIME~deleting~"; 1537 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1439 1576
1440 for my $login (@$dirs) { 1577 for my $login (@$dirs) {
1441 my $path = path $login; 1578 my $path = path $login;
1442 1579
1443 # a .pst is a dead give-away for a valid player 1580 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") { 1581 # if no pst file found, open and chekc for blocked users
1582 if (aio_stat "$path.pst") {
1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1583 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1446 aio_read $fh, 0, 512, my $buf, 0 or next; 1584 aio_read $fh, 0, 512, my $buf, 0 or next;
1447 $buf !~ /^password -------------$/m or next; # official not-valid tag 1585 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 } 1586 }
1449 1587
… …
1486 1624
1487Expand crossfire pod fragments into protocol xml. 1625Expand crossfire pod fragments into protocol xml.
1488 1626
1489=cut 1627=cut
1490 1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1491sub expand_cfpod { 1640sub expand_cfpod {
1492 ((my $self), (local $_)) = @_; 1641 my ($self, $pod) = @_;
1493 1642
1494 # escape & and < 1643 my $xml;
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497 1644
1498 # this is buggy, it needs to properly take care of nested <'s 1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1499 1648
1500 1 while 1649 $group =~ s/&/&amp;/g;
1501 # replace B<>, I<>, U<> etc. 1650 $group =~ s/</&lt;/g;
1502 s/B<([^\>]*)>/<b>$1<\/b>/ 1651
1503 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $xml .= $group;
1504 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($pod =~ m%\G
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1654 ([BCGHITU])
1506 # replace G<male|female> tags 1655 <
1507 || s{G<([^>|]*)\|([^>]*)>}{ 1656 (?:
1508 $self->gender ? $2 : $1 1657 ([^<>]*) (?{ $group = $^N })
1509 }ge 1658 | < $interior >
1510 # replace H<hint text> 1659 )
1511 || s{H<([^\>]*)>} 1660 >
1661 %gcsx
1512 { 1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "") 1682 "")
1516 [$self->{hintmode}] 1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1517 }ge; 1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1518 1694
1695 for ($xml) {
1519 # create single paragraphs (very hackish) 1696 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g; 1697 s/(?<=\S)\n(?=\w)/ /g;
1521 1698
1522 # compress some whitespace 1699 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends 1700 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines 1701 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines 1702 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines 1703 s/\n+$//; # ending lines
1704 }
1527 1705
1528 $_ 1706 $xml
1529} 1707}
1708
1709no re 'eval';
1530 1710
1531sub hintmode { 1711sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1; 1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode} 1713 $_[0]{hintmode}
1534} 1714}
… …
1606our $MAX_RESET = 3600; 1786our $MAX_RESET = 3600;
1607our $DEFAULT_RESET = 3000; 1787our $DEFAULT_RESET = 3000;
1608 1788
1609sub generate_random_map { 1789sub generate_random_map {
1610 my ($self, $rmp) = @_; 1790 my ($self, $rmp) = @_;
1791
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793
1611 # mit "rum" bekleckern, nicht 1794 # mit "rum" bekleckern, nicht
1612 $self->_create_random_map ( 1795 $self->_create_random_map (
1613 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1614 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1615 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1737 1920
1738# the temporary/swap location 1921# the temporary/swap location
1739sub save_path { 1922sub save_path {
1740 my ($self) = @_; 1923 my ($self) = @_;
1741 1924
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1925 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$TMPDIR/$path.map" 1926 "$TMPDIR/$path.map"
1744} 1927}
1745 1928
1746# the unique path, undef == no special unique path 1929# the unique path, undef == no special unique path
1747sub uniq_path { 1930sub uniq_path {
1748 my ($self) = @_; 1931 my ($self) = @_;
1749 1932
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$UNIQUEDIR/$path" 1934 "$UNIQUEDIR/$path"
1752} 1935}
1753 1936
1754# and all this just because we cannot iterate over 1937# and all this just because we cannot iterate over
1755# all maps in C++... 1938# all maps in C++...
… …
1853 2036
1854 cf::lock_wait "map_data:$path";#d#remove 2037 cf::lock_wait "map_data:$path";#d#remove
1855 cf::lock_wait "map_find:$path"; 2038 cf::lock_wait "map_find:$path";
1856 2039
1857 $cf::MAP{$path} || do { 2040 $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 2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
1860 2043
1861 my $map = new_from_path cf::map $path 2044 my $map = new_from_path cf::map $path
1862 or return; 2045 or return;
1863 2046
1864 $map->{last_save} = $cf::RUNTIME; 2047 $map->{last_save} = $cf::RUNTIME;
… …
1867 or return; 2050 or return;
1868 2051
1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2052 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1870 # doing this can freeze the server in a sync job, obviously 2053 # doing this can freeze the server in a sync job, obviously
1871 #$cf::WAIT_FOR_TICK->wait; 2054 #$cf::WAIT_FOR_TICK->wait;
2055 undef $guard2;
1872 undef $guard1; 2056 undef $guard1;
1873 undef $guard2;
1874 $map->reset; 2057 $map->reset;
1875 return find $path; 2058 return find $path;
1876 } 2059 }
1877 2060
1878 $cf::MAP{$path} = $map 2061 $cf::MAP{$path} = $map
… …
1891 2074
1892 { 2075 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 2076 my $guard = cf::lock_acquire "map_data:$path";
1894 2077
1895 return unless $self->valid; 2078 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2079 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2080
1898 $self->in_memory (cf::MAP_LOADING); 2081 $self->in_memory (cf::MAP_LOADING);
1899 2082
1900 $self->alloc; 2083 $self->alloc;
1901 2084
… …
1941 } 2124 }
1942 2125
1943 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
1945 2128
1946 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
1947 } 2130 }
1948 2131
1949 $self->post_load; 2132 $self->post_load;
1950} 2133}
1951 2134
… …
2009 my ($path, $origin, $load) = @_; 2192 my ($path, $origin, $load) = @_;
2010 2193
2011 $path = normalise $path, $origin && $origin->{path}; 2194 $path = normalise $path, $origin && $origin->{path};
2012 2195
2013 if (my $map = $cf::MAP{$path}) { 2196 if (my $map = $cf::MAP{$path}) {
2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2197 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2015 } 2198 }
2016 2199
2017 $MAP_PREFETCH{$path} |= $load; 2200 $MAP_PREFETCH{$path} |= $load;
2018 2201
2019 $MAP_PREFETCHER ||= cf::async { 2202 $MAP_PREFETCHER ||= cf::async {
2203 $Coro::current->{desc} = "map prefetcher";
2204
2020 while (%MAP_PREFETCH) { 2205 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2206 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2207 if (my $map = find $k) {
2023 $map->load if $v; 2208 $map->load if $v;
2024 } 2209 }
… …
2050 return if $self->{deny_save}; 2235 return if $self->{deny_save};
2051 2236
2052 local $self->{last_access} = $self->last_access;#d# 2237 local $self->{last_access} = $self->last_access;#d#
2053 2238
2054 cf::async { 2239 cf::async {
2240 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2241 $_->contr->save for $self->players;
2056 }; 2242 };
2243
2244 cf::get_slot 0.02;
2057 2245
2058 if ($uniq) { 2246 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2060 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2248 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2061 } else { 2249 } else {
… …
2070 $self->save; 2258 $self->save;
2071 2259
2072 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2073 2261
2074 return if $self->players; 2262 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY; 2263 return if $self->in_memory != cf::MAP_ACTIVE;
2076 return if $self->{deny_save}; 2264 return if $self->{deny_save};
2077 2265
2078 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2079 2267
2080 $self->deactivate; 2268 $self->deactivate;
… …
2198 2386
2199sub unique_maps() { 2387sub unique_maps() {
2200 [ 2388 [
2201 map { 2389 map {
2202 utf8::decode $_; 2390 utf8::decode $_;
2203 /\.map$/ 2391 s/\.map$//; # TODO future compatibility hack
2392 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2393 ? ()
2204 ? normalise $_ 2394 : normalise $_
2205 : ()
2206 } @{ aio_readdir $UNIQUEDIR or [] } 2395 } @{ aio_readdir $UNIQUEDIR or [] }
2207 ] 2396 ]
2208} 2397}
2209 2398
2210package cf;
2211
2212=back 2399=back
2213 2400
2214=head3 cf::object 2401=head3 cf::object
2215 2402
2216=cut 2403=cut
… …
2219 2406
2220=over 4 2407=over 4
2221 2408
2222=item $ob->inv_recursive 2409=item $ob->inv_recursive
2223 2410
2224Returns the inventory of the object _and_ their inventories, recursively. 2411Returns the inventory of the object I<and> their inventories, recursively,
2412but I<not> the object itself.
2225 2413
2226=cut 2414=cut
2227 2415
2228sub inv_recursive_; 2416sub inv_recursive_;
2229sub inv_recursive_ { 2417sub inv_recursive_ {
… …
2234 inv_recursive_ inv $_[0] 2422 inv_recursive_ inv $_[0]
2235} 2423}
2236 2424
2237=item $ref = $ob->ref 2425=item $ref = $ob->ref
2238 2426
2239creates and returns a persistent reference to an objetc that can be stored as a string. 2427Creates and returns a persistent reference to an object that can be stored as a string.
2240 2428
2241=item $ob = cf::object::deref ($refstring) 2429=item $ob = cf::object::deref ($refstring)
2242 2430
2243returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2431returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2244even if the object actually exists. May block. 2432even if the object actually exists. May block.
… …
2246=cut 2434=cut
2247 2435
2248sub deref { 2436sub deref {
2249 my ($ref) = @_; 2437 my ($ref) = @_;
2250 2438
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2439 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2); 2440 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2441 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return; 2442 or return;
2258 $pl->ob->uuid eq $uuid 2443 $pl->ob->uuid eq $uuid
2259 or return; 2444 or return;
… …
2279can be C<undef>. Does the right thing when the player is currently in a 2464can be C<undef>. Does the right thing when the player is currently in a
2280dialogue with the given NPC character. 2465dialogue with the given NPC character.
2281 2466
2282=cut 2467=cut
2283 2468
2469our $SAY_CHANNEL = {
2470 id => "say",
2471 title => "Map",
2472 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2474};
2475
2476our $CHAT_CHANNEL = {
2477 id => "chat",
2478 title => "Chat",
2479 reply => "chat ",
2480 tooltip => "Player chat and shouts, global to the server.",
2481};
2482
2284# rough implementation of a future "reply" method that works 2483# rough implementation of a future "reply" method that works
2285# with dialog boxes. 2484# with dialog boxes.
2286#TODO: the first argument must go, split into a $npc->reply_to ( method 2485#TODO: the first argument must go, split into a $npc->reply_to ( method
2287sub cf::object::player::reply($$$;$) { 2486sub cf::object::player::reply($$$;$) {
2288 my ($self, $npc, $msg, $flags) = @_; 2487 my ($self, $npc, $msg, $flags) = @_;
… …
2299 my $dialog = $pl->{npc_dialog}; 2498 my $dialog = $pl->{npc_dialog};
2300 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2499 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2301 2500
2302 } else { 2501 } else {
2303 $msg = $npc->name . " says: $msg" if $npc; 2502 $msg = $npc->name . " says: $msg" if $npc;
2304 $self->message ($msg, $flags); 2503 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2305 } 2504 }
2306 } 2505 }
2307} 2506}
2308 2507
2309=item $object->send_msg ($channel, $msg, $color, [extra...]) 2508=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2629 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2431 2630
2432 $self->enter_link; 2631 $self->enter_link;
2433 2632
2434 (async { 2633 (async {
2634 $Coro::current->{desc} = "player::goto $path $x $y";
2635
2636 # *tag paths override both path and x|y
2637 if ($path =~ /^\*(.*)$/) {
2638 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2639 my $ob = $obs[rand @obs];
2640
2641 # see if we actually can go there
2642 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2643 $ob = $obs[rand @obs];
2644 } else {
2645 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2646 }
2647 # else put us there anyways for now #d#
2648
2649 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2650 } else {
2651 ($path, $x, $y) = (undef, undef, undef);
2652 }
2653 }
2654
2435 my $map = eval { 2655 my $map = eval {
2436 my $map = cf::map::find $path; 2656 my $map = defined $path ? cf::map::find $path : undef;
2437 2657
2438 if ($map) { 2658 if ($map) {
2439 $map = $map->customise_for ($self); 2659 $map = $map->customise_for ($self);
2440 $map = $check->($map) if $check && $map; 2660 $map = $check->($map) if $check && $map;
2441 } else { 2661 } else {
2442 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2662 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2443 } 2663 }
2444 2664
2445 $map 2665 $map
2446 }; 2666 };
2447 2667
… …
2483} 2703}
2484 2704
2485sub prepare_random_map { 2705sub prepare_random_map {
2486 my ($exit) = @_; 2706 my ($exit) = @_;
2487 2707
2488 my $guard = cf::lock_acquire "exit_prepare:$exit";
2489
2490 # all this does is basically replace the /! path by 2708 # all this does is basically replace the /! path by
2491 # a new random map path (?random/...) with a seed 2709 # a new random map path (?random/...) with a seed
2492 # that depends on the exit object 2710 # that depends on the exit object
2493 2711
2494 my $rmp = parse_random_map_params $exit->msg; 2712 my $rmp = parse_random_map_params $exit->msg;
… …
2496 if ($exit->map) { 2714 if ($exit->map) {
2497 $rmp->{region} = $exit->region->name; 2715 $rmp->{region} = $exit->region->name;
2498 $rmp->{origin_map} = $exit->map->path; 2716 $rmp->{origin_map} = $exit->map->path;
2499 $rmp->{origin_x} = $exit->x; 2717 $rmp->{origin_x} = $exit->x;
2500 $rmp->{origin_y} = $exit->y; 2718 $rmp->{origin_y} = $exit->y;
2719
2720 $exit->map->touch;
2501 } 2721 }
2502 2722
2503 $rmp->{random_seed} ||= $exit->random_seed; 2723 $rmp->{random_seed} ||= $exit->random_seed;
2504 2724
2505 my $data = cf::to_json $rmp; 2725 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2506 my $md5 = Digest::MD5::md5_hex $data; 2726 my $md5 = Digest::MD5::md5_hex $data;
2507 my $meta = "$RANDOMDIR/$md5.meta"; 2727 my $meta = "$RANDOMDIR/$md5.meta";
2508 2728
2509 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2729 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2510 aio_write $fh, 0, (length $data), $data, 0; 2730 aio_write $fh, 0, (length $data), $data, 0;
2511 undef $fh; 2731 undef $fh;
2512 aio_rename "$meta~", $meta; 2732 aio_rename "$meta~", $meta;
2513 2733
2734 my $slaying = "?random/$md5";
2735
2736 if ($exit->valid) {
2514 $exit->slaying ("?random/$md5"); 2737 $exit->slaying ("?random/$md5");
2515 $exit->msg (undef); 2738 $exit->msg (undef);
2739 }
2516 } 2740 }
2517} 2741}
2518 2742
2519sub cf::object::player::enter_exit { 2743sub cf::object::player::enter_exit {
2520 my ($self, $exit) = @_; 2744 my ($self, $exit) = @_;
2521 2745
2522 return unless $self->type == cf::PLAYER; 2746 return unless $self->type == cf::PLAYER;
2523 2747
2524 if ($exit->slaying eq "/!") {
2525 #TODO: this should de-fi-ni-te-ly not be a sync-job
2526 # the problem is that $exit might not survive long enough
2527 # so it needs to be done right now, right here
2528 cf::sync_job { prepare_random_map $exit };
2529 }
2530
2531 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2532 my $hp = $exit->stats->hp;
2533 my $sp = $exit->stats->sp;
2534
2535 $self->enter_link; 2748 $self->enter_link;
2536 2749
2537 # if exit is damned, update players death & WoR home-position
2538 $self->contr->savebed ($slaying, $hp, $sp)
2539 if $exit->flag (FLAG_DAMNED);
2540
2541 (async { 2750 (async {
2542 $self->deactivate_recursive; # just to be sure 2751 $Coro::current->{desc} = "enter_exit";
2752
2543 unless (eval { 2753 unless (eval {
2754 $self->deactivate_recursive; # just to be sure
2755
2756 # random map handling
2757 {
2758 my $guard = cf::lock_acquire "exit_prepare:$exit";
2759
2760 prepare_random_map $exit
2761 if $exit->slaying eq "/!";
2762 }
2763
2764 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2765 my $x = $exit->stats->hp;
2766 my $y = $exit->stats->sp;
2767
2544 $self->goto ($slaying, $hp, $sp); 2768 $self->goto ($map, $x, $y);
2545 2769
2770 # if exit is damned, update players death & WoR home-position
2771 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED);
2773
2546 1; 2774 1
2547 }) { 2775 }) {
2548 $self->message ("Something went wrong deep within the crossfire server. " 2776 $self->message ("Something went wrong deep within the crossfire server. "
2549 . "I'll try to bring you back to the map you were before. " 2777 . "I'll try to bring you back to the map you were before. "
2550 . "Please report this to the dungeon master!", 2778 . "Please report this to the dungeon master!",
2551 cf::NDI_UNIQUE | cf::NDI_RED); 2779 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2581the message, with C<log> being the default. If C<$color> is negative, suppress 2809the message, with C<log> being the default. If C<$color> is negative, suppress
2582the message unless the client supports the msg packet. 2810the message unless the client supports the msg packet.
2583 2811
2584=cut 2812=cut
2585 2813
2814# non-persistent channels (usually the info channel)
2586our %CHANNEL = ( 2815our %CHANNEL = (
2587 "c/identify" => { 2816 "c/identify" => {
2588 id => "identify", 2817 id => "infobox",
2589 title => "Identify", 2818 title => "Identify",
2590 reply => undef, 2819 reply => undef,
2591 tooltip => "Items recently identified", 2820 tooltip => "Items recently identified",
2592 }, 2821 },
2593 "c/examine" => { 2822 "c/examine" => {
2594 id => "examine", 2823 id => "infobox",
2595 title => "Examine", 2824 title => "Examine",
2596 reply => undef, 2825 reply => undef,
2597 tooltip => "Signs and other items you examined", 2826 tooltip => "Signs and other items you examined",
2598 }, 2827 },
2828 "c/book" => {
2829 id => "infobox",
2830 title => "Book",
2831 reply => undef,
2832 tooltip => "The contents of a note or book",
2833 },
2834 "c/lookat" => {
2835 id => "infobox",
2836 title => "Look",
2837 reply => undef,
2838 tooltip => "What you saw there",
2839 },
2840 "c/who" => {
2841 id => "infobox",
2842 title => "Players",
2843 reply => undef,
2844 tooltip => "Shows players who are currently online",
2845 },
2846 "c/body" => {
2847 id => "infobox",
2848 title => "Body Parts",
2849 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available",
2851 },
2852 "c/uptime" => {
2853 id => "infobox",
2854 title => "Uptime",
2855 reply => undef,
2856 tooltip => "How long the server has been running since last restart",
2857 },
2858 "c/mapinfo" => {
2859 id => "infobox",
2860 title => "Map Info",
2861 reply => undef,
2862 tooltip => "Information related to the maps",
2863 },
2864 "c/party" => {
2865 id => "party",
2866 title => "Party",
2867 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party",
2869 },
2599); 2870);
2600 2871
2601sub cf::client::send_msg { 2872sub cf::client::send_msg {
2602 my ($self, $channel, $msg, $color, @extra) = @_; 2873 my ($self, $channel, $msg, $color, @extra) = @_;
2603 2874
2604 $msg = $self->pl->expand_cfpod ($msg); 2875 $msg = $self->pl->expand_cfpod ($msg);
2605 2876
2606 $color &= cf::NDI_CLIENT_MASK; # just in case... 2877 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607 2878
2608 # check predefined channels, for the benefit of C 2879 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2880 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel};
2610 2882
2883 $self->ext_msg (channel_info => $channel)
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id};
2887
2611 if (ref $channel) { 2888 } elsif (ref $channel) {
2612 # send meta info to client, if not yet sent 2889 # send meta info to client, if not yet sent
2613 unless (exists $self->{channel}{$channel->{id}}) { 2890 unless (exists $self->{channel}{$channel->{id}}) {
2614 $self->{channel}{$channel->{id}} = $channel; 2891 $self->{channel}{$channel->{id}} = $channel;
2615 $self->ext_msg (channel_info => $channel) 2892 $self->ext_msg (channel_info => $channel)
2616 if $self->can_msg; 2893 if $self->can_msg;
… …
2833=pod 3110=pod
2834 3111
2835The following functions and methods are available within a safe environment: 3112The following functions and methods are available within a safe environment:
2836 3113
2837 cf::object 3114 cf::object
2838 contr pay_amount pay_player map x y force_find force_add 3115 contr pay_amount pay_player map x y force_find force_add destroy
2839 insert remove name archname title slaying race decrease_ob_nr 3116 insert remove name archname title slaying race decrease split
2840 3117
2841 cf::object::player 3118 cf::object::player
2842 player 3119 player
2843 3120
2844 cf::player 3121 cf::player
… …
2849 3126
2850=cut 3127=cut
2851 3128
2852for ( 3129for (
2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2854 insert remove inv name archname title slaying race 3131 insert remove inv nrof name archname title slaying race
2855 decrease_ob_nr)], 3132 decrease split destroy)],
2856 ["cf::object::player" => qw(player)], 3133 ["cf::object::player" => qw(player)],
2857 ["cf::player" => qw(peaceful)], 3134 ["cf::player" => qw(peaceful)],
2858 ["cf::map" => qw(trigger)], 3135 ["cf::map" => qw(trigger)],
2859) { 3136) {
2860 no strict 'refs'; 3137 no strict 'refs';
… …
2965 { 3242 {
2966 my $faces = $facedata->{faceinfo}; 3243 my $faces = $facedata->{faceinfo};
2967 3244
2968 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
2969 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3246 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247
2970 cf::face::set_visibility $idx, $info->{visibility}; 3248 cf::face::set_visibility $idx, $info->{visibility};
2971 cf::face::set_magicmap $idx, $info->{magicmap}; 3249 cf::face::set_magicmap $idx, $info->{magicmap};
2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3250 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}; 3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2974 3252
2975 cf::cede_to_tick; 3253 cf::cede_to_tick;
2976 } 3254 }
2977 3255
2978 while (my ($face, $info) = each %$faces) { 3256 while (my ($face, $info) = each %$faces) {
2979 next unless $info->{smooth}; 3257 next unless $info->{smooth};
3258
2980 my $idx = cf::face::find $face 3259 my $idx = cf::face::find $face
2981 or next; 3260 or next;
3261
2982 if (my $smooth = cf::face::find $info->{smooth}) { 3262 if (my $smooth = cf::face::find $info->{smooth}) {
2983 cf::face::set_smooth $idx, $smooth; 3263 cf::face::set_smooth $idx, $smooth;
2984 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3264 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2985 } else { 3265 } else {
2986 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3266 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3004 { 3284 {
3005 # TODO: for gcfclient pleasure, we should give resources 3285 # TODO: for gcfclient pleasure, we should give resources
3006 # that gcfclient doesn't grok a >10000 face index. 3286 # that gcfclient doesn't grok a >10000 face index.
3007 my $res = $facedata->{resource}; 3287 my $res = $facedata->{resource};
3008 3288
3009 my $soundconf = delete $res->{"res/sound.conf"};
3010
3011 while (my ($name, $info) = each %$res) { 3289 while (my ($name, $info) = each %$res) {
3290 if (defined $info->{type}) {
3012 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3291 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3013 my $data; 3292 my $data;
3014 3293
3015 if ($info->{type} & 1) { 3294 if ($info->{type} & 1) {
3016 # prepend meta info 3295 # prepend meta info
3017 3296
3018 my $meta = $enc->encode ({ 3297 my $meta = $enc->encode ({
3019 name => $name, 3298 name => $name,
3020 %{ $info->{meta} || {} }, 3299 %{ $info->{meta} || {} },
3021 }); 3300 });
3022 3301
3023 $data = pack "(w/a*)*", $meta, $info->{data}; 3302 $data = pack "(w/a*)*", $meta, $info->{data};
3303 } else {
3304 $data = $info->{data};
3305 }
3306
3307 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3308 cf::face::set_type $idx, $info->{type};
3024 } else { 3309 } else {
3025 $data = $info->{data}; 3310 $RESOURCE{$name} = $info;
3026 } 3311 }
3027 3312
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; 3313 cf::cede_to_tick;
3032 } 3314 }
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 } 3315 }
3316
3317 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3052 3318
3053 1 3319 1
3054} 3320}
3321
3322cf::global->attach (on_resource_update => sub {
3323 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3324 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3325
3326 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3327 my $sound = $soundconf->{compat}[$_]
3328 or next;
3329
3330 my $face = cf::face::find "sound/$sound->[1]";
3331 cf::sound::set $sound->[0] => $face;
3332 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3333 }
3334
3335 while (my ($k, $v) = each %{$soundconf->{event}}) {
3336 my $face = cf::face::find "sound/$v";
3337 cf::sound::set $k => $face;
3338 }
3339 }
3340});
3055 3341
3056register_exticmd fx_want => sub { 3342register_exticmd fx_want => sub {
3057 my ($ns, $want) = @_; 3343 my ($ns, $want) = @_;
3058 3344
3059 while (my ($k, $v) = each %$want) { 3345 while (my ($k, $v) = each %$want) {
3060 $ns->fx_want ($k, $v); 3346 $ns->fx_want ($k, $v);
3061 } 3347 }
3062}; 3348};
3349
3350sub load_resource_file($) {
3351 my $guard = lock_acquire "load_resource_file";
3352
3353 my $status = load_resource_file_ $_[0];
3354 get_slot 0.1, 100;
3355 cf::arch::commit_load;
3356
3357 $status
3358}
3063 3359
3064sub reload_regions { 3360sub reload_regions {
3065 # HACK to clear player env face cache, we need some signal framework 3361 # HACK to clear player env face cache, we need some signal framework
3066 # for this (global event?) 3362 # for this (global event?)
3067 %ext::player_env::MUSIC_FACE_CACHE = (); 3363 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3081} 3377}
3082 3378
3083sub reload_archetypes { 3379sub reload_archetypes {
3084 load_resource_file "$DATADIR/archetypes" 3380 load_resource_file "$DATADIR/archetypes"
3085 or die "unable to load archetypes\n"; 3381 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} 3382}
3092 3383
3093sub reload_treasures { 3384sub reload_treasures {
3094 load_resource_file "$DATADIR/treasures" 3385 load_resource_file "$DATADIR/treasures"
3095 or die "unable to load treasurelists\n"; 3386 or die "unable to load treasurelists\n";
3096} 3387}
3097 3388
3098sub reload_resources { 3389sub reload_resources {
3099 warn "reloading resource files...\n"; 3390 warn "reloading resource files...\n";
3100 3391
3392 reload_facedata;
3393 reload_archetypes;
3101 reload_regions; 3394 reload_regions;
3102 reload_facedata;
3103 #reload_archetypes;#d#
3104 reload_archetypes;
3105 reload_treasures; 3395 reload_treasures;
3106 3396
3107 warn "finished reloading resource files\n"; 3397 warn "finished reloading resource files\n";
3108} 3398}
3109 3399
3110sub init { 3400sub init {
3401 my $guard = freeze_mainloop;
3402
3111 reload_resources; 3403 reload_resources;
3112} 3404}
3113 3405
3114sub reload_config { 3406sub reload_config {
3115 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
3116 or return; 3408 or return;
3117 3409
3118 local $/; 3410 local $/;
3119 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
3120 3412
3121 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3122 3414
3123 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $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}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3135sub main { 3427sub main {
3136 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
3137 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
3138 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3139 (async { 3431 (async {
3140 Event::one_event; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT;
3141 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
3142 }; 3435 };
3143 3436
3437 {
3438 my $guard = freeze_mainloop;
3144 reload_config; 3439 reload_config;
3145 db_init; 3440 db_init;
3146 load_extensions; 3441 load_extensions;
3147 3442
3148 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
3149 Event::loop; 3446 EV::loop;
3150} 3447}
3151 3448
3152############################################################################# 3449#############################################################################
3153# initialisation and cleanup 3450# initialisation and cleanup
3154 3451
3155# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
3156BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
3157 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
3158 Event->signal ( 3456 $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"; 3457 cf::cleanup "SIG$signal";
3165 },
3166 ); 3458 };
3167 } 3459 }
3168} 3460}
3169 3461
3170sub write_runtime { 3462sub write_runtime_sync {
3171 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
3172 3464
3173 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
3174 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
3175 3467
… …
3201 and return; 3493 and return;
3202 3494
3203 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
3204 3496
3205 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
3206} 3541}
3207 3542
3208sub emergency_save() { 3543sub emergency_save() {
3209 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
3210 3545
… …
3216 # and maps saved/destroyed asynchronously. 3551 # and maps saved/destroyed asynchronously.
3217 warn "begin emergency player save\n"; 3552 warn "begin emergency player save\n";
3218 for my $login (keys %cf::PLAYER) { 3553 for my $login (keys %cf::PLAYER) {
3219 my $pl = $cf::PLAYER{$login} or next; 3554 my $pl = $cf::PLAYER{$login} or next;
3220 $pl->valid or next; 3555 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3221 $pl->save; 3557 $pl->save;
3222 } 3558 }
3223 warn "end emergency player save\n"; 3559 warn "end emergency player save\n";
3224 3560
3225 warn "begin emergency map save\n"; 3561 warn "begin emergency map save\n";
… …
3231 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
3232 3568
3233 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
3234 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
3235 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
3236 }; 3576 };
3237 3577
3238 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
3239} 3579}
3240 3580
… …
3255 warn "reloading..."; 3595 warn "reloading...";
3256 3596
3257 warn "entering sync_job"; 3597 warn "entering sync_job";
3258 3598
3259 cf::sync_job { 3599 cf::sync_job {
3260 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
3261 cf::emergency_save; 3601 cf::emergency_save;
3262 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
3263 3603
3264 warn "syncing database to disk"; 3604 warn "syncing database to disk";
3265 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3266 3606
3267 # if anything goes wrong in here, we should simply crash as we already saved 3607 # 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 3608
3274 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
3275 for (;;) { 3610 for (;;) {
3276 BDB::flush; 3611 BDB::flush;
3277 IO::AIO::flush; 3612 IO::AIO::flush;
3278 Coro::cede; 3613 Coro::cede_notself;
3279 last unless IO::AIO::nreqs || BDB::nreqs; 3614 last unless IO::AIO::nreqs || BDB::nreqs;
3280 warn "iterate..."; 3615 warn "iterate...";
3281 } 3616 }
3282 3617
3283 ++$RELOAD; 3618 ++$RELOAD;
… …
3359 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3360 3695
3361 1 3696 1
3362 } or do { 3697 } or do {
3363 warn $@; 3698 warn $@;
3364 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3365 exit 1;
3366 }; 3700 };
3367 3701
3368 warn "reloaded"; 3702 warn "reloaded";
3369}; 3703};
3370 3704
… …
3372 3706
3373sub reload_perl() { 3707sub reload_perl() {
3374 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3375 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3376 3710
3377 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3378 reentrant => 0,
3379 after => 0,
3380 data => WF_AUTOCANCEL,
3381 cb => sub {
3382 do_reload_perl; 3712 do_reload_perl;
3383 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3384 },
3385 ); 3714 };
3386} 3715}
3387 3716
3388register_command "reload" => sub { 3717register_command "reload" => sub {
3389 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3390 3719
3391 if ($who->flag (FLAG_WIZ)) { 3720 if ($who->flag (FLAG_WIZ)) {
3392 $who->message ("reloading server."); 3721 $who->message ("reloading server.");
3722 async {
3723 $Coro::current->{desc} = "perl_reload";
3393 async { reload_perl }; 3724 reload_perl;
3725 };
3394 } 3726 }
3395}; 3727};
3396 3728
3397unshift @INC, $LIBDIR; 3729unshift @INC, $LIBDIR;
3398 3730
… …
3400 3732
3401our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3402our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3403 3735
3404sub wait_for_tick { 3736sub wait_for_tick {
3405 return unless $TICK_WATCHER->is_active;
3406 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3407 3738
3408 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3409 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3410 $signal->wait; 3741 $signal->wait;
3411} 3742}
3412 3743
3413sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3414 return unless $TICK_WATCHER->is_active;
3415 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3416 3746
3417 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3418 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3419 $signal->wait; 3749 $signal->wait;
3420} 3750}
3421 3751
3422 my $min = 1e6;#d# 3752sub 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) { 3753 if ($Coro::current != $Coro::main) {
3432 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3433 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3434 return; 3756 return;
3435 } 3757 }
3436 3758
3437 $NOW = $tick_start = Event::time;
3438
3439 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3440 3760
3441 0 && sync_job {#d# 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3442 for(1..10) { 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3443 my $t = Event::time; 3763 Coro::async_pool {
3444 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3764 $Coro::current->{desc} = "runtime saver";
3445 or die; 3765 write_runtime_sync
3446 3766 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 }; 3767 };
3768 }
3463 3769
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) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3479 $sig->send; 3771 $sig->send;
3480 } 3772 }
3481 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3482 $sig->send; 3774 $sig->send;
3483 } 3775 }
3484 3776
3485 $NOW = Event::time; 3777 $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; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3495 3779
3496 _post_tick; 3780 if (0) {
3497 3781 if ($NEXT_TICK) {
3498 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3499 }, 3786 }
3500); 3787}
3501 3788
3502{ 3789{
3503 BDB::max_poll_time $TICK * 0.1; 3790 # configure BDB
3504 $BDB_POLL_WATCHER = Event->io ( 3791
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; 3792 BDB::min_parallel 8;
3513 3793 BDB::max_poll_reqs $TICK * 0.1;
3514 BDB::set_sync_prepare { 3794 $AnyEvent::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 3795
3529 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3530 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3799 | BDB::LOG_AUTOREMOVE, 1);
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3531 3802
3532 cf::sync_job { 3803 cf::sync_job {
3533 eval { 3804 eval {
3534 BDB::db_env_open 3805 BDB::db_env_open
3535 $DB_ENV, 3806 $DB_ENV,
… …
3537 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3808 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3538 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3809 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3539 0666; 3810 0666;
3540 3811
3541 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3812 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 }; 3813 };
3546 3814
3547 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3548 }; 3816 };
3549 } 3817 }
3818
3819 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3820 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3821 };
3822 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3824 };
3825 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3827 };
3550} 3828}
3551 3829
3552{ 3830{
3831 # configure IO::AIO
3832
3553 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3554
3555 undef $Coro::AIO::WATCHER;
3556 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3557 $AIO_POLL_WATCHER = Event->io ( 3835 #undef $AnyEvent::AIO::WATCHER;
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} 3836}
3566 3837
3567my $_log_backtrace; 3838my $_log_backtrace;
3568 3839
3569sub _log_backtrace { 3840sub _log_backtrace {
… …
3573 3844
3574 # limit the # of concurrent backtraces 3845 # limit the # of concurrent backtraces
3575 if ($_log_backtrace < 2) { 3846 if ($_log_backtrace < 2) {
3576 ++$_log_backtrace; 3847 ++$_log_backtrace;
3577 async { 3848 async {
3849 $Coro::current->{desc} = "abt $msg";
3850
3578 my @bt = fork_call { 3851 my @bt = fork_call {
3579 @addr = map { sprintf "%x", $_ } @addr; 3852 @addr = map { sprintf "%x", $_ } @addr;
3580 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3853 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3581 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3854 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3582 or die "addr2line: $!"; 3855 or die "addr2line: $!";
… …
3605# load additional modules 3878# load additional modules
3606use cf::pod; 3879use cf::pod;
3607 3880
3608END { cf::emergency_save } 3881END { cf::emergency_save }
3609 3882
3883evthread_start IO::AIO::poll_fileno;
3884
36101 38851
3611 3886

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines