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.362 by root, Mon Sep 10 12:44:06 2007 UTC vs.
Revision 1.414 by root, Thu Apr 10 09:10:45 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 3.2;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.64 (); 36use Coro 4.50 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
24use Coro::Util (); 46use Coro::Util ();
25 47
26use JSON::XS (); 48use JSON::XS 2.01 ();
27use BDB (); 49use BDB ();
28use Data::Dumper; 50use Data::Dumper;
29use Digest::MD5; 51use Digest::MD5;
30use Fcntl; 52use Fcntl;
31use YAML::Syck (); 53use YAML ();
32use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
33use Time::HiRes; 55use Time::HiRes;
34use Compress::LZF; 56use Compress::LZF;
35use Digest::MD5 (); 57use Digest::MD5 ();
36 58
37# configure various modules to our taste 59# configure various modules to our taste
38# 60#
39$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 64
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 66
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 68
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
75 93
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 97our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
83 99
84our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 104our $DB_ENV;
86 105
87our %CFG; 106our %CFG;
88 107
89our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 109our $RUNTIME;
110our $NOW;
91 111
92our (%PLAYER, %PLAYER_LOADING); # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 113our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
95 115
96# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 118
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
102 123
103binmode STDOUT; 124binmode STDOUT;
104binmode STDERR; 125binmode STDERR;
105 126
106# read virtual server time, if available 127# read virtual server time, if available
159 180
160The raw value load value from the last tick. 181The raw value load value from the last tick.
161 182
162=item %cf::CFG 183=item %cf::CFG
163 184
164Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 186from wherever your confdir points to.
166 187
167=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
168 189
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 212
192 LOG llevError, $msg; 213 LOG llevError, $msg;
193 }; 214 };
194} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
195 231
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
212)) { 248)) {
213 no strict 'refs'; 249 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 251}
216 252
217$Event::DIED = sub { 253$EV::DIED = sub {
218 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
219}; 255};
220 256
221############################################################################# 257#############################################################################
222 258
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 282 $d
247 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
248} 284}
249 285
250=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
251 287
252Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
253 289
254=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
255 291
256Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
257 293
258=cut 294=cut
259 295
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 297
262sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
264 300
265=item cf::lock_wait $string 301=item cf::lock_wait $string
266 302
267Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
268 304
324 360
325 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
326} 362}
327 363
328sub freeze_mainloop { 364sub freeze_mainloop {
329 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
330 366
331 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
332 $TICK_WATCHER->start; 368}
333 }; 369
334 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
335 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
336} 383}
337 384
338=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
339 386
340Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
351our @SLOT_QUEUE; 398our @SLOT_QUEUE;
352our $SLOT_QUEUE; 399our $SLOT_QUEUE;
353 400
354$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
355$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
356 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
357 406
358 while () { 407 while () {
359 next_job: 408 next_job:
360 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
368 } 417 }
369 } 418 }
370 } 419 }
371 420
372 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
373 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
374 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
375 $signal->wait; 424 $signal->wait;
376 } else { 425 } else {
377 Coro::schedule; 426 Coro::schedule;
378 } 427 }
401 450
402BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
403 452
404=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
405 454
406The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
407is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
408partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
409acceptable. 458acceptable.
410 459
411If it must be done, put the blocking parts into C<sync_job>. This will run 460If it must be done, put the blocking parts into C<sync_job>. This will run
412the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
417 466
418sub sync_job(&) { 467sub sync_job(&) {
419 my ($job) = @_; 468 my ($job) = @_;
420 469
421 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
422 my $time = Event::time; 471 my $time = EV::time;
423 472
424 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
425 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
426 475
427 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
428 # (but this is cancel-safe) 477
429 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
430 479
431 my $busy = 1; 480 my $busy = 1;
432 my @res; 481 my @res;
433 482
434 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
435 @res = eval { $job->() }; 485 @res = eval { $job->() };
436 warn $@ if $@; 486 warn $@ if $@;
437 undef $busy; 487 undef $busy;
438 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
439 489
440 while ($busy) { 490 while ($busy) {
441 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
442 } 495 }
496 }
443 497
444 $time = Event::time - $time; 498 my $time = EV::time - $time;
445 499
446 LOG llevError | logBacktrace, Carp::longmess "long sync job"
447 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
448
449 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
450 501
451 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
452 } else { 503 } else {
453 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
454 505
479=item fork_call { }, $args 530=item fork_call { }, $args
480 531
481Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
482process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
483Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
484never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
485 536
486=cut 537=cut
487 538
488sub fork_call(&@) { 539sub fork_call(&@) {
489 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
507=item cf::db_put $family => $key => $value 558=item cf::db_put $family => $key => $value
508 559
509Stores the given C<$value> in the family. It can currently store binary 560Stores the given C<$value> in the family. It can currently store binary
510data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 561data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
511 562
563=item $db = cf::db_table "name"
564
565Create and/or open a new database table. The string must not be "db" and must be unique
566within each server.
567
512=cut 568=cut
569
570sub db_table($) {
571 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV;
573
574 eval {
575 $db->set_flags (BDB::CHKSUM);
576
577 utf8::encode $name;
578 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
579 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
580 cf::cleanup "db_open(db): $!" if $!;
581 };
582 cf::cleanup "db_open(db): $@" if $@;
583
584 $db
585}
513 586
514our $DB; 587our $DB;
515 588
516sub db_init { 589sub db_init {
517 unless ($DB) {
518 $DB = BDB::db_create $DB_ENV;
519
520 cf::sync_job { 590 cf::sync_job {
521 eval { 591 $DB ||= db_table "db";
522 $DB->set_flags (BDB::CHKSUM);
523
524 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
525 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
526 cf::cleanup "db_open(db): $!" if $!;
527 };
528 cf::cleanup "db_open(db): $@" if $@;
529 };
530 } 592 };
531} 593}
532 594
533sub db_get($$) { 595sub db_get($$) {
534 my $key = "$_[0]/$_[1]"; 596 my $key = "$_[0]/$_[1]";
535 597
639attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
640to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
641 703
642In the following description, CLASS can be any of C<global>, C<object> 704In the following description, CLASS can be any of C<global>, C<object>
643C<player>, C<client> or C<map> (i.e. the attachable objects in 705C<player>, C<client> or C<map> (i.e. the attachable objects in
644Crossfire TRT). 706Deliantra).
645 707
646=over 4 708=over 4
647 709
648=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
649 711
931 } 993 }
932 994
933 0 995 0
934} 996}
935 997
936=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
937 999
938=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
939 1001
940Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
941 1003
947 1009
948=cut 1010=cut
949 1011
950############################################################################# 1012#############################################################################
951# object support 1013# object support
952#
953 1014
1015sub _object_equal($$);
1016sub _object_equal($$) {
1017 my ($a, $b) = @_;
1018
1019 return 0 unless (ref $a) eq (ref $b);
1020
1021 if ("HASH" eq ref $a) {
1022 my @ka = keys %$a;
1023 my @kb = keys %$b;
1024
1025 return 0 if @ka != @kb;
1026
1027 for (0 .. $#ka) {
1028 return 0 unless $ka[$_] eq $kb[$_];
1029 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1030 }
1031
1032 } elsif ("ARRAY" eq ref $a) {
1033
1034 return 0 if @$a != @$b;
1035
1036 for (0 .. $#$a) {
1037 return 0 unless _object_equal $a->[$_], $b->[$_];
1038 }
1039
1040 } elsif ($a ne $b) {
1041 return 0;
1042 }
1043
1044 1
1045}
1046
1047our $SLOW_MERGES;#d#
954sub _can_merge { 1048sub _can_merge {
955 my ($ob1, $ob2) = @_; 1049 my ($ob1, $ob2) = @_;
956 1050
957 local $Storable::canonical = 1; 1051 ++$SLOW_MERGES;#d#
958 my $fob1 = Storable::freeze $ob1;
959 my $fob2 = Storable::freeze $ob2;
960 1052
961 $fob1 eq $fob2 1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
962} 1055}
963 1056
964sub reattach { 1057sub reattach {
965 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
966 my ($obj) = @_; 1059 my ($obj) = @_;
988cf::attachable->attach ( 1081cf::attachable->attach (
989 prio => -1000000, 1082 prio => -1000000,
990 on_instantiate => sub { 1083 on_instantiate => sub {
991 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
992 1085
993 $data = from_json $data; 1086 $data = decode_json $data;
994 1087
995 for (@$data) { 1088 for (@$data) {
996 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
997 1090
998 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
1011 }, 1104 },
1012); 1105);
1013 1106
1014sub object_freezer_save { 1107sub object_freezer_save {
1015 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
1016
1017 my $guard = cf::lock_acquire "io";
1018 1109
1019 sync_job { 1110 sync_job {
1020 if (length $$rdata) { 1111 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename); 1112 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
1029 close $fh; 1120 close $fh;
1030 1121
1031 if (@$objs) { 1122 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1128 close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1130 }
1048 } else { 1139 } else {
1049 aio_unlink $filename; 1140 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
1051 } 1142 }
1052 }; 1143 };
1053
1054 undef $guard;
1055} 1144}
1056 1145
1057sub object_freezer_as_string { 1146sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
1059 1148
1064 1153
1065sub object_thawer_load { 1154sub object_thawer_load {
1066 my ($filename) = @_; 1155 my ($filename) = @_;
1067 1156
1068 my ($data, $av); 1157 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1158
1072 (aio_load $filename, $data) >= 0 1159 (aio_load $filename, $data) >= 0
1073 or return; 1160 or return;
1074 1161
1075 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1164 or return;
1078 1165
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1081 } 1168 }
1082 1169
1083 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1084 warn sprintf "loading %s (%d,%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1085 $decname, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1241 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1242 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1243 1330
1244 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1245 warn $msg; 1332 warn $msg;
1246 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1247 exit 1;
1248 } 1334 }
1249 1335
1250 warn $msg; 1336 warn $msg;
1251 } 1337 }
1252 1338
1339 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1340 1426
1341 my $f = new_from_file cf::object::thawer path $login 1427 my $f = new_from_file cf::object::thawer path $login
1342 or return; 1428 or return;
1343 1429
1344 $f->next;
1345 my $pl = cf::player::load_pl $f 1430 my $pl = cf::player::load_pl $f
1346 or return; 1431 or return;
1347 local $cf::PLAYER_LOADING{$login} = $pl; 1432 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs; 1433 $f->resolve_delayed_derefs;
1349 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1501 1586
1502Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1503 1588
1504=cut 1589=cut
1505 1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1506sub expand_cfpod { 1602sub expand_cfpod {
1507 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1508 1604
1509 # escape & and < 1605 my $xml;
1510 s/&/&amp;/g;
1511 s/(?<![BIUGHT])</&lt;/g;
1512 1606
1513 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1514 1610
1515 1 while 1611 $group =~ s/&/&amp;/g;
1516 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1517 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1518 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1519 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1616 ([BCGHITU])
1521 # replace G<male|female> tags 1617 <
1522 || s{G<([^>|]*)\|([^>]*)>}{ 1618 (?:
1523 $self->gender ? $2 : $1 1619 ([^<>]*) (?{ $group = $^N })
1524 }ge 1620 | < $interior >
1525 # replace H<hint text> 1621 )
1526 || s{H<([^\>]*)>} 1622 >
1623 %gcsx
1527 { 1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1528 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1529 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1530 "") 1644 "")
1531 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1532 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1533 1656
1657 for ($xml) {
1534 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1535 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1536 1660
1537 # compress some whitespace 1661 # compress some whitespace
1538 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1539 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1540 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1541 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1542 1667
1543 $_ 1668 $xml
1544} 1669}
1670
1671no re 'eval';
1545 1672
1546sub hintmode { 1673sub hintmode {
1547 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1548 $_[0]{hintmode} 1675 $_[0]{hintmode}
1549} 1676}
2030 } 2157 }
2031 2158
2032 $MAP_PREFETCH{$path} |= $load; 2159 $MAP_PREFETCH{$path} |= $load;
2033 2160
2034 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
2035 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
2036 while (my ($k, $v) = each %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
2037 if (my $map = find $k) { 2166 if (my $map = find $k) {
2038 $map->load if $v; 2167 $map->load if $v;
2039 } 2168 }
2065 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2066 2195
2067 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
2068 2197
2069 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
2070 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
2071 }; 2201 };
2072 2202
2073 if ($uniq) { 2203 if ($uniq) {
2074 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2261=cut 2391=cut
2262 2392
2263sub deref { 2393sub deref {
2264 my ($ref) = @_; 2394 my ($ref) = @_;
2265 2395
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2396 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2); 2397 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2398 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return; 2399 or return;
2273 $pl->ob->uuid eq $uuid 2400 $pl->ob->uuid eq $uuid
2274 or return; 2401 or return;
2445 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2446 2573
2447 $self->enter_link; 2574 $self->enter_link;
2448 2575
2449 (async { 2576 (async {
2577 $Coro::current->{desc} = "player::goto $path $x $y";
2578
2579 # *tag paths override both path and x|y
2580 if ($path =~ /^\*(.*)$/) {
2581 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2582 my $ob = $obs[rand @obs];
2583
2584 # see if we actually can go there
2585 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2586 $ob = $obs[rand @obs];
2587 } else {
2588 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 }
2590 # else put us there anyways for now #d#
2591
2592 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2593 } else {
2594 ($path, $x, $y) = (undef, undef, undef);
2595 }
2596 }
2597
2450 my $map = eval { 2598 my $map = eval {
2451 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2452 2600
2453 if ($map) { 2601 if ($map) {
2454 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2455 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2456 } else { 2604 } else {
2457 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2458 } 2606 }
2459 2607
2460 $map 2608 $map
2461 }; 2609 };
2462 2610
2515 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2516 } 2664 }
2517 2665
2518 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2519 2667
2520 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2521 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2522 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2523 2671
2524 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2525 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2552 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2553 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2554 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2555 2703
2556 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2557 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2558 unless (eval { 2708 unless (eval {
2559 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2560 2710
2561 1; 2711 1;
2596the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2597the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2598 2748
2599=cut 2749=cut
2600 2750
2751# non-persistent channels (usually the info channel)
2601our %CHANNEL = ( 2752our %CHANNEL = (
2602 "c/identify" => { 2753 "c/identify" => {
2603 id => "identify", 2754 id => "infobox",
2604 title => "Identify", 2755 title => "Identify",
2605 reply => undef, 2756 reply => undef,
2606 tooltip => "Items recently identified", 2757 tooltip => "Items recently identified",
2607 }, 2758 },
2608 "c/examine" => { 2759 "c/examine" => {
2609 id => "examine", 2760 id => "infobox",
2610 title => "Examine", 2761 title => "Examine",
2611 reply => undef, 2762 reply => undef,
2612 tooltip => "Signs and other items you examined", 2763 tooltip => "Signs and other items you examined",
2613 }, 2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2614); 2801);
2615 2802
2616sub cf::client::send_msg { 2803sub cf::client::send_msg {
2617 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2618 2805
2619 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2620 2807
2621 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622 2809
2623 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2625 2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2626 if (ref $channel) { 2819 } elsif (ref $channel) {
2627 # send meta info to client, if not yet sent 2820 # send meta info to client, if not yet sent
2628 unless (exists $self->{channel}{$channel->{id}}) { 2821 unless (exists $self->{channel}{$channel->{id}}) {
2629 $self->{channel}{$channel->{id}} = $channel; 2822 $self->{channel}{$channel->{id}} = $channel;
2630 $self->ext_msg (channel_info => $channel) 2823 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg; 2824 if $self->can_msg;
2848=pod 3041=pod
2849 3042
2850The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2851 3044
2852 cf::object 3045 cf::object
2853 contr pay_amount pay_player map x y force_find force_add 3046 contr pay_amount pay_player map x y force_find force_add destroy
2854 insert remove name archname title slaying race decrease_ob_nr 3047 insert remove name archname title slaying race decrease_ob_nr
2855 3048
2856 cf::object::player 3049 cf::object::player
2857 player 3050 player
2858 3051
2865=cut 3058=cut
2866 3059
2867for ( 3060for (
2868 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2869 insert remove inv name archname title slaying race 3062 insert remove inv name archname title slaying race
2870 decrease_ob_nr)], 3063 decrease_ob_nr destroy)],
2871 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2872 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2873 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2874) { 3067) {
2875 no strict 'refs'; 3068 no strict 'refs';
2980 { 3173 {
2981 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2982 3175
2983 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2984 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2985 cf::face::set_visibility $idx, $info->{visibility}; 3179 cf::face::set_visibility $idx, $info->{visibility};
2986 cf::face::set_magicmap $idx, $info->{magicmap}; 3180 cf::face::set_magicmap $idx, $info->{magicmap};
2987 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2988 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2989 3183
2990 cf::cede_to_tick; 3184 cf::cede_to_tick;
2991 } 3185 }
2992 3186
2993 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2994 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2995 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2996 or next; 3191 or next;
3192
2997 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
2998 cf::face::set_smooth $idx, $smooth; 3194 cf::face::set_smooth $idx, $smooth;
2999 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3000 } else { 3196 } else {
3001 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
3019 { 3215 {
3020 # TODO: for gcfclient pleasure, we should give resources 3216 # TODO: for gcfclient pleasure, we should give resources
3021 # that gcfclient doesn't grok a >10000 face index. 3217 # that gcfclient doesn't grok a >10000 face index.
3022 my $res = $facedata->{resource}; 3218 my $res = $facedata->{resource};
3023 3219
3024 my $soundconf = delete $res->{"res/sound.conf"};
3025
3026 while (my ($name, $info) = each %$res) { 3220 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) {
3027 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3028 my $data; 3223 my $data;
3029 3224
3030 if ($info->{type} & 1) { 3225 if ($info->{type} & 1) {
3031 # prepend meta info 3226 # prepend meta info
3032 3227
3033 my $meta = $enc->encode ({ 3228 my $meta = $enc->encode ({
3034 name => $name, 3229 name => $name,
3035 %{ $info->{meta} || {} }, 3230 %{ $info->{meta} || {} },
3036 }); 3231 });
3037 3232
3038 $data = pack "(w/a*)*", $meta, $info->{data}; 3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type};
3039 } else { 3240 } else {
3040 $data = $info->{data}; 3241 $RESOURCE{$name} = $info;
3041 } 3242 }
3042 3243
3043 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3044 cf::face::set_type $idx, $info->{type};
3045
3046 cf::cede_to_tick; 3244 cf::cede_to_tick;
3047 } 3245 }
3048
3049 if ($soundconf) {
3050 $soundconf = $enc->decode (delete $soundconf->{data});
3051
3052 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3053 my $sound = $soundconf->{compat}[$_]
3054 or next;
3055
3056 my $face = cf::face::find "sound/$sound->[1]";
3057 cf::sound::set $sound->[0] => $face;
3058 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3059 }
3060
3061 while (my ($k, $v) = each %{$soundconf->{event}}) {
3062 my $face = cf::face::find "sound/$v";
3063 cf::sound::set $k => $face;
3064 }
3065 }
3066 } 3246 }
3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3067 3249
3068 1 3250 1
3069} 3251}
3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3070 3272
3071register_exticmd fx_want => sub { 3273register_exticmd fx_want => sub {
3072 my ($ns, $want) = @_; 3274 my ($ns, $want) = @_;
3073 3275
3074 while (my ($k, $v) = each %$want) { 3276 while (my ($k, $v) = each %$want) {
3129sub reload_config { 3331sub reload_config {
3130 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
3131 or return; 3333 or return;
3132 3334
3133 local $/; 3335 local $/;
3134 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
3135 3337
3136 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3137 3339
3138 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3139 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3150sub main { 3352sub main {
3151 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
3152 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
3153 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3154 (async { 3356 (async {
3155 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
3156 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
3157 }; 3360 };
3158 3361
3159 reload_config; 3362 reload_config;
3160 db_init; 3363 db_init;
3161 load_extensions; 3364 load_extensions;
3162 3365
3163 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno;
3164 Event::loop; 3368 EV::loop;
3165} 3369}
3166 3370
3167############################################################################# 3371#############################################################################
3168# initialisation and cleanup 3372# initialisation and cleanup
3169 3373
3170# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
3171BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
3172 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
3173 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3174 reentrant => 0,
3175 data => WF_AUTOCANCEL,
3176 signal => $signal,
3177 prio => 0,
3178 cb => sub {
3179 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
3180 },
3181 ); 3380 };
3182 } 3381 }
3183} 3382}
3184 3383
3185sub write_runtime { 3384sub write_runtime {
3186 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
3231 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
3232 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
3233 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
3234 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
3235 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3236 $pl->save; 3436 $pl->save;
3237 } 3437 }
3238 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
3239 3439
3240 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
3279 warn "syncing database to disk"; 3479 warn "syncing database to disk";
3280 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
3281 3481
3282 # if anything goes wrong in here, we should simply crash as we already saved 3482 # if anything goes wrong in here, we should simply crash as we already saved
3283 3483
3284 warn "cancelling all WF_AUTOCANCEL watchers";
3285 for (Event::all_watchers) {
3286 $_->cancel if $_->data & WF_AUTOCANCEL;
3287 }
3288
3289 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
3290 for (;;) { 3485 for (;;) {
3291 BDB::flush; 3486 BDB::flush;
3292 IO::AIO::flush; 3487 IO::AIO::flush;
3293 Coro::cede; 3488 Coro::cede_notself;
3294 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
3295 warn "iterate..."; 3490 warn "iterate...";
3296 } 3491 }
3297 3492
3298 ++$RELOAD; 3493 ++$RELOAD;
3374 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3375 3570
3376 1 3571 1
3377 } or do { 3572 } or do {
3378 warn $@; 3573 warn $@;
3379 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3380 exit 1;
3381 }; 3575 };
3382 3576
3383 warn "reloaded"; 3577 warn "reloaded";
3384}; 3578};
3385 3579
3387 3581
3388sub reload_perl() { 3582sub reload_perl() {
3389 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3390 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3391 3585
3392 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3393 reentrant => 0,
3394 after => 0,
3395 data => WF_AUTOCANCEL,
3396 cb => sub {
3397 do_reload_perl; 3587 do_reload_perl;
3398 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3399 },
3400 ); 3589 };
3401} 3590}
3402 3591
3403register_command "reload" => sub { 3592register_command "reload" => sub {
3404 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3405 3594
3406 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3407 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3408 async { reload_perl }; 3599 reload_perl;
3600 };
3409 } 3601 }
3410}; 3602};
3411 3603
3412unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3413 3605
3415 3607
3416our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3417our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3418 3610
3419sub wait_for_tick { 3611sub wait_for_tick {
3420 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3421 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3422 3614
3423 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3424 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3425 $signal->wait; 3617 $signal->wait;
3426} 3618}
3427 3619
3428sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3429 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3430 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3431 3623
3432 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3433 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3434 $signal->wait; 3626 $signal->wait;
3435} 3627}
3436 3628
3437 my $min = 1e6;#d# 3629sub tick {
3438 my $avg = 10;
3439$TICK_WATCHER = Event->timer (
3440 reentrant => 0,
3441 parked => 1,
3442 prio => 0,
3443 at => $NEXT_TICK || $TICK,
3444 data => WF_AUTOCANCEL,
3445 cb => sub {
3446 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3447 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3448 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3449 return; 3633 return;
3450 } 3634 }
3451 3635
3452 $NOW = $tick_start = Event::time;
3453
3454 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3455 3637
3456 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3457 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3458 my $t = Event::time; 3640 Coro::async_pool {
3459 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3460 or die; 3642 write_runtime
3461 3643 or warn "ERROR: unable to write runtime file: $!";
3462 $map->width (50);
3463 $map->height (50);
3464 $map->alloc;
3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3466 my $t = Event::time - $t;
3467
3468 #next unless $t < 0.0013;#d#
3469 if ($t < $min) {
3470 $min = $t;
3471 }
3472 $avg = $avg * 0.99 + $t * 0.01;
3473 }
3474 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3475 exit 0;
3476 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3477 }; 3644 };
3645 }
3478 3646
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool {
3485 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 }
3489
3490# my $AFTER = Event::time;
3491# warn $AFTER - $NOW;#d#
3492
3493 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3494 $sig->send; 3648 $sig->send;
3495 } 3649 }
3496 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3497 $sig->send; 3651 $sig->send;
3498 } 3652 }
3499 3653
3500 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3501
3502 # if we are delayed by four ticks or more, skip them all
3503 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3504
3505 $TICK_WATCHER->at ($NEXT_TICK);
3506 $TICK_WATCHER->start;
3507
3508 $LOAD = ($NOW - $tick_start) / $TICK;
3509 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3510 3656
3511 _post_tick; 3657 if (0) {
3512 3658 if ($NEXT_TICK) {
3513 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3514 }, 3663 }
3515); 3664}
3516 3665
3517{ 3666{
3518 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3519 $BDB_POLL_WATCHER = Event->io ( 3668
3520 reentrant => 0,
3521 fd => BDB::poll_fileno,
3522 poll => 'r',
3523 prio => 0,
3524 data => WF_AUTOCANCEL,
3525 cb => \&BDB::poll_cb,
3526 );
3527 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3528 3670 BDB::max_poll_reqs $TICK * 0.1;
3529 BDB::set_sync_prepare { 3671 $Coro::BDB::WATCHER->priority (1);
3530 my $status;
3531 my $current = $Coro::current;
3532 (
3533 sub {
3534 $status = $!;
3535 $current->ready; undef $current;
3536 },
3537 sub {
3538 Coro::schedule while defined $current;
3539 $! = $status;
3540 },
3541 )
3542 };
3543 3672
3544 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3545 $DB_ENV = BDB::db_env_create; 3674 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3676 | BDB::LOG_AUTOREMOVE, 1);
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3546 3679
3547 cf::sync_job { 3680 cf::sync_job {
3548 eval { 3681 eval {
3549 BDB::db_env_open 3682 BDB::db_env_open
3550 $DB_ENV, 3683 $DB_ENV,
3552 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3685 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3553 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3554 0666; 3687 0666;
3555 3688
3556 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3557
3558 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3559 $DB_ENV->set_lk_detect;
3560 }; 3690 };
3561 3691
3562 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3563 }; 3693 };
3564 } 3694 }
3695
3696 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3697 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3698 };
3699 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3701 };
3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3704 };
3565} 3705}
3566 3706
3567{ 3707{
3708 # configure IO::AIO
3709
3568 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3569
3570 undef $Coro::AIO::WATCHER;
3571 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3572 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3573 reentrant => 0,
3574 data => WF_AUTOCANCEL,
3575 fd => IO::AIO::poll_fileno,
3576 poll => 'r',
3577 prio => 6,
3578 cb => \&IO::AIO::poll_cb,
3579 );
3580} 3713}
3581 3714
3582my $_log_backtrace; 3715my $_log_backtrace;
3583 3716
3584sub _log_backtrace { 3717sub _log_backtrace {
3588 3721
3589 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3590 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3591 ++$_log_backtrace; 3724 ++$_log_backtrace;
3592 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3593 my @bt = fork_call { 3728 my @bt = fork_call {
3594 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3595 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3596 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3731 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3597 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines