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.390 by root, Thu Oct 25 09:01:24 2007 UTC vs.
Revision 1.442 by root, Sun Aug 31 09:03:31 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Event; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.1 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.51 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 69
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 107our $DB_ENV;
89 108
90our %CFG; 109our %CFG;
91 110
92our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 112our $RUNTIME;
113our $NOW;
94 114
95our (%PLAYER, %PLAYER_LOADING); # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 116our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
98 118
99# 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 ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 121
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
105 126
106binmode STDOUT; 127binmode STDOUT;
107binmode STDERR; 128binmode STDERR;
108 129
109# read virtual server time, if available 130# read virtual server time, if available
162 183
163The raw value load value from the last tick. 184The raw value load value from the last tick.
164 185
165=item %cf::CFG 186=item %cf::CFG
166 187
167Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 189from wherever your confdir points to.
169 190
170=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
171 192
172These 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
193 $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;
194 215
195 LOG llevError, $msg; 216 LOG llevError, $msg;
196 }; 217 };
197} 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#?
198 234
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 245for my $pkg (qw(
210 cf::global cf::attachable 246 cf::global cf::attachable
211 cf::object cf::object::player 247 cf::object cf::object::player
212 cf::client cf::player 248 cf::client cf::player
213 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
214 cf::map cf::party cf::region 251 cf::party cf::region
215)) { 252)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 254}
219 255
220$Event::DIED = sub { 256$EV::DIED = sub {
221 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
222}; 258};
223 259
224############################################################################# 260#############################################################################
225 261
248 $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;
249 $d 285 $d
250 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
251} 287}
252 288
253=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
254 290
255Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
256 292
257=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
258 294
259Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
260 296
261=cut 297=cut
262 298
263our $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
264 300
265sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
267 303
268=item cf::lock_wait $string 304=item cf::lock_wait $string
269 305
270Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
271 307
327 363
328 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
329} 365}
330 366
331sub freeze_mainloop { 367sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
333 369
334 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 371}
336 }; 372
337 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
338 $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
339} 386}
340 387
341=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
342 389
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 430 }
384 } 431 }
385}; 432};
386 433
387sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
388 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
389 438
390 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
392 441
406 455
407BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
408 457
409=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
410 459
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
413partly 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
414acceptable. 463acceptable.
415 464
416If 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
417the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
422 471
423sub sync_job(&) { 472sub sync_job(&) {
424 my ($job) = @_; 473 my ($job) = @_;
425 474
426 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 476 my $time = EV::time;
428 477
429 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
431 480
432 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
433 482
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
437 484
438 my $busy = 1; 485 my $busy = 1;
439 my @res; 486 my @res;
440 487
447 494
448 while ($busy) { 495 while ($busy) {
449 if (Coro::nready) { 496 if (Coro::nready) {
450 Coro::cede_notself; 497 Coro::cede_notself;
451 } else { 498 } else {
452 Event::one_event; 499 EV::loop EV::LOOP_ONESHOT;
453 } 500 }
454 } 501 }
455 502
456 $time = Event::time - $time; 503 my $time = EV::time - $time;
457 504
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
462 506
463 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
464 } else { 508 } else {
465 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
466 510
491=item fork_call { }, $args 535=item fork_call { }, $args
492 536
493Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
497 541
498=cut 542=cut
499 543
500sub fork_call(&@) { 544sub fork_call(&@) {
501 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
508 reset_signals; 552 reset_signals;
509 &$cb 553 &$cb
510 }, @args; 554 }, @args;
511 555
512 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
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
513} 584}
514 585
515=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
516 587
517Returns a single value from the environment database. 588Returns a single value from the environment database.
662attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
664 735
665In 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>
666C<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
667Crossfire TRT). 738Deliantra).
668 739
669=over 4 740=over 4
670 741
671=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
672 743
954 } 1025 }
955 1026
956 0 1027 0
957} 1028}
958 1029
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1031
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1033
963Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
964 1035
1017 1088
1018sub reattach { 1089sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1091 my ($obj) = @_;
1021 1092
1093 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1095
1024 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1025 1097
1026 @$registry = (); 1098 @$registry = ();
1027 1099
1042cf::attachable->attach ( 1114cf::attachable->attach (
1043 prio => -1000000, 1115 prio => -1000000,
1044 on_instantiate => sub { 1116 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1046 1118
1047 $data = from_json $data; 1119 $data = decode_json $data;
1048 1120
1049 for (@$data) { 1121 for (@$data) {
1050 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1051 1123
1052 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1076 1148
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1081 close $fh; 1153 aio_close $fh;
1082 1154
1083 if (@$objs) { 1155 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1161 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1163 }
1092 } else { 1164 } else {
1093 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1094 } 1166 }
1263 1335
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1338
1267 $ext{source} = 1339 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1270 . $source 1342 . $source
1271 . "\n};\n1"; 1343 . "\n};\n1";
1272 1344
1273 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1289 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1291 1363
1292 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1365 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1367 }
1297 1368
1298 warn $msg; 1369 warn $msg;
1299 } 1370 }
1300 1371
1389 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1461 or return;
1391 1462
1392 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1393 or return; 1464 or return;
1465
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1397 } 1469 }
1398 } 1470 }
1408 1480
1409 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1410 1482
1411 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1413 1487
1414 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1489 cf::cede_to_tick;
1416} 1490}
1417 1491
1453 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1455 1529
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1460 1536
1461 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1577
1502 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1503 my $path = path $login; 1579 my $path = path $login;
1504 1580
1505 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1587 }
1511 1588
1549Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1550 1627
1551=cut 1628=cut
1552 1629
1553sub expand_cfpod { 1630sub expand_cfpod {
1554 ((my $self), (local $_)) = @_; 1631 my ($self, $pod) = @_;
1555 1632
1556 # escape & and < 1633 my @nest = [qr<\G$>, undef, ""];
1557 s/&/&amp;/g; 1634 my $xml;
1558 s/(?<![BIUGHT])</&lt;/g;
1559 1635
1560 # this is buggy, it needs to properly take care of nested <'s 1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1561 1648
1562 1 while 1649 my $cb;
1563 # replace B<>, I<>, U<> etc. 1650
1564 s/B<([^\>]*)>/<b>$1<\/b>/ 1651 if ($code eq "B") {
1565 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $cb = sub { "<b>$_[0]</b>" };
1566 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($code eq "C") {
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1654 $cb = sub { "<tt>$_[0]</tt>" };
1568 # replace G<male|female> tags 1655 } elsif ($code eq "E") {
1569 || s{G<([^>|]*)\|([^>]*)>}{ 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1570 $self->gender ? $2 : $1 1657 } elsif ($code eq "G") {
1571 }ge 1658 $cb = sub {
1572 # replace H<hint text> 1659 my ($male, $female) = split /\|/, $_[0];
1573 || s{H<([^\>]*)>} 1660 $self->gender ? $female : $male
1574 { 1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "") 1667 "",
1578 [$self->{hintmode}] 1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1579 }ge; 1707 }
1708 }
1709 }
1580 1710
1581 # create single paragraphs (very hackish) 1711 $xml
1582 s/(?<=\S)\n(?=\w)/ /g;
1583
1584 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1589
1590 $_
1591} 1712}
1592 1713
1593sub hintmode { 1714sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode} 1716 $_[0]{hintmode}
1668our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1670 1791
1671sub generate_random_map { 1792sub generate_random_map {
1672 my ($self, $rmp) = @_; 1793 my ($self, $rmp) = @_;
1794
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796
1673 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1674 $self->_create_random_map ( 1798 $self->_create_random_map (
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1799 1923
1800# the temporary/swap location 1924# the temporary/swap location
1801sub save_path { 1925sub save_path {
1802 my ($self) = @_; 1926 my ($self) = @_;
1803 1927
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1806} 1930}
1807 1931
1808# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1809sub uniq_path { 1933sub uniq_path {
1810 my ($self) = @_; 1934 my ($self) = @_;
1811 1935
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1814} 1938}
1815 1939
1816# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1817# all maps in C++... 1941# all maps in C++...
1915 2039
1916 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1918 2042
1919 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
1922 2046
1923 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1924 or return; 2048 or return;
1925 2049
1926 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
1929 or return; 2053 or return;
1930 2054
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
1934 undef $guard1; 2059 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 2060 $map->reset;
1937 return find $path; 2061 return find $path;
1938 } 2062 }
1939 2063
1940 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
1967 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block; 2092 $f->skip_block;
1969 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
1970 or return; 2094 or return;
1971 2095
1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
1973 if delete $self->{load_original}; 2097 if delete $self->{load_original};
1974 2098
1975 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
1976 utf8::encode $uniq; 2100 utf8::encode $uniq;
1977 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
2003 } 2127 }
2004 2128
2005 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
2007 2131
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2133 }
2010 2134
2011 $self->post_load; 2135 $self->post_load;
2012} 2136}
2013 2137
2071 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2072 2196
2073 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2074 2198
2075 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2201 }
2078 2202
2079 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2080 2204
2081 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2118 cf::async { 2242 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2243 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2121 }; 2245 };
2122 2246
2247 cf::get_slot 0.02;
2248
2123 if ($uniq) { 2249 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2252 } else {
2127 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2135 $self->save; 2261 $self->save;
2136 2262
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2264
2139 return if $self->players; 2265 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2141 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2142 2268
2143 $self->in_memory (cf::MAP_SWAPPED); 2269 $self->in_memory (cf::MAP_SWAPPED);
2144 2270
2145 $self->deactivate; 2271 $self->deactivate;
2263 2389
2264sub unique_maps() { 2390sub unique_maps() {
2265 [ 2391 [
2266 map { 2392 map {
2267 utf8::decode $_; 2393 utf8::decode $_;
2268 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2269 ? normalise $_ 2397 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2399 ]
2273} 2400}
2274 2401
2275package cf;
2276
2277=back 2402=back
2278 2403
2279=head3 cf::object 2404=head3 cf::object
2280 2405
2281=cut 2406=cut
2284 2409
2285=over 4 2410=over 4
2286 2411
2287=item $ob->inv_recursive 2412=item $ob->inv_recursive
2288 2413
2289Returns the inventory of the object _and_ their inventories, recursively. 2414Returns the inventory of the object I<and> their inventories, recursively,
2415but I<not> the object itself.
2290 2416
2291=cut 2417=cut
2292 2418
2293sub inv_recursive_; 2419sub inv_recursive_;
2294sub inv_recursive_ { 2420sub inv_recursive_ {
2299 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2300} 2426}
2301 2427
2302=item $ref = $ob->ref 2428=item $ref = $ob->ref
2303 2429
2304creates and returns a persistent reference to an objetc that can be stored as a string. 2430Creates and returns a persistent reference to an object that can be stored as a string.
2305 2431
2306=item $ob = cf::object::deref ($refstring) 2432=item $ob = cf::object::deref ($refstring)
2307 2433
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2434returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block. 2435even if the object actually exists. May block.
2341can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2342dialogue with the given NPC character. 2468dialogue with the given NPC character.
2343 2469
2344=cut 2470=cut
2345 2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2485
2346# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2487# with dialog boxes.
2348#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2349sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
2361 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363 2503
2364 } else { 2504 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2507 }
2368 } 2508 }
2369} 2509}
2370 2510
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
2478Moves the player to the given map-path and coordinates by first freezing 2618Moves the player to the given map-path and coordinates by first freezing
2479her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2480that has to return the map if sucecssful, and then unfreezes the player on 2620that has to return the map if sucecssful, and then unfreezes the player on
2481the new (success) or old (failed) map position. In either case, $done will 2621the new (success) or old (failed) map position. In either case, $done will
2482be called at the end of this process. 2622be called at the end of this process.
2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2483 2626
2484=cut 2627=cut
2485 2628
2486our $GOTOGEN; 2629our $GOTOGEN;
2487 2630
2566} 2709}
2567 2710
2568sub prepare_random_map { 2711sub prepare_random_map {
2569 my ($exit) = @_; 2712 my ($exit) = @_;
2570 2713
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2716 # that depends on the exit object
2576 2717
2577 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
2579 if ($exit->map) { 2720 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2584 } 2727 }
2585 2728
2586 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2587 2730
2588 my $data = cf::to_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2591 2734
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2737 undef $fh;
2595 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2596 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2599 } 2746 }
2600} 2747}
2601 2748
2602sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2604 2751
2605 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2606 2753
2607 if ($exit->slaying eq "/!") {
2608 #TODO: this should de-fi-ni-te-ly not be a sync-job
2609 # the problem is that $exit might not survive long enough
2610 # so it needs to be done right now, right here
2611 cf::sync_job { prepare_random_map $exit };
2612 }
2613
2614 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615 my $hp = $exit->stats->hp;
2616 my $sp = $exit->stats->sp;
2617
2618 $self->enter_link; 2754 $self->enter_link;
2619 2755
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2624 (async { 2756 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2757 $Coro::current->{desc} = "enter_exit";
2626 2758
2627 $self->deactivate_recursive; # just to be sure
2628 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2629 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2630 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2631 1; 2780 1
2632 }) { 2781 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2634 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2635 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2815the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2816the message unless the client supports the msg packet.
2668 2817
2669=cut 2818=cut
2670 2819
2820# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2821our %CHANNEL = (
2672 "c/identify" => { 2822 "c/identify" => {
2673 id => "infobox", 2823 id => "infobox",
2674 title => "Identify", 2824 title => "Identify",
2675 reply => undef, 2825 reply => undef,
2707 }, 2857 },
2708 "c/uptime" => { 2858 "c/uptime" => {
2709 id => "infobox", 2859 id => "infobox",
2710 title => "Uptime", 2860 title => "Uptime",
2711 reply => undef, 2861 reply => undef,
2712 tooltip => "How long the server has been running sicne last restart", 2862 tooltip => "How long the server has been running since last restart",
2713 }, 2863 },
2714 "c/mapinfo" => { 2864 "c/mapinfo" => {
2715 id => "infobox", 2865 id => "infobox",
2716 title => "Map Info", 2866 title => "Map Info",
2717 reply => undef, 2867 reply => undef,
2718 tooltip => "Information related to the maps", 2868 tooltip => "Information related to the maps",
2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2719 }, 2875 },
2720); 2876);
2721 2877
2722sub cf::client::send_msg { 2878sub cf::client::send_msg {
2723 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2961 3117
2962The following functions and methods are available within a safe environment: 3118The following functions and methods are available within a safe environment:
2963 3119
2964 cf::object 3120 cf::object
2965 contr pay_amount pay_player map x y force_find force_add destroy 3121 contr pay_amount pay_player map x y force_find force_add destroy
2966 insert remove name archname title slaying race decrease_ob_nr 3122 insert remove name archname title slaying race decrease split
2967 3123
2968 cf::object::player 3124 cf::object::player
2969 player 3125 player
2970 3126
2971 cf::player 3127 cf::player
2976 3132
2977=cut 3133=cut
2978 3134
2979for ( 3135for (
2980 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3136 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2981 insert remove inv name archname title slaying race 3137 insert remove inv nrof name archname title slaying race
2982 decrease_ob_nr destroy)], 3138 decrease split destroy change_exp)],
2983 ["cf::object::player" => qw(player)], 3139 ["cf::object::player" => qw(player)],
2984 ["cf::player" => qw(peaceful)], 3140 ["cf::player" => qw(peaceful)],
2985 ["cf::map" => qw(trigger)], 3141 ["cf::map" => qw(trigger)],
2986) { 3142) {
2987 no strict 'refs'; 3143 no strict 'refs';
3092 { 3248 {
3093 my $faces = $facedata->{faceinfo}; 3249 my $faces = $facedata->{faceinfo};
3094 3250
3095 while (my ($face, $info) = each %$faces) { 3251 while (my ($face, $info) = each %$faces) {
3096 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3252 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253
3097 cf::face::set_visibility $idx, $info->{visibility}; 3254 cf::face::set_visibility $idx, $info->{visibility};
3098 cf::face::set_magicmap $idx, $info->{magicmap}; 3255 cf::face::set_magicmap $idx, $info->{magicmap};
3099 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3256 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3100 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3257 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3101 3258
3102 cf::cede_to_tick; 3259 cf::cede_to_tick;
3103 } 3260 }
3104 3261
3105 while (my ($face, $info) = each %$faces) { 3262 while (my ($face, $info) = each %$faces) {
3106 next unless $info->{smooth}; 3263 next unless $info->{smooth};
3264
3107 my $idx = cf::face::find $face 3265 my $idx = cf::face::find $face
3108 or next; 3266 or next;
3267
3109 if (my $smooth = cf::face::find $info->{smooth}) { 3268 if (my $smooth = cf::face::find $info->{smooth}) {
3110 cf::face::set_smooth $idx, $smooth; 3269 cf::face::set_smooth $idx, $smooth;
3111 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3270 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3112 } else { 3271 } else {
3113 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3272 warn "smooth face '$info->{smooth}' not found for face '$face'";
3131 { 3290 {
3132 # TODO: for gcfclient pleasure, we should give resources 3291 # TODO: for gcfclient pleasure, we should give resources
3133 # that gcfclient doesn't grok a >10000 face index. 3292 # that gcfclient doesn't grok a >10000 face index.
3134 my $res = $facedata->{resource}; 3293 my $res = $facedata->{resource};
3135 3294
3136 my $soundconf = delete $res->{"res/sound.conf"};
3137
3138 while (my ($name, $info) = each %$res) { 3295 while (my ($name, $info) = each %$res) {
3296 if (defined $info->{type}) {
3139 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3297 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3140 my $data; 3298 my $data;
3141 3299
3142 if ($info->{type} & 1) { 3300 if ($info->{type} & 1) {
3143 # prepend meta info 3301 # prepend meta info
3144 3302
3145 my $meta = $enc->encode ({ 3303 my $meta = $enc->encode ({
3146 name => $name, 3304 name => $name,
3147 %{ $info->{meta} || {} }, 3305 %{ $info->{meta} || {} },
3148 }); 3306 });
3149 3307
3150 $data = pack "(w/a*)*", $meta, $info->{data}; 3308 $data = pack "(w/a*)*", $meta, $info->{data};
3309 } else {
3310 $data = $info->{data};
3311 }
3312
3313 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3314 cf::face::set_type $idx, $info->{type};
3151 } else { 3315 } else {
3152 $data = $info->{data}; 3316 $RESOURCE{$name} = $info;
3153 } 3317 }
3154 3318
3155 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3156 cf::face::set_type $idx, $info->{type};
3157
3158 cf::cede_to_tick; 3319 cf::cede_to_tick;
3159 } 3320 }
3160
3161 if ($soundconf) {
3162 $soundconf = $enc->decode (delete $soundconf->{data});
3163
3164 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3165 my $sound = $soundconf->{compat}[$_]
3166 or next;
3167
3168 my $face = cf::face::find "sound/$sound->[1]";
3169 cf::sound::set $sound->[0] => $face;
3170 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3171 }
3172
3173 while (my ($k, $v) = each %{$soundconf->{event}}) {
3174 my $face = cf::face::find "sound/$v";
3175 cf::sound::set $k => $face;
3176 }
3177 }
3178 } 3321 }
3322
3323 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3179 3324
3180 1 3325 1
3181} 3326}
3327
3328cf::global->attach (on_resource_update => sub {
3329 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3330 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3331
3332 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3333 my $sound = $soundconf->{compat}[$_]
3334 or next;
3335
3336 my $face = cf::face::find "sound/$sound->[1]";
3337 cf::sound::set $sound->[0] => $face;
3338 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3339 }
3340
3341 while (my ($k, $v) = each %{$soundconf->{event}}) {
3342 my $face = cf::face::find "sound/$v";
3343 cf::sound::set $k => $face;
3344 }
3345 }
3346});
3182 3347
3183register_exticmd fx_want => sub { 3348register_exticmd fx_want => sub {
3184 my ($ns, $want) = @_; 3349 my ($ns, $want) = @_;
3185 3350
3186 while (my ($k, $v) = each %$want) { 3351 while (my ($k, $v) = each %$want) {
3187 $ns->fx_want ($k, $v); 3352 $ns->fx_want ($k, $v);
3188 } 3353 }
3189}; 3354};
3355
3356sub load_resource_file($) {
3357 my $guard = lock_acquire "load_resource_file";
3358
3359 my $status = load_resource_file_ $_[0];
3360 get_slot 0.1, 100;
3361 cf::arch::commit_load;
3362
3363 $status
3364}
3190 3365
3191sub reload_regions { 3366sub reload_regions {
3192 # HACK to clear player env face cache, we need some signal framework 3367 # HACK to clear player env face cache, we need some signal framework
3193 # for this (global event?) 3368 # for this (global event?)
3194 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3208} 3383}
3209 3384
3210sub reload_archetypes { 3385sub reload_archetypes {
3211 load_resource_file "$DATADIR/archetypes" 3386 load_resource_file "$DATADIR/archetypes"
3212 or die "unable to load archetypes\n"; 3387 or die "unable to load archetypes\n";
3213 #d# NEED to laod twice to resolve forward references
3214 # this really needs to be done in an extra post-pass
3215 # (which needs to be synchronous, so solve it differently)
3216 load_resource_file "$DATADIR/archetypes"
3217 or die "unable to load archetypes\n";
3218} 3388}
3219 3389
3220sub reload_treasures { 3390sub reload_treasures {
3221 load_resource_file "$DATADIR/treasures" 3391 load_resource_file "$DATADIR/treasures"
3222 or die "unable to load treasurelists\n"; 3392 or die "unable to load treasurelists\n";
3223} 3393}
3224 3394
3225sub reload_resources { 3395sub reload_resources {
3226 warn "reloading resource files...\n"; 3396 warn "reloading resource files...\n";
3227 3397
3398 reload_facedata;
3399 reload_archetypes;
3228 reload_regions; 3400 reload_regions;
3229 reload_facedata;
3230 #reload_archetypes;#d#
3231 reload_archetypes;
3232 reload_treasures; 3401 reload_treasures;
3233 3402
3234 warn "finished reloading resource files\n"; 3403 warn "finished reloading resource files\n";
3235} 3404}
3236 3405
3237sub init { 3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3238 reload_resources; 3411 reload_resources;
3239} 3412}
3240 3413
3241sub reload_config { 3414sub reload_config {
3242 open my $fh, "<:utf8", "$CONFDIR/config" 3415 open my $fh, "<:utf8", "$CONFDIR/config"
3243 or return; 3416 or return;
3244 3417
3245 local $/; 3418 local $/;
3246 *CFG = YAML::Syck::Load <$fh>; 3419 *CFG = YAML::Load <$fh>;
3247 3420
3248 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3249 3422
3250 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3251 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3263 # we must not ever block the main coroutine 3436 # we must not ever block the main coroutine
3264 local $Coro::idle = sub { 3437 local $Coro::idle = sub {
3265 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3266 (async { 3439 (async {
3267 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3440 $Coro::current->{desc} = "IDLE BUG HANDLER";
3268 Event::one_event; 3441 EV::loop EV::LOOP_ONESHOT;
3269 })->prio (Coro::PRIO_MAX); 3442 })->prio (Coro::PRIO_MAX);
3270 }; 3443 };
3271 3444
3445 {
3446 my $guard = freeze_mainloop;
3272 reload_config; 3447 reload_config;
3273 db_init; 3448 db_init;
3274 load_extensions; 3449 load_extensions;
3275 3450
3276 $TICK_WATCHER->start; 3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3452 }
3453
3277 Event::loop; 3454 EV::loop;
3278} 3455}
3279 3456
3280############################################################################# 3457#############################################################################
3281# initialisation and cleanup 3458# initialisation and cleanup
3282 3459
3283# install some emergency cleanup handlers 3460# install some emergency cleanup handlers
3284BEGIN { 3461BEGIN {
3462 our %SIGWATCHER = ();
3285 for my $signal (qw(INT HUP TERM)) { 3463 for my $signal (qw(INT HUP TERM)) {
3286 Event->signal ( 3464 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3287 reentrant => 0,
3288 data => WF_AUTOCANCEL,
3289 signal => $signal,
3290 prio => 0,
3291 cb => sub {
3292 cf::cleanup "SIG$signal"; 3465 cf::cleanup "SIG$signal";
3293 },
3294 ); 3466 };
3295 } 3467 }
3296} 3468}
3297 3469
3298sub write_runtime { 3470sub write_runtime_sync {
3299 my $runtime = "$LOCALDIR/runtime"; 3471 my $runtime = "$LOCALDIR/runtime";
3300 3472
3301 # first touch the runtime file to show we are still running: 3473 # first touch the runtime file to show we are still running:
3302 # the fsync below can take a very very long time. 3474 # the fsync below can take a very very long time.
3303 3475
3329 and return; 3501 and return;
3330 3502
3331 warn "runtime file written.\n"; 3503 warn "runtime file written.\n";
3332 3504
3333 1 3505 1
3506}
3507
3508our $uuid_lock;
3509our $uuid_skip;
3510
3511sub write_uuid_sync($) {
3512 $uuid_skip ||= $_[0];
3513
3514 return if $uuid_lock;
3515 local $uuid_lock = 1;
3516
3517 my $uuid = "$LOCALDIR/uuid";
3518
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return;
3521
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3523 $uuid_skip = 0;
3524
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return;
3527
3528 # always fsync - this file is important
3529 aio_fsync $fh
3530 and return;
3531
3532 close $fh
3533 or return;
3534
3535 aio_rename "$uuid~", $uuid
3536 and return;
3537
3538 warn "uuid file written ($value).\n";
3539
3540 1
3541
3542}
3543
3544sub write_uuid($$) {
3545 my ($skip, $sync) = @_;
3546
3547 $sync ? write_uuid_sync $skip
3548 : async { write_uuid_sync $skip };
3334} 3549}
3335 3550
3336sub emergency_save() { 3551sub emergency_save() {
3337 my $freeze_guard = cf::freeze_mainloop; 3552 my $freeze_guard = cf::freeze_mainloop;
3338 3553
3360 warn "end emergency map save\n"; 3575 warn "end emergency map save\n";
3361 3576
3362 warn "begin emergency database checkpoint\n"; 3577 warn "begin emergency database checkpoint\n";
3363 BDB::db_env_txn_checkpoint $DB_ENV; 3578 BDB::db_env_txn_checkpoint $DB_ENV;
3364 warn "end emergency database checkpoint\n"; 3579 warn "end emergency database checkpoint\n";
3580
3581 warn "begin write uuid\n";
3582 write_uuid_sync 1;
3583 warn "end write uuid\n";
3365 }; 3584 };
3366 3585
3367 warn "leave emergency perl save\n"; 3586 warn "leave emergency perl save\n";
3368} 3587}
3369 3588
3371 my ($make_core) = @_; 3590 my ($make_core) = @_;
3372 3591
3373 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3374 if $make_core; 3593 if $make_core;
3375} 3594}
3595
3596# a safer delete_package, copied from Symbol
3597sub clear_package($) {
3598 my $pkg = shift;
3599
3600 # expand to full symbol table name if needed
3601 unless ($pkg =~ /^main::.*::$/) {
3602 $pkg = "main$pkg" if $pkg =~ /^::/;
3603 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3604 $pkg .= '::' unless $pkg =~ /::$/;
3605 }
3606
3607 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3608 my $stem_symtab = *{$stem}{HASH};
3609
3610 defined $stem_symtab and exists $stem_symtab->{$leaf}
3611 or return;
3612
3613 # clear all symbols
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 }
3619 warn "cleared package #$pkg\n";#d#
3620}
3621
3622our $RELOAD; # how many times to reload
3376 3623
3377sub do_reload_perl() { 3624sub do_reload_perl() {
3378 # can/must only be called in main 3625 # can/must only be called in main
3379 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3380 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3381 return; 3628 return;
3382 } 3629 }
3383 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3384 warn "reloading..."; 3634 warn "reloading...";
3385 3635
3386 warn "entering sync_job"; 3636 warn "entering sync_job";
3387 3637
3388 cf::sync_job { 3638 cf::sync_job {
3389 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3390 cf::emergency_save; 3640 cf::emergency_save;
3391 cf::write_runtime; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3392 3642
3393 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3394 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3395 3645
3396 # if anything goes wrong in here, we should simply crash as we already saved 3646 # if anything goes wrong in here, we should simply crash as we already saved
3397 3647
3398 warn "cancelling all WF_AUTOCANCEL watchers";
3399 for (Event::all_watchers) {
3400 $_->cancel if $_->data & WF_AUTOCANCEL;
3401 }
3402
3403 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
3404 for (;;) {
3405 BDB::flush;
3406 IO::AIO::flush;
3407 Coro::cede_notself;
3408 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3409 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3410 }
3411
3412 ++$RELOAD;
3413
3414 warn "cancelling all extension coros";
3415 $_->cancel for values %EXT_CORO;
3416 %EXT_CORO = ();
3417
3418 warn "removing commands";
3419 %COMMAND = ();
3420
3421 warn "removing ext/exti commands";
3422 %EXTCMD = ();
3423 %EXTICMD = ();
3424
3425 warn "unloading/nuking all extensions";
3426 for my $pkg (@EXTS) {
3427 warn "... unloading $pkg";
3428
3429 if (my $cb = $pkg->can ("unload")) {
3430 eval {
3431 $cb->($pkg);
3432 1
3433 } or warn "$pkg unloaded, but with errors: $@";
3434 } 3651 }
3435 3652
3436 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3437 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3438 } 3655 %EXT_CORO = ();
3439 3656
3440 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3441 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3442 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3443 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3444 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3445 delete $INC{$k};
3446 3667
3447 $k =~ s/\.pm$//;
3448 $k =~ s/\//::/g;
3449
3450 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3451 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3452 } 3677 }
3453 3678
3454 Symbol::delete_package $k; 3679 warn "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682
3683 warn "... unloading $k";
3684 delete $INC{$k};
3685
3686 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g;
3688
3689 if (my $cb = $k->can ("unload_module")) {
3690 $cb->();
3691 }
3692
3693 clear_package $k;
3455 } 3694 }
3456 3695
3457 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3458 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3459 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3460 3699
3461 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3462 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3463 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3464 3703
3465 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3466 # and global variables created in xs 3705 # and global variables created in xs
3467 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3468 3707
3469 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3470 3709
3471 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3472 require cf; 3711 require cf;
3473 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3474 3713
3475 warn "loading config and database again"; 3714 warn "loading config and database again";
3476 cf::reload_config; 3715 cf::reload_config;
3477 3716
3478 warn "loading extensions"; 3717 warn "loading extensions";
3479 cf::load_extensions; 3718 cf::load_extensions;
3480 3719
3481 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3482 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3483 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3484 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3485 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3486 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3487 3726
3488 warn "leaving sync_job"; 3727 warn "leaving sync_job";
3489 3728
3490 1 3729 1
3491 } or do { 3730 } or do {
3492 warn $@; 3731 warn $@;
3493 warn "error while reloading, exiting."; 3732 cf::cleanup "error while reloading, exiting.";
3494 exit 1;
3495 }; 3733 };
3496 3734
3497 warn "reloaded"; 3735 warn "reloaded";
3736 --$RELOAD;
3737 }
3498}; 3738};
3499 3739
3500our $RELOAD_WATCHER; # used only during reload 3740our $RELOAD_WATCHER; # used only during reload
3501 3741
3502sub reload_perl() { 3742sub reload_perl() {
3503 # doing reload synchronously and two reloads happen back-to-back, 3743 # doing reload synchronously and two reloads happen back-to-back,
3504 # coro crashes during coro_state_free->destroy here. 3744 # coro crashes during coro_state_free->destroy here.
3505 3745
3506 $RELOAD_WATCHER ||= Event->timer ( 3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3507 reentrant => 0,
3508 after => 0,
3509 data => WF_AUTOCANCEL,
3510 cb => sub {
3511 do_reload_perl; 3747 do_reload_perl;
3512 undef $RELOAD_WATCHER; 3748 undef $RELOAD_WATCHER;
3513 },
3514 ); 3749 };
3515} 3750}
3516 3751
3517register_command "reload" => sub { 3752register_command "reload" => sub {
3518 my ($who, $arg) = @_; 3753 my ($who, $arg) = @_;
3519 3754
3532 3767
3533our @WAIT_FOR_TICK; 3768our @WAIT_FOR_TICK;
3534our @WAIT_FOR_TICK_BEGIN; 3769our @WAIT_FOR_TICK_BEGIN;
3535 3770
3536sub wait_for_tick { 3771sub wait_for_tick {
3537 return unless $TICK_WATCHER->is_active;
3538 return if $Coro::current == $Coro::main; 3772 return if tick_inhibit || $Coro::current == $Coro::main;
3539 3773
3540 my $signal = new Coro::Signal; 3774 my $signal = new Coro::Signal;
3541 push @WAIT_FOR_TICK, $signal; 3775 push @WAIT_FOR_TICK, $signal;
3542 $signal->wait; 3776 $signal->wait;
3543} 3777}
3544 3778
3545sub wait_for_tick_begin { 3779sub wait_for_tick_begin {
3546 return unless $TICK_WATCHER->is_active;
3547 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
3548 3781
3549 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
3550 push @WAIT_FOR_TICK_BEGIN, $signal; 3783 push @WAIT_FOR_TICK_BEGIN, $signal;
3551 $signal->wait; 3784 $signal->wait;
3552} 3785}
3553 3786
3554$TICK_WATCHER = Event->timer ( 3787sub tick {
3555 reentrant => 0,
3556 parked => 1,
3557 prio => 0,
3558 at => $NEXT_TICK || $TICK,
3559 data => WF_AUTOCANCEL,
3560 cb => sub {
3561 if ($Coro::current != $Coro::main) { 3788 if ($Coro::current != $Coro::main) {
3562 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3789 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3563 unless ++$bug_warning > 10; 3790 unless ++$bug_warning > 10;
3564 return; 3791 return;
3565 } 3792 }
3566 3793
3567 $NOW = $tick_start = Event::time;
3568
3569 cf::server_tick; # one server iteration 3794 cf::server_tick; # one server iteration
3570 3795
3571 $RUNTIME += $TICK;
3572 $NEXT_TICK += $TICK;
3573
3574 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3796 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3575 $NEXT_RUNTIME_WRITE = $NOW + 10; 3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3576 Coro::async_pool { 3798 Coro::async_pool {
3577 $Coro::current->{desc} = "runtime saver"; 3799 $Coro::current->{desc} = "runtime saver";
3578 write_runtime 3800 write_runtime_sync
3579 or warn "ERROR: unable to write runtime file: $!"; 3801 or warn "ERROR: unable to write runtime file: $!";
3580 };
3581 } 3802 };
3803 }
3582 3804
3583 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3805 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3584 $sig->send; 3806 $sig->send;
3585 } 3807 }
3586 while (my $sig = shift @WAIT_FOR_TICK) { 3808 while (my $sig = shift @WAIT_FOR_TICK) {
3587 $sig->send; 3809 $sig->send;
3588 } 3810 }
3589 3811
3590 $NOW = Event::time; 3812 $LOAD = ($NOW - $TICK_START) / $TICK;
3591
3592 # if we are delayed by four ticks or more, skip them all
3593 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3594
3595 $TICK_WATCHER->at ($NEXT_TICK);
3596 $TICK_WATCHER->start;
3597
3598 $LOAD = ($NOW - $tick_start) / $TICK;
3599 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3813 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3600 3814
3601 _post_tick; 3815 if (0) {
3816 if ($NEXT_TICK) {
3817 my $jitter = $TICK_START - $NEXT_TICK;
3818 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3819 warn "jitter $JITTER\n";#d#
3820 }
3602 }, 3821 }
3603); 3822}
3604 3823
3605{ 3824{
3825 # configure BDB
3826
3606 BDB::min_parallel 8; 3827 BDB::min_parallel 8;
3607 BDB::max_poll_time $TICK * 0.1; 3828 BDB::max_poll_reqs $TICK * 0.1;
3608 $BDB_POLL_WATCHER = Event->io ( 3829 $AnyEvent::BDB::WATCHER->priority (1);
3609 reentrant => 0,
3610 fd => BDB::poll_fileno,
3611 poll => 'r',
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => \&BDB::poll_cb,
3615 );
3616
3617 BDB::set_sync_prepare {
3618 my $status;
3619 my $current = $Coro::current;
3620 (
3621 sub {
3622 $status = $!;
3623 $current->ready; undef $current;
3624 },
3625 sub {
3626 Coro::schedule while defined $current;
3627 $! = $status;
3628 },
3629 )
3630 };
3631 3830
3632 unless ($DB_ENV) { 3831 unless ($DB_ENV) {
3633 $DB_ENV = BDB::db_env_create; 3832 $DB_ENV = BDB::db_env_create;
3634 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3833 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3635 | BDB::LOG_AUTOREMOVE, 1); 3834 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3835 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3636 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3836 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3637 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3837 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3638 3838
3639 cf::sync_job { 3839 cf::sync_job {
3640 eval { 3840 eval {
3650 3850
3651 cf::cleanup "db_env_open(db): $@" if $@; 3851 cf::cleanup "db_env_open(db): $@" if $@;
3652 }; 3852 };
3653 } 3853 }
3654 3854
3655 $BDB_DEADLOCK_WATCHER = Event->timer ( 3855 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3656 after => 3,
3657 interval => 1,
3658 hard => 1,
3659 prio => 0,
3660 data => WF_AUTOCANCEL,
3661 cb => sub {
3662 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3856 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3663 },
3664 ); 3857 };
3665 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3858 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3666 after => 11,
3667 interval => 60,
3668 hard => 1,
3669 prio => 0,
3670 data => WF_AUTOCANCEL,
3671 cb => sub {
3672 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3859 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3673 },
3674 ); 3860 };
3675 $BDB_TRICKLE_WATCHER = Event->timer ( 3861 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3676 after => 5,
3677 interval => 10,
3678 hard => 1,
3679 prio => 0,
3680 data => WF_AUTOCANCEL,
3681 cb => sub {
3682 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3862 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3683 },
3684 ); 3863 };
3685} 3864}
3686 3865
3687{ 3866{
3867 # configure IO::AIO
3868
3688 IO::AIO::min_parallel 8; 3869 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3870 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = Event->io ( 3871 undef $AnyEvent::AIO::WATCHER;
3693 reentrant => 0,
3694 data => WF_AUTOCANCEL,
3695 fd => IO::AIO::poll_fileno,
3696 poll => 'r',
3697 prio => 0,
3698 cb => \&IO::AIO::poll_cb,
3699 );
3700} 3872}
3701 3873
3702my $_log_backtrace; 3874my $_log_backtrace;
3703 3875
3704sub _log_backtrace { 3876sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines