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.386 by root, Mon Oct 15 17:50:27 2007 UTC vs.
Revision 1.444 by root, Mon Sep 8 11:27:25 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
444 warn $@ if $@; 491 warn $@ if $@;
445 undef $busy; 492 undef $busy;
446 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
447 494
448 while ($busy) { 495 while ($busy) {
449 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
450 } 500 }
501 }
451 502
452 $time = Event::time - $time; 503 my $time = EV::time - $time;
453 504
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
458 506
459 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
460 } else { 508 } else {
461 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
462 510
487=item fork_call { }, $args 535=item fork_call { }, $args
488 536
489Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
493 541
494=cut 542=cut
495 543
496sub fork_call(&@) { 544sub fork_call(&@) {
497 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
504 reset_signals; 552 reset_signals;
505 &$cb 553 &$cb
506 }, @args; 554 }, @args;
507 555
508 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
509} 584}
510 585
511=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
512 587
513Returns a single value from the environment database. 588Returns a single value from the environment database.
658attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
660 735
661In 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>
662C<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
663Crossfire TRT). 738Deliantra).
664 739
665=over 4 740=over 4
666 741
667=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
668 743
950 } 1025 }
951 1026
952 0 1027 0
953} 1028}
954 1029
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1031
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1033
959Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
960 1035
1013 1088
1014sub reattach { 1089sub reattach {
1015 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1016 my ($obj) = @_; 1091 my ($obj) = @_;
1017 1092
1093 # no longer needed after getting rid of delete_package?
1018 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
1019 1095
1020 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1021 1097
1022 @$registry = (); 1098 @$registry = ();
1023 1099
1038cf::attachable->attach ( 1114cf::attachable->attach (
1039 prio => -1000000, 1115 prio => -1000000,
1040 on_instantiate => sub { 1116 on_instantiate => sub {
1041 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1042 1118
1043 $data = from_json $data; 1119 $data = decode_json $data;
1044 1120
1045 for (@$data) { 1121 for (@$data) {
1046 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1047 1123
1048 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1069 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1070 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1071 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1072 1148
1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1074 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1076 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1077 close $fh; 1153 aio_close $fh;
1078 1154
1079 if (@$objs) { 1155 if (@$objs) {
1080 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) {
1081 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1083 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1084 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1085 close $fh; 1161 aio_close $fh;
1086 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1087 } 1163 }
1088 } else { 1164 } else {
1089 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1090 } 1166 }
1118 1194
1119 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1120 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1121 or return; 1197 or return;
1122 1198
1123 my $st = eval { Coro::Storable::thaw $av } 1199 my $st = eval { Coro::Storable::thaw $av };
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs}; 1200 $av = $st->{objs};
1126 } 1201 }
1127 1202
1128 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1129 warn sprintf "loading %s (%d,%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1260 1335
1261 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1262 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1263 1338
1264 $ext{source} = 1339 $ext{source} =
1265 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1266 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1267 . $source 1342 . $source
1268 . "\n};\n1"; 1343 . "\n};\n1";
1269 1344
1270 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1286 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1287 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1288 1363
1289 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1290 warn $msg; 1365 warn $msg;
1291 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1292 exit 1;
1293 } 1367 }
1294 1368
1295 warn $msg; 1369 warn $msg;
1296 } 1370 }
1297 1371
1386 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1387 or return; 1461 or return;
1388 1462
1389 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1390 or return; 1464 or return;
1465
1391 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1392 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1393 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1394 } 1469 }
1395 } 1470 }
1405 1480
1406 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1407 1482
1408 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1409 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1410 1487
1411 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1412 cf::cede_to_tick; 1489 cf::cede_to_tick;
1413} 1490}
1414 1491
1446 my ($pl) = @_; 1523 my ($pl) = @_;
1447 1524
1448 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1449 1526
1450 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1451 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1452 1529
1453 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1454 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1455 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1456 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1457 1536
1458 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1459 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1498 1577
1499 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1500 my $path = path $login; 1579 my $path = path $login;
1501 1580
1502 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1503 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1505 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1506 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 } 1587 }
1508 1588
1543 1623
1544=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1545 1625
1546Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1547 1627
1548=cut
1549
1550sub expand_cfpod {
1551 ((my $self), (local $_)) = @_;
1552
1553 # escape & and <
1554 s/&/&amp;/g;
1555 s/(?<![BIUGHT])</&lt;/g;
1556
1557 # this is buggy, it needs to properly take care of nested <'s
1558
1559 1 while
1560 # replace B<>, I<>, U<> etc.
1561 s/B<([^\>]*)>/<b>$1<\/b>/
1562 || s/I<([^\>]*)>/<i>$1<\/i>/
1563 || s/U<([^\>]*)>/<u>$1<\/u>/
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1565 # replace G<male|female> tags
1566 || s{G<([^>|]*)\|([^>]*)>}{
1567 $self->gender ? $2 : $1
1568 }ge
1569 # replace H<hint text>
1570 || s{H<([^\>]*)>}
1571 {
1572 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1573 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1574 "")
1575 [$self->{hintmode}]
1576 }ge;
1577
1578 # create single paragraphs (very hackish)
1579 s/(?<=\S)\n(?=\w)/ /g;
1580
1581 # compress some whitespace
1582 s/\s+\n/\n/g; # ws line-ends
1583 s/\n\n+/\n/g; # double lines
1584 s/^\n+//; # beginning lines
1585 s/\n+$//; # ending lines
1586
1587 $_
1588}
1589
1590sub hintmode {
1591 $_[0]{hintmode} = $_[1] if @_ > 1;
1592 $_[0]{hintmode}
1593}
1594
1595=item $player->ext_reply ($msgid, @msg) 1628=item $player->ext_reply ($msgid, @msg)
1596 1629
1597Sends an ext reply to the player. 1630Sends an ext reply to the player.
1598 1631
1599=cut 1632=cut
1665our $MAX_RESET = 3600; 1698our $MAX_RESET = 3600;
1666our $DEFAULT_RESET = 3000; 1699our $DEFAULT_RESET = 3000;
1667 1700
1668sub generate_random_map { 1701sub generate_random_map {
1669 my ($self, $rmp) = @_; 1702 my ($self, $rmp) = @_;
1703
1704 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1705
1670 # mit "rum" bekleckern, nicht 1706 # mit "rum" bekleckern, nicht
1671 $self->_create_random_map ( 1707 $self->_create_random_map (
1672 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1673 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1674 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1796 1832
1797# the temporary/swap location 1833# the temporary/swap location
1798sub save_path { 1834sub save_path {
1799 my ($self) = @_; 1835 my ($self) = @_;
1800 1836
1801 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1837 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1802 "$TMPDIR/$path.map" 1838 "$TMPDIR/$path.map"
1803} 1839}
1804 1840
1805# the unique path, undef == no special unique path 1841# the unique path, undef == no special unique path
1806sub uniq_path { 1842sub uniq_path {
1807 my ($self) = @_; 1843 my ($self) = @_;
1808 1844
1809 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1810 "$UNIQUEDIR/$path" 1846 "$UNIQUEDIR/$path"
1811} 1847}
1812 1848
1813# and all this just because we cannot iterate over 1849# and all this just because we cannot iterate over
1814# all maps in C++... 1850# all maps in C++...
1912 1948
1913 cf::lock_wait "map_data:$path";#d#remove 1949 cf::lock_wait "map_data:$path";#d#remove
1914 cf::lock_wait "map_find:$path"; 1950 cf::lock_wait "map_find:$path";
1915 1951
1916 $cf::MAP{$path} || do { 1952 $cf::MAP{$path} || do {
1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
1919 1955
1920 my $map = new_from_path cf::map $path 1956 my $map = new_from_path cf::map $path
1921 or return; 1957 or return;
1922 1958
1923 $map->{last_save} = $cf::RUNTIME; 1959 $map->{last_save} = $cf::RUNTIME;
1926 or return; 1962 or return;
1927 1963
1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1964 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1929 # doing this can freeze the server in a sync job, obviously 1965 # doing this can freeze the server in a sync job, obviously
1930 #$cf::WAIT_FOR_TICK->wait; 1966 #$cf::WAIT_FOR_TICK->wait;
1967 undef $guard2;
1931 undef $guard1; 1968 undef $guard1;
1932 undef $guard2;
1933 $map->reset; 1969 $map->reset;
1934 return find $path; 1970 return find $path;
1935 } 1971 }
1936 1972
1937 $cf::MAP{$path} = $map 1973 $cf::MAP{$path} = $map
1964 my $f = new_from_file cf::object::thawer $self->{load_path}; 2000 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block; 2001 $f->skip_block;
1966 $self->_load_objects ($f) 2002 $self->_load_objects ($f)
1967 or return; 2003 or return;
1968 2004
1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2005 $self->post_load_original
1970 if delete $self->{load_original}; 2006 if delete $self->{load_original};
1971 2007
1972 if (my $uniq = $self->uniq_path) { 2008 if (my $uniq = $self->uniq_path) {
1973 utf8::encode $uniq; 2009 utf8::encode $uniq;
1974 unless (aio_stat $uniq) { 2010 unless (aio_stat $uniq) {
2000 } 2036 }
2001 2037
2002 $self->{last_save} = $cf::RUNTIME; 2038 $self->{last_save} = $cf::RUNTIME;
2003 $self->last_access ($cf::RUNTIME); 2039 $self->last_access ($cf::RUNTIME);
2004 2040
2005 $self->in_memory (cf::MAP_IN_MEMORY); 2041 $self->in_memory (cf::MAP_ACTIVE);
2006 } 2042 }
2007 2043
2008 $self->post_load; 2044 $self->post_load;
2009} 2045}
2010 2046
2068 my ($path, $origin, $load) = @_; 2104 my ($path, $origin, $load) = @_;
2069 2105
2070 $path = normalise $path, $origin && $origin->{path}; 2106 $path = normalise $path, $origin && $origin->{path};
2071 2107
2072 if (my $map = $cf::MAP{$path}) { 2108 if (my $map = $cf::MAP{$path}) {
2073 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2109 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2074 } 2110 }
2075 2111
2076 $MAP_PREFETCH{$path} |= $load; 2112 $MAP_PREFETCH{$path} |= $load;
2077 2113
2078 $MAP_PREFETCHER ||= cf::async { 2114 $MAP_PREFETCHER ||= cf::async {
2115 cf::async { 2151 cf::async {
2116 $Coro::current->{desc} = "map player save"; 2152 $Coro::current->{desc} = "map player save";
2117 $_->contr->save for $self->players; 2153 $_->contr->save for $self->players;
2118 }; 2154 };
2119 2155
2156 cf::get_slot 0.02;
2157
2120 if ($uniq) { 2158 if ($uniq) {
2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2159 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2122 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2160 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2123 } else { 2161 } else {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2132 $self->save; 2170 $self->save;
2133 2171
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2173
2136 return if $self->players; 2174 return if $self->players;
2137 return if $self->in_memory != cf::MAP_IN_MEMORY; 2175 return if $self->in_memory != cf::MAP_ACTIVE;
2138 return if $self->{deny_save}; 2176 return if $self->{deny_save};
2139 2177
2140 $self->in_memory (cf::MAP_SWAPPED); 2178 $self->in_memory (cf::MAP_SWAPPED);
2141 2179
2142 $self->deactivate; 2180 $self->deactivate;
2260 2298
2261sub unique_maps() { 2299sub unique_maps() {
2262 [ 2300 [
2263 map { 2301 map {
2264 utf8::decode $_; 2302 utf8::decode $_;
2265 /\.map$/ 2303 s/\.map$//; # TODO future compatibility hack
2304 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2305 ? ()
2266 ? normalise $_ 2306 : normalise $_
2267 : ()
2268 } @{ aio_readdir $UNIQUEDIR or [] } 2307 } @{ aio_readdir $UNIQUEDIR or [] }
2269 ] 2308 ]
2270} 2309}
2271 2310
2272package cf;
2273
2274=back 2311=back
2275 2312
2276=head3 cf::object 2313=head3 cf::object
2277 2314
2278=cut 2315=cut
2281 2318
2282=over 4 2319=over 4
2283 2320
2284=item $ob->inv_recursive 2321=item $ob->inv_recursive
2285 2322
2286Returns the inventory of the object _and_ their inventories, recursively. 2323Returns the inventory of the object I<and> their inventories, recursively,
2324but I<not> the object itself.
2287 2325
2288=cut 2326=cut
2289 2327
2290sub inv_recursive_; 2328sub inv_recursive_;
2291sub inv_recursive_ { 2329sub inv_recursive_ {
2296 inv_recursive_ inv $_[0] 2334 inv_recursive_ inv $_[0]
2297} 2335}
2298 2336
2299=item $ref = $ob->ref 2337=item $ref = $ob->ref
2300 2338
2301creates and returns a persistent reference to an objetc that can be stored as a string. 2339Creates and returns a persistent reference to an object that can be stored as a string.
2302 2340
2303=item $ob = cf::object::deref ($refstring) 2341=item $ob = cf::object::deref ($refstring)
2304 2342
2305returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2343returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2306even if the object actually exists. May block. 2344even if the object actually exists. May block.
2338can be C<undef>. Does the right thing when the player is currently in a 2376can be C<undef>. Does the right thing when the player is currently in a
2339dialogue with the given NPC character. 2377dialogue with the given NPC character.
2340 2378
2341=cut 2379=cut
2342 2380
2381our $SAY_CHANNEL = {
2382 id => "say",
2383 title => "Map",
2384 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2386};
2387
2388our $CHAT_CHANNEL = {
2389 id => "chat",
2390 title => "Chat",
2391 reply => "chat ",
2392 tooltip => "Player chat and shouts, global to the server.",
2393};
2394
2343# rough implementation of a future "reply" method that works 2395# rough implementation of a future "reply" method that works
2344# with dialog boxes. 2396# with dialog boxes.
2345#TODO: the first argument must go, split into a $npc->reply_to ( method 2397#TODO: the first argument must go, split into a $npc->reply_to ( method
2346sub cf::object::player::reply($$$;$) { 2398sub cf::object::player::reply($$$;$) {
2347 my ($self, $npc, $msg, $flags) = @_; 2399 my ($self, $npc, $msg, $flags) = @_;
2358 my $dialog = $pl->{npc_dialog}; 2410 my $dialog = $pl->{npc_dialog};
2359 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2411 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2360 2412
2361 } else { 2413 } else {
2362 $msg = $npc->name . " says: $msg" if $npc; 2414 $msg = $npc->name . " says: $msg" if $npc;
2363 $self->message ($msg, $flags); 2415 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2364 } 2416 }
2365 } 2417 }
2366} 2418}
2367 2419
2368=item $object->send_msg ($channel, $msg, $color, [extra...]) 2420=item $object->send_msg ($channel, $msg, $color, [extra...])
2475Moves the player to the given map-path and coordinates by first freezing 2527Moves the player to the given map-path and coordinates by first freezing
2476her, loading and preparing them map, calling the provided $check callback 2528her, loading and preparing them map, calling the provided $check callback
2477that has to return the map if sucecssful, and then unfreezes the player on 2529that has to return the map if sucecssful, and then unfreezes the player on
2478the new (success) or old (failed) map position. In either case, $done will 2530the new (success) or old (failed) map position. In either case, $done will
2479be called at the end of this process. 2531be called at the end of this process.
2532
2533Note that $check will be called with a potentially non-loaded map, so if
2534it needs a loaded map it has to call C<< ->load >>.
2480 2535
2481=cut 2536=cut
2482 2537
2483our $GOTOGEN; 2538our $GOTOGEN;
2484 2539
2563} 2618}
2564 2619
2565sub prepare_random_map { 2620sub prepare_random_map {
2566 my ($exit) = @_; 2621 my ($exit) = @_;
2567 2622
2568 my $guard = cf::lock_acquire "exit_prepare:$exit";
2569
2570 # all this does is basically replace the /! path by 2623 # all this does is basically replace the /! path by
2571 # a new random map path (?random/...) with a seed 2624 # a new random map path (?random/...) with a seed
2572 # that depends on the exit object 2625 # that depends on the exit object
2573 2626
2574 my $rmp = parse_random_map_params $exit->msg; 2627 my $rmp = parse_random_map_params $exit->msg;
2576 if ($exit->map) { 2629 if ($exit->map) {
2577 $rmp->{region} = $exit->region->name; 2630 $rmp->{region} = $exit->region->name;
2578 $rmp->{origin_map} = $exit->map->path; 2631 $rmp->{origin_map} = $exit->map->path;
2579 $rmp->{origin_x} = $exit->x; 2632 $rmp->{origin_x} = $exit->x;
2580 $rmp->{origin_y} = $exit->y; 2633 $rmp->{origin_y} = $exit->y;
2634
2635 $exit->map->touch;
2581 } 2636 }
2582 2637
2583 $rmp->{random_seed} ||= $exit->random_seed; 2638 $rmp->{random_seed} ||= $exit->random_seed;
2584 2639
2585 my $data = cf::to_json $rmp; 2640 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2586 my $md5 = Digest::MD5::md5_hex $data; 2641 my $md5 = Digest::MD5::md5_hex $data;
2587 my $meta = "$RANDOMDIR/$md5.meta"; 2642 my $meta = "$RANDOMDIR/$md5.meta";
2588 2643
2589 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2644 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2590 aio_write $fh, 0, (length $data), $data, 0; 2645 aio_write $fh, 0, (length $data), $data, 0;
2591 undef $fh; 2646 undef $fh;
2592 aio_rename "$meta~", $meta; 2647 aio_rename "$meta~", $meta;
2593 2648
2649 my $slaying = "?random/$md5";
2650
2651 if ($exit->valid) {
2594 $exit->slaying ("?random/$md5"); 2652 $exit->slaying ("?random/$md5");
2595 $exit->msg (undef); 2653 $exit->msg (undef);
2654 }
2596 } 2655 }
2597} 2656}
2598 2657
2599sub cf::object::player::enter_exit { 2658sub cf::object::player::enter_exit {
2600 my ($self, $exit) = @_; 2659 my ($self, $exit) = @_;
2601 2660
2602 return unless $self->type == cf::PLAYER; 2661 return unless $self->type == cf::PLAYER;
2603 2662
2604 if ($exit->slaying eq "/!") {
2605 #TODO: this should de-fi-ni-te-ly not be a sync-job
2606 # the problem is that $exit might not survive long enough
2607 # so it needs to be done right now, right here
2608 cf::sync_job { prepare_random_map $exit };
2609 }
2610
2611 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2612 my $hp = $exit->stats->hp;
2613 my $sp = $exit->stats->sp;
2614
2615 $self->enter_link; 2663 $self->enter_link;
2616 2664
2617 # if exit is damned, update players death & WoR home-position
2618 $self->contr->savebed ($slaying, $hp, $sp)
2619 if $exit->flag (FLAG_DAMNED);
2620
2621 (async { 2665 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2666 $Coro::current->{desc} = "enter_exit";
2623 2667
2624 $self->deactivate_recursive; # just to be sure
2625 unless (eval { 2668 unless (eval {
2669 $self->deactivate_recursive; # just to be sure
2670
2671 # random map handling
2672 {
2673 my $guard = cf::lock_acquire "exit_prepare:$exit";
2674
2675 prepare_random_map $exit
2676 if $exit->slaying eq "/!";
2677 }
2678
2679 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2680 my $x = $exit->stats->hp;
2681 my $y = $exit->stats->sp;
2682
2626 $self->goto ($slaying, $hp, $sp); 2683 $self->goto ($map, $x, $y);
2627 2684
2685 # if exit is damned, update players death & WoR home-position
2686 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED);
2688
2628 1; 2689 1
2629 }) { 2690 }) {
2630 $self->message ("Something went wrong deep within the crossfire server. " 2691 $self->message ("Something went wrong deep within the crossfire server. "
2631 . "I'll try to bring you back to the map you were before. " 2692 . "I'll try to bring you back to the map you were before. "
2632 . "Please report this to the dungeon master!", 2693 . "Please report this to the dungeon master!",
2633 cf::NDI_UNIQUE | cf::NDI_RED); 2694 cf::NDI_UNIQUE | cf::NDI_RED);
2663the message, with C<log> being the default. If C<$color> is negative, suppress 2724the message, with C<log> being the default. If C<$color> is negative, suppress
2664the message unless the client supports the msg packet. 2725the message unless the client supports the msg packet.
2665 2726
2666=cut 2727=cut
2667 2728
2729# non-persistent channels (usually the info channel)
2668our %CHANNEL = ( 2730our %CHANNEL = (
2669 "c/identify" => { 2731 "c/identify" => {
2670 id => "infobox", 2732 id => "infobox",
2671 title => "Identify", 2733 title => "Identify",
2672 reply => undef, 2734 reply => undef,
2676 id => "infobox", 2738 id => "infobox",
2677 title => "Examine", 2739 title => "Examine",
2678 reply => undef, 2740 reply => undef,
2679 tooltip => "Signs and other items you examined", 2741 tooltip => "Signs and other items you examined",
2680 }, 2742 },
2743 "c/book" => {
2744 id => "infobox",
2745 title => "Book",
2746 reply => undef,
2747 tooltip => "The contents of a note or book",
2748 },
2681 "c/lookat" => { 2749 "c/lookat" => {
2682 id => "infobox", 2750 id => "infobox",
2683 title => "Look", 2751 title => "Look",
2684 reply => undef, 2752 reply => undef,
2685 tooltip => "What you saw there", 2753 tooltip => "What you saw there",
2686 }, 2754 },
2755 "c/who" => {
2756 id => "infobox",
2757 title => "Players",
2758 reply => undef,
2759 tooltip => "Shows players who are currently online",
2760 },
2761 "c/body" => {
2762 id => "infobox",
2763 title => "Body Parts",
2764 reply => undef,
2765 tooltip => "Shows which body parts you posess and are available",
2766 },
2767 "c/uptime" => {
2768 id => "infobox",
2769 title => "Uptime",
2770 reply => undef,
2771 tooltip => "How long the server has been running since last restart",
2772 },
2773 "c/mapinfo" => {
2774 id => "infobox",
2775 title => "Map Info",
2776 reply => undef,
2777 tooltip => "Information related to the maps",
2778 },
2779 "c/party" => {
2780 id => "party",
2781 title => "Party",
2782 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party",
2784 },
2687); 2785);
2688 2786
2689sub cf::client::send_msg { 2787sub cf::client::send_msg {
2690 my ($self, $channel, $msg, $color, @extra) = @_; 2788 my ($self, $channel, $msg, $color, @extra) = @_;
2691 2789
2718 if ($self->can_msg) { 2816 if ($self->can_msg) {
2719 # default colour, mask it out 2817 # default colour, mask it out
2720 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2721 if $color & cf::NDI_DEF; 2819 if $color & cf::NDI_DEF;
2722 2820
2723 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2821 my $pkt = "msg "
2822 . $self->{json_coder}->encode (
2724 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 );
2825
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt);
2725 } else { 2837 } else {
2726 if ($color >= 0) { 2838 if ($color >= 0) {
2727 # replace some tags by gcfclient-compatible ones 2839 # replace some tags by gcfclient-compatible ones
2728 for ($msg) { 2840 for ($msg) {
2729 1 while 2841 1 while
2928 3040
2929The following functions and methods are available within a safe environment: 3041The following functions and methods are available within a safe environment:
2930 3042
2931 cf::object 3043 cf::object
2932 contr pay_amount pay_player map x y force_find force_add destroy 3044 contr pay_amount pay_player map x y force_find force_add destroy
2933 insert remove name archname title slaying race decrease_ob_nr 3045 insert remove name archname title slaying race decrease split
2934 3046
2935 cf::object::player 3047 cf::object::player
2936 player 3048 player
2937 3049
2938 cf::player 3050 cf::player
2943 3055
2944=cut 3056=cut
2945 3057
2946for ( 3058for (
2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2948 insert remove inv name archname title slaying race 3060 insert remove inv nrof name archname title slaying race
2949 decrease_ob_nr destroy)], 3061 decrease split destroy change_exp)],
2950 ["cf::object::player" => qw(player)], 3062 ["cf::object::player" => qw(player)],
2951 ["cf::player" => qw(peaceful)], 3063 ["cf::player" => qw(peaceful)],
2952 ["cf::map" => qw(trigger)], 3064 ["cf::map" => qw(trigger)],
2953) { 3065) {
2954 no strict 'refs'; 3066 no strict 'refs';
3059 { 3171 {
3060 my $faces = $facedata->{faceinfo}; 3172 my $faces = $facedata->{faceinfo};
3061 3173
3062 while (my ($face, $info) = each %$faces) { 3174 while (my ($face, $info) = each %$faces) {
3063 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3175 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3176
3064 cf::face::set_visibility $idx, $info->{visibility}; 3177 cf::face::set_visibility $idx, $info->{visibility};
3065 cf::face::set_magicmap $idx, $info->{magicmap}; 3178 cf::face::set_magicmap $idx, $info->{magicmap};
3066 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3179 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3067 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3180 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3068 3181
3069 cf::cede_to_tick; 3182 cf::cede_to_tick;
3070 } 3183 }
3071 3184
3072 while (my ($face, $info) = each %$faces) { 3185 while (my ($face, $info) = each %$faces) {
3073 next unless $info->{smooth}; 3186 next unless $info->{smooth};
3187
3074 my $idx = cf::face::find $face 3188 my $idx = cf::face::find $face
3075 or next; 3189 or next;
3190
3076 if (my $smooth = cf::face::find $info->{smooth}) { 3191 if (my $smooth = cf::face::find $info->{smooth}) {
3077 cf::face::set_smooth $idx, $smooth; 3192 cf::face::set_smooth $idx, $smooth;
3078 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3193 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3079 } else { 3194 } else {
3080 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3195 warn "smooth face '$info->{smooth}' not found for face '$face'";
3098 { 3213 {
3099 # TODO: for gcfclient pleasure, we should give resources 3214 # TODO: for gcfclient pleasure, we should give resources
3100 # that gcfclient doesn't grok a >10000 face index. 3215 # that gcfclient doesn't grok a >10000 face index.
3101 my $res = $facedata->{resource}; 3216 my $res = $facedata->{resource};
3102 3217
3103 my $soundconf = delete $res->{"res/sound.conf"};
3104
3105 while (my ($name, $info) = each %$res) { 3218 while (my ($name, $info) = each %$res) {
3219 if (defined $info->{type}) {
3106 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3220 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3107 my $data; 3221 my $data;
3108 3222
3109 if ($info->{type} & 1) { 3223 if ($info->{type} & 1) {
3110 # prepend meta info 3224 # prepend meta info
3111 3225
3112 my $meta = $enc->encode ({ 3226 my $meta = $enc->encode ({
3113 name => $name, 3227 name => $name,
3114 %{ $info->{meta} || {} }, 3228 %{ $info->{meta} || {} },
3115 }); 3229 });
3116 3230
3117 $data = pack "(w/a*)*", $meta, $info->{data}; 3231 $data = pack "(w/a*)*", $meta, $info->{data};
3232 } else {
3233 $data = $info->{data};
3234 }
3235
3236 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3237 cf::face::set_type $idx, $info->{type};
3118 } else { 3238 } else {
3119 $data = $info->{data}; 3239 $RESOURCE{$name} = $info;
3120 } 3240 }
3121 3241
3122 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3123 cf::face::set_type $idx, $info->{type};
3124
3125 cf::cede_to_tick; 3242 cf::cede_to_tick;
3126 } 3243 }
3127
3128 if ($soundconf) {
3129 $soundconf = $enc->decode (delete $soundconf->{data});
3130
3131 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3132 my $sound = $soundconf->{compat}[$_]
3133 or next;
3134
3135 my $face = cf::face::find "sound/$sound->[1]";
3136 cf::sound::set $sound->[0] => $face;
3137 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3138 }
3139
3140 while (my ($k, $v) = each %{$soundconf->{event}}) {
3141 my $face = cf::face::find "sound/$v";
3142 cf::sound::set $k => $face;
3143 }
3144 }
3145 } 3244 }
3245
3246 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3146 3247
3147 1 3248 1
3148} 3249}
3250
3251cf::global->attach (on_resource_update => sub {
3252 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3253 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3254
3255 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3256 my $sound = $soundconf->{compat}[$_]
3257 or next;
3258
3259 my $face = cf::face::find "sound/$sound->[1]";
3260 cf::sound::set $sound->[0] => $face;
3261 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3262 }
3263
3264 while (my ($k, $v) = each %{$soundconf->{event}}) {
3265 my $face = cf::face::find "sound/$v";
3266 cf::sound::set $k => $face;
3267 }
3268 }
3269});
3149 3270
3150register_exticmd fx_want => sub { 3271register_exticmd fx_want => sub {
3151 my ($ns, $want) = @_; 3272 my ($ns, $want) = @_;
3152 3273
3153 while (my ($k, $v) = each %$want) { 3274 while (my ($k, $v) = each %$want) {
3154 $ns->fx_want ($k, $v); 3275 $ns->fx_want ($k, $v);
3155 } 3276 }
3156}; 3277};
3278
3279sub load_resource_file($) {
3280 my $guard = lock_acquire "load_resource_file";
3281
3282 my $status = load_resource_file_ $_[0];
3283 get_slot 0.1, 100;
3284 cf::arch::commit_load;
3285
3286 $status
3287}
3157 3288
3158sub reload_regions { 3289sub reload_regions {
3159 # HACK to clear player env face cache, we need some signal framework 3290 # HACK to clear player env face cache, we need some signal framework
3160 # for this (global event?) 3291 # for this (global event?)
3161 %ext::player_env::MUSIC_FACE_CACHE = (); 3292 %ext::player_env::MUSIC_FACE_CACHE = ();
3175} 3306}
3176 3307
3177sub reload_archetypes { 3308sub reload_archetypes {
3178 load_resource_file "$DATADIR/archetypes" 3309 load_resource_file "$DATADIR/archetypes"
3179 or die "unable to load archetypes\n"; 3310 or die "unable to load archetypes\n";
3180 #d# NEED to laod twice to resolve forward references
3181 # this really needs to be done in an extra post-pass
3182 # (which needs to be synchronous, so solve it differently)
3183 load_resource_file "$DATADIR/archetypes"
3184 or die "unable to load archetypes\n";
3185} 3311}
3186 3312
3187sub reload_treasures { 3313sub reload_treasures {
3188 load_resource_file "$DATADIR/treasures" 3314 load_resource_file "$DATADIR/treasures"
3189 or die "unable to load treasurelists\n"; 3315 or die "unable to load treasurelists\n";
3190} 3316}
3191 3317
3192sub reload_resources { 3318sub reload_resources {
3193 warn "reloading resource files...\n"; 3319 warn "reloading resource files...\n";
3194 3320
3321 reload_facedata;
3322 reload_archetypes;
3195 reload_regions; 3323 reload_regions;
3196 reload_facedata;
3197 #reload_archetypes;#d#
3198 reload_archetypes;
3199 reload_treasures; 3324 reload_treasures;
3200 3325
3201 warn "finished reloading resource files\n"; 3326 warn "finished reloading resource files\n";
3202} 3327}
3203 3328
3204sub init { 3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3205 reload_resources; 3334 reload_resources;
3206} 3335}
3207 3336
3208sub reload_config { 3337sub reload_config {
3209 open my $fh, "<:utf8", "$CONFDIR/config" 3338 open my $fh, "<:utf8", "$CONFDIR/config"
3210 or return; 3339 or return;
3211 3340
3212 local $/; 3341 local $/;
3213 *CFG = YAML::Syck::Load <$fh>; 3342 *CFG = YAML::Load <$fh>;
3214 3343
3215 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3344 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3216 3345
3217 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3346 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3218 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3347 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3230 # we must not ever block the main coroutine 3359 # we must not ever block the main coroutine
3231 local $Coro::idle = sub { 3360 local $Coro::idle = sub {
3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3361 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3233 (async { 3362 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3363 $Coro::current->{desc} = "IDLE BUG HANDLER";
3235 Event::one_event; 3364 EV::loop EV::LOOP_ONESHOT;
3236 })->prio (Coro::PRIO_MAX); 3365 })->prio (Coro::PRIO_MAX);
3237 }; 3366 };
3238 3367
3368 {
3369 my $guard = freeze_mainloop;
3239 reload_config; 3370 reload_config;
3240 db_init; 3371 db_init;
3241 load_extensions; 3372 load_extensions;
3242 3373
3243 $TICK_WATCHER->start; 3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3375 }
3376
3244 Event::loop; 3377 EV::loop;
3245} 3378}
3246 3379
3247############################################################################# 3380#############################################################################
3248# initialisation and cleanup 3381# initialisation and cleanup
3249 3382
3250# install some emergency cleanup handlers 3383# install some emergency cleanup handlers
3251BEGIN { 3384BEGIN {
3385 our %SIGWATCHER = ();
3252 for my $signal (qw(INT HUP TERM)) { 3386 for my $signal (qw(INT HUP TERM)) {
3253 Event->signal ( 3387 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3254 reentrant => 0,
3255 data => WF_AUTOCANCEL,
3256 signal => $signal,
3257 prio => 0,
3258 cb => sub {
3259 cf::cleanup "SIG$signal"; 3388 cf::cleanup "SIG$signal";
3260 },
3261 ); 3389 };
3262 } 3390 }
3263} 3391}
3264 3392
3265sub write_runtime { 3393sub write_runtime_sync {
3266 my $runtime = "$LOCALDIR/runtime"; 3394 my $runtime = "$LOCALDIR/runtime";
3267 3395
3268 # first touch the runtime file to show we are still running: 3396 # first touch the runtime file to show we are still running:
3269 # the fsync below can take a very very long time. 3397 # the fsync below can take a very very long time.
3270 3398
3296 and return; 3424 and return;
3297 3425
3298 warn "runtime file written.\n"; 3426 warn "runtime file written.\n";
3299 3427
3300 1 3428 1
3429}
3430
3431our $uuid_lock;
3432our $uuid_skip;
3433
3434sub write_uuid_sync($) {
3435 $uuid_skip ||= $_[0];
3436
3437 return if $uuid_lock;
3438 local $uuid_lock = 1;
3439
3440 my $uuid = "$LOCALDIR/uuid";
3441
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return;
3444
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3446 $uuid_skip = 0;
3447
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return;
3450
3451 # always fsync - this file is important
3452 aio_fsync $fh
3453 and return;
3454
3455 close $fh
3456 or return;
3457
3458 aio_rename "$uuid~", $uuid
3459 and return;
3460
3461 warn "uuid file written ($value).\n";
3462
3463 1
3464
3465}
3466
3467sub write_uuid($$) {
3468 my ($skip, $sync) = @_;
3469
3470 $sync ? write_uuid_sync $skip
3471 : async { write_uuid_sync $skip };
3301} 3472}
3302 3473
3303sub emergency_save() { 3474sub emergency_save() {
3304 my $freeze_guard = cf::freeze_mainloop; 3475 my $freeze_guard = cf::freeze_mainloop;
3305 3476
3327 warn "end emergency map save\n"; 3498 warn "end emergency map save\n";
3328 3499
3329 warn "begin emergency database checkpoint\n"; 3500 warn "begin emergency database checkpoint\n";
3330 BDB::db_env_txn_checkpoint $DB_ENV; 3501 BDB::db_env_txn_checkpoint $DB_ENV;
3331 warn "end emergency database checkpoint\n"; 3502 warn "end emergency database checkpoint\n";
3503
3504 warn "begin write uuid\n";
3505 write_uuid_sync 1;
3506 warn "end write uuid\n";
3332 }; 3507 };
3333 3508
3334 warn "leave emergency perl save\n"; 3509 warn "leave emergency perl save\n";
3335} 3510}
3336 3511
3338 my ($make_core) = @_; 3513 my ($make_core) = @_;
3339 3514
3340 warn Carp::longmess "post_cleanup backtrace" 3515 warn Carp::longmess "post_cleanup backtrace"
3341 if $make_core; 3516 if $make_core;
3342} 3517}
3518
3519# a safer delete_package, copied from Symbol
3520sub clear_package($) {
3521 my $pkg = shift;
3522
3523 # expand to full symbol table name if needed
3524 unless ($pkg =~ /^main::.*::$/) {
3525 $pkg = "main$pkg" if $pkg =~ /^::/;
3526 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3527 $pkg .= '::' unless $pkg =~ /::$/;
3528 }
3529
3530 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3531 my $stem_symtab = *{$stem}{HASH};
3532
3533 defined $stem_symtab and exists $stem_symtab->{$leaf}
3534 or return;
3535
3536 # clear all symbols
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 }
3542 warn "cleared package #$pkg\n";#d#
3543}
3544
3545our $RELOAD; # how many times to reload
3343 3546
3344sub do_reload_perl() { 3547sub do_reload_perl() {
3345 # can/must only be called in main 3548 # can/must only be called in main
3346 if ($Coro::current != $Coro::main) { 3549 if ($Coro::current != $Coro::main) {
3347 warn "can only reload from main coroutine"; 3550 warn "can only reload from main coroutine";
3348 return; 3551 return;
3349 } 3552 }
3350 3553
3554 return if $RELOAD++;
3555
3556 while ($RELOAD) {
3351 warn "reloading..."; 3557 warn "reloading...";
3352 3558
3353 warn "entering sync_job"; 3559 warn "entering sync_job";
3354 3560
3355 cf::sync_job { 3561 cf::sync_job {
3356 cf::write_runtime; # external watchdog should not bark 3562 cf::write_runtime_sync; # external watchdog should not bark
3357 cf::emergency_save; 3563 cf::emergency_save;
3358 cf::write_runtime; # external watchdog should not bark 3564 cf::write_runtime_sync; # external watchdog should not bark
3359 3565
3360 warn "syncing database to disk"; 3566 warn "syncing database to disk";
3361 BDB::db_env_txn_checkpoint $DB_ENV; 3567 BDB::db_env_txn_checkpoint $DB_ENV;
3362 3568
3363 # if anything goes wrong in here, we should simply crash as we already saved 3569 # if anything goes wrong in here, we should simply crash as we already saved
3364 3570
3365 warn "cancelling all WF_AUTOCANCEL watchers";
3366 for (Event::all_watchers) {
3367 $_->cancel if $_->data & WF_AUTOCANCEL;
3368 }
3369
3370 warn "flushing outstanding aio requests"; 3571 warn "flushing outstanding aio requests";
3371 for (;;) {
3372 BDB::flush;
3373 IO::AIO::flush;
3374 Coro::cede;
3375 last unless IO::AIO::nreqs || BDB::nreqs; 3572 while (IO::AIO::nreqs || BDB::nreqs) {
3376 warn "iterate..."; 3573 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3377 }
3378
3379 ++$RELOAD;
3380
3381 warn "cancelling all extension coros";
3382 $_->cancel for values %EXT_CORO;
3383 %EXT_CORO = ();
3384
3385 warn "removing commands";
3386 %COMMAND = ();
3387
3388 warn "removing ext/exti commands";
3389 %EXTCMD = ();
3390 %EXTICMD = ();
3391
3392 warn "unloading/nuking all extensions";
3393 for my $pkg (@EXTS) {
3394 warn "... unloading $pkg";
3395
3396 if (my $cb = $pkg->can ("unload")) {
3397 eval {
3398 $cb->($pkg);
3399 1
3400 } or warn "$pkg unloaded, but with errors: $@";
3401 } 3574 }
3402 3575
3403 warn "... nuking $pkg"; 3576 warn "cancelling all extension coros";
3404 Symbol::delete_package $pkg; 3577 $_->cancel for values %EXT_CORO;
3405 } 3578 %EXT_CORO = ();
3406 3579
3407 warn "unloading all perl modules loaded from $LIBDIR"; 3580 warn "removing commands";
3408 while (my ($k, $v) = each %INC) { 3581 %COMMAND = ();
3409 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3410 3582
3583 warn "removing ext/exti commands";
3584 %EXTCMD = ();
3585 %EXTICMD = ();
3586
3587 warn "unloading/nuking all extensions";
3588 for my $pkg (@EXTS) {
3411 warn "... unloading $k"; 3589 warn "... unloading $pkg";
3412 delete $INC{$k};
3413 3590
3414 $k =~ s/\.pm$//;
3415 $k =~ s/\//::/g;
3416
3417 if (my $cb = $k->can ("unload_module")) { 3591 if (my $cb = $pkg->can ("unload")) {
3592 eval {
3418 $cb->(); 3593 $cb->($pkg);
3594 1
3595 } or warn "$pkg unloaded, but with errors: $@";
3596 }
3597
3598 warn "... clearing $pkg";
3599 clear_package $pkg;
3419 } 3600 }
3420 3601
3421 Symbol::delete_package $k; 3602 warn "unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605
3606 warn "... unloading $k";
3607 delete $INC{$k};
3608
3609 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g;
3611
3612 if (my $cb = $k->can ("unload_module")) {
3613 $cb->();
3614 }
3615
3616 clear_package $k;
3422 } 3617 }
3423 3618
3424 warn "getting rid of safe::, as good as possible"; 3619 warn "getting rid of safe::, as good as possible";
3425 Symbol::delete_package "safe::$_" 3620 clear_package "safe::$_"
3426 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3427 3622
3428 warn "unloading cf.pm \"a bit\""; 3623 warn "unloading cf.pm \"a bit\"";
3429 delete $INC{"cf.pm"}; 3624 delete $INC{"cf.pm"};
3430 delete $INC{"cf/pod.pm"}; 3625 delete $INC{"cf/pod.pm"};
3431 3626
3432 # don't, removes xs symbols, too, 3627 # don't, removes xs symbols, too,
3433 # and global variables created in xs 3628 # and global variables created in xs
3434 #Symbol::delete_package __PACKAGE__; 3629 #clear_package __PACKAGE__;
3435 3630
3436 warn "unload completed, starting to reload now"; 3631 warn "unload completed, starting to reload now";
3437 3632
3438 warn "reloading cf.pm"; 3633 warn "reloading cf.pm";
3439 require cf; 3634 require cf;
3440 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3441 3636
3442 warn "loading config and database again"; 3637 warn "loading config and database again";
3443 cf::reload_config; 3638 cf::reload_config;
3444 3639
3445 warn "loading extensions"; 3640 warn "loading extensions";
3446 cf::load_extensions; 3641 cf::load_extensions;
3447 3642
3448 warn "reattaching attachments to objects/players"; 3643 warn "reattaching attachments to objects/players";
3449 _global_reattach; # objects, sockets 3644 _global_reattach; # objects, sockets
3450 warn "reattaching attachments to maps"; 3645 warn "reattaching attachments to maps";
3451 reattach $_ for values %MAP; 3646 reattach $_ for values %MAP;
3452 warn "reattaching attachments to players"; 3647 warn "reattaching attachments to players";
3453 reattach $_ for values %PLAYER; 3648 reattach $_ for values %PLAYER;
3454 3649
3455 warn "leaving sync_job"; 3650 warn "leaving sync_job";
3456 3651
3457 1 3652 1
3458 } or do { 3653 } or do {
3459 warn $@; 3654 warn $@;
3460 warn "error while reloading, exiting."; 3655 cf::cleanup "error while reloading, exiting.";
3461 exit 1;
3462 }; 3656 };
3463 3657
3464 warn "reloaded"; 3658 warn "reloaded";
3659 --$RELOAD;
3660 }
3465}; 3661};
3466 3662
3467our $RELOAD_WATCHER; # used only during reload 3663our $RELOAD_WATCHER; # used only during reload
3468 3664
3469sub reload_perl() { 3665sub reload_perl() {
3470 # doing reload synchronously and two reloads happen back-to-back, 3666 # doing reload synchronously and two reloads happen back-to-back,
3471 # coro crashes during coro_state_free->destroy here. 3667 # coro crashes during coro_state_free->destroy here.
3472 3668
3473 $RELOAD_WATCHER ||= Event->timer ( 3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3474 reentrant => 0,
3475 after => 0,
3476 data => WF_AUTOCANCEL,
3477 cb => sub {
3478 do_reload_perl; 3670 do_reload_perl;
3479 undef $RELOAD_WATCHER; 3671 undef $RELOAD_WATCHER;
3480 },
3481 ); 3672 };
3482} 3673}
3483 3674
3484register_command "reload" => sub { 3675register_command "reload" => sub {
3485 my ($who, $arg) = @_; 3676 my ($who, $arg) = @_;
3486 3677
3499 3690
3500our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3501our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3502 3693
3503sub wait_for_tick { 3694sub wait_for_tick {
3504 return unless $TICK_WATCHER->is_active;
3505 return if $Coro::current == $Coro::main; 3695 return if tick_inhibit || $Coro::current == $Coro::main;
3506 3696
3507 my $signal = new Coro::Signal; 3697 my $signal = new Coro::Signal;
3508 push @WAIT_FOR_TICK, $signal; 3698 push @WAIT_FOR_TICK, $signal;
3509 $signal->wait; 3699 $signal->wait;
3510} 3700}
3511 3701
3512sub wait_for_tick_begin { 3702sub wait_for_tick_begin {
3513 return unless $TICK_WATCHER->is_active;
3514 return if $Coro::current == $Coro::main; 3703 return if tick_inhibit || $Coro::current == $Coro::main;
3515 3704
3516 my $signal = new Coro::Signal; 3705 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK_BEGIN, $signal; 3706 push @WAIT_FOR_TICK_BEGIN, $signal;
3518 $signal->wait; 3707 $signal->wait;
3519} 3708}
3520 3709
3521$TICK_WATCHER = Event->timer ( 3710sub tick {
3522 reentrant => 0,
3523 parked => 1,
3524 prio => 0,
3525 at => $NEXT_TICK || $TICK,
3526 data => WF_AUTOCANCEL,
3527 cb => sub {
3528 if ($Coro::current != $Coro::main) { 3711 if ($Coro::current != $Coro::main) {
3529 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3712 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3530 unless ++$bug_warning > 10; 3713 unless ++$bug_warning > 10;
3531 return; 3714 return;
3532 } 3715 }
3533 3716
3534 $NOW = $tick_start = Event::time;
3535
3536 cf::server_tick; # one server iteration 3717 cf::server_tick; # one server iteration
3537 3718
3538 $RUNTIME += $TICK;
3539 $NEXT_TICK += $TICK;
3540
3541 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3719 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3542 $NEXT_RUNTIME_WRITE = $NOW + 10; 3720 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3543 Coro::async_pool { 3721 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver"; 3722 $Coro::current->{desc} = "runtime saver";
3545 write_runtime 3723 write_runtime_sync
3546 or warn "ERROR: unable to write runtime file: $!"; 3724 or warn "ERROR: unable to write runtime file: $!";
3547 };
3548 } 3725 };
3726 }
3549 3727
3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3728 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3551 $sig->send; 3729 $sig->send;
3552 } 3730 }
3553 while (my $sig = shift @WAIT_FOR_TICK) { 3731 while (my $sig = shift @WAIT_FOR_TICK) {
3554 $sig->send; 3732 $sig->send;
3555 } 3733 }
3556 3734
3557 $NOW = Event::time; 3735 $LOAD = ($NOW - $TICK_START) / $TICK;
3558
3559 # if we are delayed by four ticks or more, skip them all
3560 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3561
3562 $TICK_WATCHER->at ($NEXT_TICK);
3563 $TICK_WATCHER->start;
3564
3565 $LOAD = ($NOW - $tick_start) / $TICK;
3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3736 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3567 3737
3568 _post_tick; 3738 if (0) {
3739 if ($NEXT_TICK) {
3740 my $jitter = $TICK_START - $NEXT_TICK;
3741 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3742 warn "jitter $JITTER\n";#d#
3743 }
3569 }, 3744 }
3570); 3745}
3571 3746
3572{ 3747{
3748 # configure BDB
3749
3573 BDB::min_parallel 8; 3750 BDB::min_parallel 8;
3574 BDB::max_poll_time $TICK * 0.1; 3751 BDB::max_poll_reqs $TICK * 0.1;
3575 $BDB_POLL_WATCHER = Event->io ( 3752 $AnyEvent::BDB::WATCHER->priority (1);
3576 reentrant => 0,
3577 fd => BDB::poll_fileno,
3578 poll => 'r',
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => \&BDB::poll_cb,
3582 );
3583
3584 BDB::set_sync_prepare {
3585 my $status;
3586 my $current = $Coro::current;
3587 (
3588 sub {
3589 $status = $!;
3590 $current->ready; undef $current;
3591 },
3592 sub {
3593 Coro::schedule while defined $current;
3594 $! = $status;
3595 },
3596 )
3597 };
3598 3753
3599 unless ($DB_ENV) { 3754 unless ($DB_ENV) {
3600 $DB_ENV = BDB::db_env_create; 3755 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3756 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3602 | BDB::LOG_AUTOREMOVE, 1); 3757 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3758 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3759 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3760 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3605 3761
3606 cf::sync_job { 3762 cf::sync_job {
3607 eval { 3763 eval {
3617 3773
3618 cf::cleanup "db_env_open(db): $@" if $@; 3774 cf::cleanup "db_env_open(db): $@" if $@;
3619 }; 3775 };
3620 } 3776 }
3621 3777
3622 $BDB_DEADLOCK_WATCHER = Event->timer ( 3778 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3779 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 ); 3780 };
3632 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3781 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3782 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 ); 3783 };
3642 $BDB_TRICKLE_WATCHER = Event->timer ( 3784 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3785 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 ); 3786 };
3652} 3787}
3653 3788
3654{ 3789{
3790 # configure IO::AIO
3791
3655 IO::AIO::min_parallel 8; 3792 IO::AIO::min_parallel 8;
3656
3657 undef $Coro::AIO::WATCHER;
3658 IO::AIO::max_poll_time $TICK * 0.1; 3793 IO::AIO::max_poll_time $TICK * 0.1;
3659 $AIO_POLL_WATCHER = Event->io ( 3794 undef $AnyEvent::AIO::WATCHER;
3660 reentrant => 0,
3661 data => WF_AUTOCANCEL,
3662 fd => IO::AIO::poll_fileno,
3663 poll => 'r',
3664 prio => 0,
3665 cb => \&IO::AIO::poll_cb,
3666 );
3667} 3795}
3668 3796
3669my $_log_backtrace; 3797my $_log_backtrace;
3670 3798
3671sub _log_backtrace { 3799sub _log_backtrace {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines