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.397 by root, Mon Nov 19 15:47:14 2007 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 2009 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 qw(vars subs);
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use EV; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
37use Guard ();
15use Coro 4.1 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5; 56use Digest::MD5;
30use Fcntl; 57use Fcntl;
31use YAML::Syck (); 58use YAML ();
32use IO::AIO 2.51 (); 59use IO::AIO ();
33use Time::HiRes; 60use Time::HiRes;
34use Compress::LZF; 61use Compress::LZF;
35use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
36 65
37# configure various modules to our taste 66# configure various modules to our taste
38# 67#
39$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 76
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 77# strictly for debugging
44$YAML::Syck::ImplicitUnicode = 1; 78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 79
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 81
50our %COMMAND = (); 82our %COMMAND = ();
51our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
54our %EXTCMD = (); 86our %EXTCMD = ();
55our %EXTICMD = (); 87our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
58 90
59our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 92our @EVENT;
61 93
62our $CONFDIR = confdir; 94our $CONFDIR = confdir;
63our $DATADIR = datadir; 95our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 97our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 98our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 99our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 100our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 102our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 103our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 104our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime";
107
108our %RESOURCE;
73 109
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 112our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
81 114
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 118our $DB_ENV;
87 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
88our %CFG; 122our %CFG;
89 123
90our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 125our $RUNTIME;
126our $NOW;
92 127
93our (%PLAYER, %PLAYER_LOADING); # all users 128our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 129our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 130our $LINK_MAP; # the special {link} map, which is always available
96 131
97# used to convert map paths into valid unix filenames by replacing / by ∕ 132# used to convert map paths into valid unix filenames by replacing / by ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 133our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 134
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
137our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
103 144
104binmode STDOUT; 145binmode STDOUT;
105binmode STDERR; 146binmode STDERR;
106 147
107# read virtual server time, if available 148# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
112} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
113 156
114mkdir $_ 157mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 159
117our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
192 235
193 LOG llevError, $msg; 236 LOG llevError, $msg;
194 }; 237 };
195} 238}
239
240$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "=="
242
243 if ($Coro::current == $Coro::main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d#
246 }#d#
247
248 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate
251};
252
253$SIG{__DIE__} = sub { }; #d#?
196 254
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 265for my $pkg (qw(
208 cf::global cf::attachable 266 cf::global cf::attachable
209 cf::object cf::object::player 267 cf::object cf::object::player
210 cf::client cf::player 268 cf::client cf::player
211 cf::arch cf::living 269 cf::arch cf::living
270 cf::map cf::mapspace
212 cf::map cf::party cf::region 271 cf::party cf::region
213)) { 272)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 274}
217 275
218$EV::DIED = sub { 276$EV::DIED = sub {
219 warn "error in event callback: @_"; 277 warn "error in event callback: @_";
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 304 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 305 $d
248 } || "[unable to dump $_[0]: '$@']"; 306 } || "[unable to dump $_[0]: '$@']";
249} 307}
250 308
251=item $ref = cf::from_json $json 309=item $ref = cf::decode_json $json
252 310
253Converts a JSON string into the corresponding perl data structure. 311Converts a JSON string into the corresponding perl data structure.
254 312
255=item $json = cf::to_json $ref 313=item $json = cf::encode_json $ref
256 314
257Converts a perl data structure into its JSON representation. 315Converts a perl data structure into its JSON representation.
258 316
259=cut 317=cut
260 318
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 320
263sub to_json ($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 322sub decode_json($) { $json_coder->decode ($_[0]) }
323
324=item cf::post_init { BLOCK }
325
326Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again.
328
329The cdoeblock will have a single boolean argument to indicate whether this
330is a reload or not.
331
332=cut
333
334sub post_init(&) {
335 push @POST_INIT, shift;
336}
265 337
266=item cf::lock_wait $string 338=item cf::lock_wait $string
267 339
268Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
269 341
270=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
271 343
272Wait until the given lock is available and then acquires it and returns 344Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 345a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
275returned. 347returned.
276 348
277Locks are *not* recursive, locking from the same coro twice results in a 349Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 350deadlocked coro.
284 356
285Return true if the lock is currently active, i.e. somebody has locked it. 357Return true if the lock is currently active, i.e. somebody has locked it.
286 358
287=cut 359=cut
288 360
289our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 362
292sub lock_wait($) { 363sub lock_wait($) {
293 my ($key) = @_; 364 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 365}
306 366
307sub lock_acquire($) { 367sub lock_acquire($) {
308 my ($key) = @_; 368 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 369}
322 370
323sub lock_active($) { 371sub lock_active($) {
324 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 373}
328 374
329sub freeze_mainloop { 375sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 376 tick_inhibit_inc;
331 377
332 my $guard = Coro::guard { 378 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 379}
338 380
339=item cf::periodic $interval, $cb 381=item cf::periodic $interval, $cb
340 382
341Like EV::periodic, but randomly selects a starting point so that the actions 383Like EV::periodic, but randomly selects a starting point so that the actions
396 } 438 }
397 } 439 }
398}; 440};
399 441
400sub get_slot($;$$) { 442sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main;
444
401 my ($time, $pri, $name) = @_; 445 my ($time, $pri, $name) = @_;
402 446
403 $time = $TICK * .6 if $time > $TICK * .6; 447 $time = $TICK * .6 if $time > $TICK * .6;
404 my $sig = new Coro::Signal; 448 my $sig = new Coro::Signal;
405 449
442 # this is the main coro, too bad, we have to block 486 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 487 # till the operation succeeds, freezing the server :/
444 488
445 LOG llevError, Carp::longmess "sync job";#d# 489 LOG llevError, Carp::longmess "sync job";#d#
446 490
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 491 my $freeze_guard = freeze_mainloop;
450 492
451 my $busy = 1; 493 my $busy = 1;
452 my @res; 494 my @res;
453 495
464 } else { 506 } else {
465 EV::loop EV::LOOP_ONESHOT; 507 EV::loop EV::LOOP_ONESHOT;
466 } 508 }
467 } 509 }
468 510
469 $time = EV::time - $time; 511 my $time = EV::time - $time;
470 512
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 513 $TICK_START += $time; # do not account sync jobs to server load
475 514
476 wantarray ? @res : $res[0] 515 wantarray ? @res : $res[0]
477 } else { 516 } else {
478 # we are in another coroutine, how wonderful, everything just works 517 # we are in another coroutine, how wonderful, everything just works
479 518
521 reset_signals; 560 reset_signals;
522 &$cb 561 &$cb
523 }, @args; 562 }, @args;
524 563
525 wantarray ? @res : $res[-1] 564 wantarray ? @res : $res[-1]
565}
566
567=item $coin = coin_from_name $name
568
569=cut
570
571our %coin_alias = (
572 "silver" => "silvercoin",
573 "silvercoin" => "silvercoin",
574 "silvercoins" => "silvercoin",
575 "gold" => "goldcoin",
576 "goldcoin" => "goldcoin",
577 "goldcoins" => "goldcoin",
578 "platinum" => "platinacoin",
579 "platinumcoin" => "platinacoin",
580 "platinumcoins" => "platinacoin",
581 "platina" => "platinacoin",
582 "platinacoin" => "platinacoin",
583 "platinacoins" => "platinacoin",
584 "royalty" => "royalty",
585 "royalties" => "royalty",
586);
587
588sub coin_from_name($) {
589 $coin_alias{$_[0]}
590 ? cf::arch::find $coin_alias{$_[0]}
591 : undef
526} 592}
527 593
528=item $value = cf::db_get $family => $key 594=item $value = cf::db_get $family => $key
529 595
530Returns a single value from the environment database. 596Returns a single value from the environment database.
669 735
670############################################################################# 736#############################################################################
671 737
672=head2 ATTACHABLE OBJECTS 738=head2 ATTACHABLE OBJECTS
673 739
674Many objects in crossfire are so-called attachable objects. That means you can 740Many objects in deliantra are so-called attachable objects. That means you can
675attach callbacks/event handlers (a collection of which is called an "attachment") 741attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 742to it. All such attachable objects support the following methods.
677 743
678In the following description, CLASS can be any of C<global>, C<object> 744In the following description, CLASS can be any of C<global>, C<object>
679C<player>, C<client> or C<map> (i.e. the attachable objects in 745C<player>, C<client> or C<map> (i.e. the attachable objects in
729=item cf::CLASS::attachment $name, ... 795=item cf::CLASS::attachment $name, ...
730 796
731Register an attachment by C<$name> through which attachable objects of the 797Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 798given CLASS can refer to this attachment.
733 799
734Some classes such as crossfire maps and objects can specify attachments 800Some classes such as deliantra maps and objects can specify attachments
735that are attached at load/instantiate time, thus the need for a name. 801that are attached at load/instantiate time, thus the need for a name.
736 802
737These calls expect any number of the following handler/hook descriptions: 803These calls expect any number of the following handler/hook descriptions:
738 804
739=over 4 805=over 4
967 } 1033 }
968 1034
969 0 1035 0
970} 1036}
971 1037
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1038=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1039
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1040=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1041
976Generate an object-specific event with the given arguments. 1042Generate an object-specific event with the given arguments.
977 1043
1030 1096
1031sub reattach { 1097sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1098 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1099 my ($obj) = @_;
1034 1100
1101 # no longer needed after getting rid of delete_package?
1035 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1102 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1036 1103
1037 my $registry = $obj->registry; 1104 my $registry = $obj->registry;
1038 1105
1039 @$registry = (); 1106 @$registry = ();
1040 1107
1055cf::attachable->attach ( 1122cf::attachable->attach (
1056 prio => -1000000, 1123 prio => -1000000,
1057 on_instantiate => sub { 1124 on_instantiate => sub {
1058 my ($obj, $data) = @_; 1125 my ($obj, $data) = @_;
1059 1126
1060 $data = from_json $data; 1127 $data = decode_json $data;
1061 1128
1062 for (@$data) { 1129 for (@$data) {
1063 my ($name, $args) = @$_; 1130 my ($name, $args) = @$_;
1064 1131
1065 $obj->attach ($name, %{$args || {} }); 1132 $obj->attach ($name, %{$args || {} });
1086 utf8::decode (my $decname = $filename); 1153 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1154 warn sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1089 1156
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1158 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1160 if ($cf::USE_FSYNC) {
1161 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1162 aio_fsync $fh;
1163 }
1094 close $fh; 1164 aio_close $fh;
1095 1165
1096 if (@$objs) { 1166 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1167 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1168 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1171 if ($cf::USE_FSYNC) {
1172 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1173 aio_fsync $fh;
1174 }
1102 close $fh; 1175 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1177 }
1105 } else { 1178 } else {
1106 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1107 } 1180 }
1108 1181
1109 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1186 } else {
1111 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1112 } 1188 }
1113 } else { 1189 } else {
1114 aio_unlink $filename; 1190 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1116 } 1192 }
1207 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1208 1284
1209 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1210} 1286}
1211 1287
1288use File::Glob ();
1289
1212cf::player->attach ( 1290cf::player->attach (
1213 on_command => sub { 1291 on_command => sub {
1214 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1215 1293
1216 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
1248 1326
1249 cf::override; 1327 cf::override;
1250 }, 1328 },
1251); 1329);
1252 1330
1331# "readahead" all extensions
1332sub cache_extensions {
1333 my $grp = IO::AIO::aio_group;
1334
1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1336 for (grep /\.ext$/, @{$_[0]}) {
1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1338 }
1339 };
1340
1341 $grp
1342}
1343
1253sub load_extensions { 1344sub load_extensions {
1254 cf::sync_job { 1345 cf::sync_job {
1255 my %todo; 1346 my %todo;
1256 1347
1257 for my $path (<$LIBDIR/*.ext>) { 1348 for my $path (<$LIBDIR/*.ext>) {
1276 1367
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1370
1280 $ext{source} = 1371 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1282 . "#line 1 \"$path\"\n{\n" 1373 . "#line 1 \"$path\"\n{\n"
1283 . $source 1374 . $source
1284 . "\n};\n1"; 1375 . "\n};\n1";
1285 1376
1286 $todo{$base} = \%ext; 1377 $todo{$base} = \%ext;
1302 my $msg = $@ ? "$v->{path}: $@\n" 1393 my $msg = $@ ? "$v->{path}: $@\n"
1303 : "$v->{base}: extension inactive.\n"; 1394 : "$v->{base}: extension inactive.\n";
1304 1395
1305 if (exists $v->{meta}{mandatory}) { 1396 if (exists $v->{meta}{mandatory}) {
1306 warn $msg; 1397 warn $msg;
1307 warn "mandatory extension failed to load, exiting.\n"; 1398 cf::cleanup "mandatory extension failed to load, exiting.";
1308 exit 1;
1309 } 1399 }
1310 1400
1311 warn $msg; 1401 warn $msg;
1312 } 1402 }
1313 1403
1327 1417
1328=back 1418=back
1329 1419
1330=head2 CORE EXTENSIONS 1420=head2 CORE EXTENSIONS
1331 1421
1332Functions and methods that extend core crossfire objects. 1422Functions and methods that extend core deliantra objects.
1333 1423
1334=cut 1424=cut
1335 1425
1336package cf::player; 1426package cf::player;
1337 1427
1380 1470
1381sub exists($) { 1471sub exists($) {
1382 my ($login) = @_; 1472 my ($login) = @_;
1383 1473
1384 $cf::PLAYER{$login} 1474 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1475 or !aio_stat path $login
1386} 1476}
1387 1477
1388sub find($) { 1478sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1479 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1480 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1492 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1493 or return;
1404 1494
1405 my $pl = cf::player::load_pl $f 1495 my $pl = cf::player::load_pl $f
1406 or return; 1496 or return;
1497
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1498 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1499 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1500 $cf::PLAYER{$login} = $pl
1410 } 1501 }
1411 } 1502 }
1421 1512
1422 return if $pl->{deny_save}; 1513 return if $pl->{deny_save};
1423 1514
1424 aio_mkdir playerdir $pl, 0770; 1515 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1516 $pl->{last_save} = $cf::RUNTIME;
1517
1518 cf::get_slot 0.01;
1426 1519
1427 $pl->save_pl ($path); 1520 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1521 cf::cede_to_tick;
1429} 1522}
1430 1523
1462 my ($pl) = @_; 1555 my ($pl) = @_;
1463 1556
1464 my $name = $pl->ob->name; 1557 my $name = $pl->ob->name;
1465 1558
1466 $pl->{deny_save} = 1; 1559 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1468 1561
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1563 $pl->deactivate;
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1566 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1567 $pl->ns->destroy if $pl->ns;
1473 1568
1474 my $path = playerdir $pl; 1569 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1570 my $temp = "$path~$cf::RUNTIME~deleting~";
1514 1609
1515 for my $login (@$dirs) { 1610 for my $login (@$dirs) {
1516 my $path = path $login; 1611 my $path = path $login;
1517 1612
1518 # a .pst is a dead give-away for a valid player 1613 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1614 # if no pst file found, open and chekc for blocked users
1615 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1616 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1617 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1618 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1619 }
1524 1620
1555 } 1651 }
1556 1652
1557 \@paths 1653 \@paths
1558} 1654}
1559 1655
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1656=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1657
1562Expand crossfire pod fragments into protocol xml. 1658Expand deliantra pod fragments into protocol xml.
1563
1564=cut
1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1577sub expand_cfpod {
1578 my ($self, $pod) = @_;
1579
1580 my $xml;
1581
1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1585
1586 $group =~ s/&/&amp;/g;
1587 $group =~ s/</&lt;/g;
1588
1589 $xml .= $group;
1590 } elsif ($pod =~ m%\G
1591 ([BCGHITU])
1592 <
1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1631
1632 for ($xml) {
1633 # create single paragraphs (very hackish)
1634 s/(?<=\S)\n(?=\w)/ /g;
1635
1636 # compress some whitespace
1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652 1659
1653=item $player->ext_reply ($msgid, @msg) 1660=item $player->ext_reply ($msgid, @msg)
1654 1661
1655Sends an ext reply to the player. 1662Sends an ext reply to the player.
1656 1663
1723our $MAX_RESET = 3600; 1730our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1731our $DEFAULT_RESET = 3000;
1725 1732
1726sub generate_random_map { 1733sub generate_random_map {
1727 my ($self, $rmp) = @_; 1734 my ($self, $rmp) = @_;
1735
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737
1728 # mit "rum" bekleckern, nicht 1738 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1739 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1854 1864
1855# the temporary/swap location 1865# the temporary/swap location
1856sub save_path { 1866sub save_path {
1857 my ($self) = @_; 1867 my ($self) = @_;
1858 1868
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1870 "$TMPDIR/$path.map"
1861} 1871}
1862 1872
1863# the unique path, undef == no special unique path 1873# the unique path, undef == no special unique path
1864sub uniq_path { 1874sub uniq_path {
1865 my ($self) = @_; 1875 my ($self) = @_;
1866 1876
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1869}
1870
1871# and all this just because we cannot iterate over
1872# all maps in C++...
1873sub change_all_map_light {
1874 my ($change) = @_;
1875
1876 $_->change_map_light ($change)
1877 for grep $_->outdoor, values %cf::MAP;
1878} 1879}
1879 1880
1880sub decay_objects { 1881sub decay_objects {
1881 my ($self) = @_; 1882 my ($self) = @_;
1882 1883
1966sub find { 1967sub find {
1967 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1968 1969
1969 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1970 1971
1971 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1973 1974
1974 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1978 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
1979 or return; 1977 or return;
1980 1978
1981 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
1982 1980
1984 or return; 1982 or return;
1985 1983
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1984 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 1985 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 1986 #$cf::WAIT_FOR_TICK->wait;
1987 undef $guard2;
1989 undef $guard1; 1988 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 1989 $map->reset;
1992 return find $path; 1990 return find $path;
1993 } 1991 }
1994 1992
1995 $cf::MAP{$path} = $map 1993 $cf::MAP{$path} = $map
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2020 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2021 $f->skip_block;
2024 $self->_load_objects ($f) 2022 $self->_load_objects ($f)
2025 or return; 2023 or return;
2026 2024
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2025 $self->post_load_original
2028 if delete $self->{load_original}; 2026 if delete $self->{load_original};
2029 2027
2030 if (my $uniq = $self->uniq_path) { 2028 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2029 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2030 unless (aio_stat $uniq) {
2050 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2049 $self->decay_objects;
2052 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2053 $self->update_buttons; 2051 $self->update_buttons;
2054 cf::cede_to_tick; 2052 cf::cede_to_tick;
2055 $self->set_darkness_map;
2056 cf::cede_to_tick;
2057 $self->activate; 2053 $self->activate;
2058 } 2054 }
2059 2055
2060 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2057 $self->last_access ($cf::RUNTIME);
2062 2058
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2059 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2060 }
2065 2061
2066 $self->post_load; 2062 $self->post_load;
2067} 2063}
2068 2064
2126 my ($path, $origin, $load) = @_; 2122 my ($path, $origin, $load) = @_;
2127 2123
2128 $path = normalise $path, $origin && $origin->{path}; 2124 $path = normalise $path, $origin && $origin->{path};
2129 2125
2130 if (my $map = $cf::MAP{$path}) { 2126 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2128 }
2133 2129
2134 $MAP_PREFETCH{$path} |= $load; 2130 $MAP_PREFETCH{$path} |= $load;
2135 2131
2136 $MAP_PREFETCHER ||= cf::async { 2132 $MAP_PREFETCHER ||= cf::async {
2173 cf::async { 2169 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2170 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2171 $_->contr->save for $self->players;
2176 }; 2172 };
2177 2173
2174 cf::get_slot 0.02;
2175
2178 if ($uniq) { 2176 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2178 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2179 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2190 $self->save; 2188 $self->save;
2191 2189
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2191
2194 return if $self->players; 2192 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY; 2193 return if $self->in_memory != cf::MAP_ACTIVE;
2196 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2197 2195
2198 $self->in_memory (cf::MAP_SWAPPED); 2196 $self->in_memory (cf::MAP_SWAPPED);
2199 2197
2200 $self->deactivate; 2198 $self->deactivate;
2318 2316
2319sub unique_maps() { 2317sub unique_maps() {
2320 [ 2318 [
2321 map { 2319 map {
2322 utf8::decode $_; 2320 utf8::decode $_;
2323 /\.map$/ 2321 s/\.map$//; # TODO future compatibility hack
2322 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2323 ? ()
2324 ? normalise $_ 2324 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2325 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2326 ]
2328} 2327}
2329 2328
2330package cf;
2331
2332=back 2329=back
2333 2330
2334=head3 cf::object 2331=head3 cf::object
2335 2332
2336=cut 2333=cut
2339 2336
2340=over 4 2337=over 4
2341 2338
2342=item $ob->inv_recursive 2339=item $ob->inv_recursive
2343 2340
2344Returns the inventory of the object _and_ their inventories, recursively. 2341Returns the inventory of the object I<and> their inventories, recursively,
2342but I<not> the object itself.
2345 2343
2346=cut 2344=cut
2347 2345
2348sub inv_recursive_; 2346sub inv_recursive_;
2349sub inv_recursive_ { 2347sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2352 inv_recursive_ inv $_[0]
2355} 2353}
2356 2354
2357=item $ref = $ob->ref 2355=item $ref = $ob->ref
2358 2356
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2357Creates and returns a persistent reference to an object that can be stored as a string.
2360 2358
2361=item $ob = cf::object::deref ($refstring) 2359=item $ob = cf::object::deref ($refstring)
2362 2360
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2361returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2362even if the object actually exists. May block.
2396can be C<undef>. Does the right thing when the player is currently in a 2394can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2395dialogue with the given NPC character.
2398 2396
2399=cut 2397=cut
2400 2398
2399our $SAY_CHANNEL = {
2400 id => "say",
2401 title => "Map",
2402 reply => "say ",
2403 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2404};
2405
2406our $CHAT_CHANNEL = {
2407 id => "chat",
2408 title => "Chat",
2409 reply => "chat ",
2410 tooltip => "Player chat and shouts, global to the server.",
2411};
2412
2401# rough implementation of a future "reply" method that works 2413# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2414# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2415#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2416sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2417 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2428 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2429 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2430
2419 } else { 2431 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2432 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2433 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2434 }
2423 } 2435 }
2424} 2436}
2425 2437
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2438=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2463
2452=item $player_object->enter_link 2464=item $player_object->enter_link
2453 2465
2454Freezes the player and moves him/her to a special map (C<{link}>). 2466Freezes the player and moves him/her to a special map (C<{link}>).
2455 2467
2456The player should be reasonably safe there for short amounts of time. You 2468The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2469for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link
2471map.
2458 2472
2459Will never block. 2473Will never block.
2460 2474
2461=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2462 2476
2520 2534
2521 $map->load; 2535 $map->load;
2522 $map->load_neighbours; 2536 $map->load_neighbours;
2523 2537
2524 return unless $self->contr->active; 2538 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive; 2540 $self->activate_recursive;
2526 2541
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2543 $self->enter_map ($map, $x, $y);
2529} 2544}
2533Moves the player to the given map-path and coordinates by first freezing 2548Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2549her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2550that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2551the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2552be called at the end of this process.
2553
2554Note that $check will be called with a potentially non-loaded map, so if
2555it needs a loaded map it has to call C<< ->load >>.
2538 2556
2539=cut 2557=cut
2540 2558
2541our $GOTOGEN; 2559our $GOTOGEN;
2542 2560
2621} 2639}
2622 2640
2623sub prepare_random_map { 2641sub prepare_random_map {
2624 my ($exit) = @_; 2642 my ($exit) = @_;
2625 2643
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2644 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2645 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2646 # that depends on the exit object
2631 2647
2632 my $rmp = parse_random_map_params $exit->msg; 2648 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2650 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2651 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2652 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2653 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2654 $rmp->{origin_y} = $exit->y;
2655
2656 $exit->map->touch;
2639 } 2657 }
2640 2658
2641 $rmp->{random_seed} ||= $exit->random_seed; 2659 $rmp->{random_seed} ||= $exit->random_seed;
2642 2660
2643 my $data = cf::to_json $rmp; 2661 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2662 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2663 my $meta = "$RANDOMDIR/$md5.meta";
2646 2664
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2665 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2666 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2667 undef $fh;
2650 aio_rename "$meta~", $meta; 2668 aio_rename "$meta~", $meta;
2651 2669
2670 my $slaying = "?random/$md5";
2671
2672 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2673 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2674 $exit->msg (undef);
2675 }
2654 } 2676 }
2655} 2677}
2656 2678
2657sub cf::object::player::enter_exit { 2679sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2680 my ($self, $exit) = @_;
2659 2681
2660 return unless $self->type == cf::PLAYER; 2682 return unless $self->type == cf::PLAYER;
2661 2683
2662 if ($exit->slaying eq "/!") {
2663 #TODO: this should de-fi-ni-te-ly not be a sync-job
2664 # the problem is that $exit might not survive long enough
2665 # so it needs to be done right now, right here
2666 cf::sync_job { prepare_random_map $exit };
2667 }
2668
2669 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2670 my $hp = $exit->stats->hp;
2671 my $sp = $exit->stats->sp;
2672
2673 $self->enter_link; 2684 $self->enter_link;
2674 2685
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2679 (async { 2686 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2687 $Coro::current->{desc} = "enter_exit";
2681 2688
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2689 unless (eval {
2690 $self->deactivate_recursive; # just to be sure
2691
2692 # random map handling
2693 {
2694 my $guard = cf::lock_acquire "exit_prepare:$exit";
2695
2696 prepare_random_map $exit
2697 if $exit->slaying eq "/!";
2698 }
2699
2700 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2701 my $x = $exit->stats->hp;
2702 my $y = $exit->stats->sp;
2703
2684 $self->goto ($slaying, $hp, $sp); 2704 $self->goto ($map, $x, $y);
2685 2705
2706 # if exit is damned, update players death & WoR home-position
2707 $self->contr->savebed ($map, $x, $y)
2708 if $exit->flag (cf::FLAG_DAMNED);
2709
2686 1; 2710 1
2687 }) { 2711 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2712 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 2713 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2714 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2715 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2716
2693 warn "ERROR in enter_exit: $@"; 2717 warn "ERROR in enter_exit: $@";
2759 id => "infobox", 2783 id => "infobox",
2760 title => "Body Parts", 2784 title => "Body Parts",
2761 reply => undef, 2785 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2786 tooltip => "Shows which body parts you posess and are available",
2763 }, 2787 },
2788 "c/statistics" => {
2789 id => "infobox",
2790 title => "Statistics",
2791 reply => undef,
2792 tooltip => "Shows your primary statistics",
2793 },
2794 "c/skills" => {
2795 id => "infobox",
2796 title => "Skills",
2797 reply => undef,
2798 tooltip => "Shows your experience per skill and item power",
2799 },
2800 "c/shopitems" => {
2801 id => "infobox",
2802 title => "Shop Items",
2803 reply => undef,
2804 tooltip => "Shows the items currently for sale in this shop",
2805 },
2806 "c/resistances" => {
2807 id => "infobox",
2808 title => "Resistances",
2809 reply => undef,
2810 tooltip => "Shows your resistances",
2811 },
2812 "c/pets" => {
2813 id => "infobox",
2814 title => "Pets",
2815 reply => undef,
2816 tooltip => "Shows information abotu your pets/a specific pet",
2817 },
2818 "c/perceiveself" => {
2819 id => "infobox",
2820 title => "Perceive Self",
2821 reply => undef,
2822 tooltip => "You gained detailed knowledge about yourself",
2823 },
2764 "c/uptime" => { 2824 "c/uptime" => {
2765 id => "infobox", 2825 id => "infobox",
2766 title => "Uptime", 2826 title => "Uptime",
2767 reply => undef, 2827 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 2828 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 2831 id => "infobox",
2772 title => "Map Info", 2832 title => "Map Info",
2773 reply => undef, 2833 reply => undef,
2774 tooltip => "Information related to the maps", 2834 tooltip => "Information related to the maps",
2775 }, 2835 },
2836 "c/party" => {
2837 id => "party",
2838 title => "Party",
2839 reply => "gsay ",
2840 tooltip => "Messages and chat related to your party",
2841 },
2842 "c/death" => {
2843 id => "death",
2844 title => "Death",
2845 reply => undef,
2846 tooltip => "Reason for and more info about your most recent death",
2847 },
2848 "c/say" => $SAY_CHANNEL,
2849 "c/chat" => $CHAT_CHANNEL,
2776); 2850);
2777 2851
2778sub cf::client::send_msg { 2852sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2780 2854
2781 $msg = $self->pl->expand_cfpod ($msg); 2855 $msg = $self->pl->expand_cfpod ($msg)
2856 unless $color & cf::NDI_VERBATIM;
2782 2857
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 2858 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 2859
2785 # check predefined channels, for the benefit of C 2860 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 2861 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 2862 $channel = $CHANNEL{$channel};
2788 2863
2789 $self->ext_msg (channel_info => $channel) 2864 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 2865 $channel = $channel->{id};
2793 2866
2794 } elsif (ref $channel) { 2867 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 2871 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 2872 }
2801 2873
2802 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2803 } 2875 }
2804 2876
2805 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2806 2878
2807 if ($self->can_msg) {
2808 # default colour, mask it out 2879 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2811 2882
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2883 my $pkt = "msg "
2884 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 2886 );
2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825 2887
2826 $color &= cf::NDI_COLOR_MASK; 2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2827 2891
2828 utf8::encode $msg; 2892 # split very large packets
2829 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2830 if (0 && $msg =~ /\[/) { 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2831 # COMMAND/INFO 2895 $pkt = "frag";
2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2835 $self->send_packet ("drawinfo $color $msg")
2836 }
2837 }
2838 } 2896 }
2897
2898 $self->send_packet ($pkt);
2839} 2899}
2840 2900
2841=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2842 2902
2843Sends an ext event to the client. 2903Sends an ext event to the client.
3017 3077
3018The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
3019 3079
3020 cf::object 3080 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3081 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3082 insert remove name archname title slaying race decrease split
3083 value
3023 3084
3024 cf::object::player 3085 cf::object::player
3025 player 3086 player
3026 3087
3027 cf::player 3088 cf::player
3032 3093
3033=cut 3094=cut
3034 3095
3035for ( 3096for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3098 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3099 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3042) { 3103) {
3043 no strict 'refs'; 3104 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3062 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
3063 3124
3064 my $qcode = $code; 3125 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
3067 3130
3068 local $_; 3131 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
3070 3133
3071 my $eval = 3134 my $eval =
3148 { 3211 {
3149 my $faces = $facedata->{faceinfo}; 3212 my $faces = $facedata->{faceinfo};
3150 3213
3151 while (my ($face, $info) = each %$faces) { 3214 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3215 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216
3153 cf::face::set_visibility $idx, $info->{visibility}; 3217 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3218 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3157 3221
3158 cf::cede_to_tick; 3222 cf::cede_to_tick;
3159 } 3223 }
3160 3224
3161 while (my ($face, $info) = each %$faces) { 3225 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3226 next unless $info->{smooth};
3227
3163 my $idx = cf::face::find $face 3228 my $idx = cf::face::find $face
3164 or next; 3229 or next;
3230
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3231 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3232 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3234 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3235 warn "smooth face '$info->{smooth}' not found for face '$face'";
3187 { 3253 {
3188 # TODO: for gcfclient pleasure, we should give resources 3254 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index. 3255 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3256 my $res = $facedata->{resource};
3191 3257
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3258 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3260 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data; 3261 my $data;
3197 3262
3198 if ($info->{type} & 1) { 3263 if ($info->{type} & 1) {
3199 # prepend meta info 3264 # prepend meta info
3200 3265
3201 my $meta = $enc->encode ({ 3266 my $meta = $enc->encode ({
3202 name => $name, 3267 name => $name,
3203 %{ $info->{meta} || {} }, 3268 %{ $info->{meta} || {} },
3204 }); 3269 });
3205 3270
3206 $data = pack "(w/a*)*", $meta, $info->{data}; 3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type};
3207 } else { 3278 } else {
3208 $data = $info->{data}; 3279 $RESOURCE{$name} = $info;
3209 } 3280 }
3210 3281
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick; 3282 cf::cede_to_tick;
3215 } 3283 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3284 }
3285
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3287
3236 1 3288 1
3237} 3289}
3290
3291cf::global->attach (on_resource_update => sub {
3292 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296 my $sound = $soundconf->{compat}[$_]
3297 or next;
3298
3299 my $face = cf::face::find "sound/$sound->[1]";
3300 cf::sound::set $sound->[0] => $face;
3301 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302 }
3303
3304 while (my ($k, $v) = each %{$soundconf->{event}}) {
3305 my $face = cf::face::find "sound/$v";
3306 cf::sound::set $k => $face;
3307 }
3308 }
3309});
3238 3310
3239register_exticmd fx_want => sub { 3311register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_; 3312 my ($ns, $want) = @_;
3241 3313
3242 while (my ($k, $v) = each %$want) { 3314 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3315 $ns->fx_want ($k, $v);
3244 } 3316 }
3245}; 3317};
3318
3319sub load_resource_file($) {
3320 my $guard = lock_acquire "load_resource_file";
3321
3322 my $status = load_resource_file_ $_[0];
3323 get_slot 0.1, 100;
3324 cf::arch::commit_load;
3325
3326 $status
3327}
3246 3328
3247sub reload_regions { 3329sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3330 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3331 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3332 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3346}
3265 3347
3266sub reload_archetypes { 3348sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3349 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3350 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
3274} 3351}
3275 3352
3276sub reload_treasures { 3353sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3354 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3355 or die "unable to load treasurelists\n";
3279} 3356}
3280 3357
3281sub reload_resources { 3358sub reload_resources {
3282 warn "reloading resource files...\n"; 3359 warn "reloading resource files...\n";
3283 3360
3361 reload_facedata;
3362 reload_archetypes;
3284 reload_regions; 3363 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3364 reload_treasures;
3289 3365
3290 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
3291}
3292
3293sub init {
3294 reload_resources;
3295} 3367}
3296 3368
3297sub reload_config { 3369sub reload_config {
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3371 or return;
3300 3372
3301 local $/; 3373 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3374 *CFG = YAML::Load <$fh>;
3303 3375
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3305 3377
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3378 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3307 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3379 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3313 }; 3385 };
3314 warn $@ if $@; 3386 warn $@ if $@;
3315 } 3387 }
3316} 3388}
3317 3389
3390sub pidfile() {
3391 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392 or die "$PIDFILE: $!";
3393 flock $fh, &Fcntl::LOCK_EX
3394 or die "$PIDFILE: flock: $!";
3395 $fh
3396}
3397
3398# make sure only one server instance is running at any one time
3399sub atomic {
3400 my $fh = pidfile;
3401
3402 my $pid = <$fh>;
3403 kill 9, $pid if $pid > 0;
3404
3405 seek $fh, 0, 0;
3406 print $fh $$;
3407}
3408
3409sub main_loop {
3410 warn "EV::loop starting\n";
3411 if (1) {
3412 EV::loop;
3413 }
3414 warn "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP;
3416}
3417
3318sub main { 3418sub main {
3419 cf::init_globals; # initialise logging
3420
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432
3319 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3435 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3436 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3438 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
3326 }; 3440 };
3327 3441
3442 evthread_start IO::AIO::poll_fileno;
3443
3444 cf::sync_job {
3445 reload_resources;
3328 reload_config; 3446 reload_config;
3329 db_init; 3447 db_init;
3448
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid;
3452 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills;
3455
3456 cf::init_beforeplay;
3457
3458 atomic;
3459
3330 load_extensions; 3460 load_extensions;
3331 3461
3332 $TICK_WATCHER->start; 3462 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3463
3334 EV::loop; 3464 # no (long-running) fork's whatsoever before this point(!)
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466
3467 (pop @POST_INIT)->(0) while @POST_INIT;
3468 };
3469
3470 main_loop;
3335} 3471}
3336 3472
3337############################################################################# 3473#############################################################################
3338# initialisation and cleanup 3474# initialisation and cleanup
3339 3475
3345 cf::cleanup "SIG$signal"; 3481 cf::cleanup "SIG$signal";
3346 }; 3482 };
3347 } 3483 }
3348} 3484}
3349 3485
3350sub write_runtime { 3486sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime";
3352
3353 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3355 3489
3356 IO::AIO::aio_utime $runtime, undef, undef; 3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3491
3358 my $guard = cf::lock_acquire "write_runtime"; 3492 my $guard = cf::lock_acquire "write_runtime";
3359 3493
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3361 or return; 3495 or return;
3362 3496
3363 my $value = $cf::RUNTIME + 90 + 10; 3497 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3498 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3499 # 60 allows for the watchdog to kill the server.
3375 aio_utime $fh, undef, undef; 3509 aio_utime $fh, undef, undef;
3376 3510
3377 close $fh 3511 close $fh
3378 or return; 3512 or return;
3379 3513
3380 aio_rename "$runtime~", $runtime 3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3515 and return;
3382 3516
3383 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3384 3518
3385 1 3519 1
3520}
3521
3522our $uuid_lock;
3523our $uuid_skip;
3524
3525sub write_uuid_sync($) {
3526 $uuid_skip ||= $_[0];
3527
3528 return if $uuid_lock;
3529 local $uuid_lock = 1;
3530
3531 my $uuid = "$LOCALDIR/uuid";
3532
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return;
3535
3536 my $value = uuid_seq uuid_cur;
3537
3538 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n";
3540 return;
3541 }
3542
3543 my $value = uuid_str $value + $uuid_skip;
3544 $uuid_skip = 0;
3545
3546 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3547 and return;
3548
3549 # always fsync - this file is important
3550 aio_fsync $fh
3551 and return;
3552
3553 close $fh
3554 or return;
3555
3556 aio_rename "$uuid~", $uuid
3557 and return;
3558
3559 warn "uuid file written ($value).\n";
3560
3561 1
3562
3563}
3564
3565sub write_uuid($$) {
3566 my ($skip, $sync) = @_;
3567
3568 $sync ? write_uuid_sync $skip
3569 : async { write_uuid_sync $skip };
3386} 3570}
3387 3571
3388sub emergency_save() { 3572sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3573 my $freeze_guard = cf::freeze_mainloop;
3390 3574
3391 warn "enter emergency perl save\n"; 3575 warn "emergency_perl_save: enter\n";
3392 3576
3393 cf::sync_job { 3577 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582
3394 # use a peculiar iteration method to avoid tripping on perl 3583 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3584 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3585 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3586 warn "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3587 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3588 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3589 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3591 $pl->save;
3403 } 3592 }
3404 warn "end emergency player save\n"; 3593 warn "emergency_perl_save: end player save\n";
3405 3594
3406 warn "begin emergency map save\n"; 3595 warn "emergency_perl_save: begin map save\n";
3407 for my $path (keys %cf::MAP) { 3596 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3597 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3598 $map->valid or next;
3410 $map->save; 3599 $map->save;
3411 } 3600 }
3412 warn "end emergency map save\n"; 3601 warn "emergency_perl_save: end map save\n";
3413 3602
3414 warn "begin emergency database checkpoint\n"; 3603 warn "emergency_perl_save: begin database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3605 warn "emergency_perl_save: end database checkpoint\n";
3606
3607 warn "emergency_perl_save: begin write uuid\n";
3608 write_uuid_sync 1;
3609 warn "emergency_perl_save: end write uuid\n";
3417 }; 3610 };
3418 3611
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3419 warn "leave emergency perl save\n"; 3617 warn "emergency_perl_save: leave\n";
3420} 3618}
3421 3619
3422sub post_cleanup { 3620sub post_cleanup {
3423 my ($make_core) = @_; 3621 my ($make_core) = @_;
3424 3622
3425 warn Carp::longmess "post_cleanup backtrace" 3623 warn Carp::longmess "post_cleanup backtrace"
3426 if $make_core; 3624 if $make_core;
3625
3626 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$;
3628}
3629
3630# a safer delete_package, copied from Symbol
3631sub clear_package($) {
3632 my $pkg = shift;
3633
3634 # expand to full symbol table name if needed
3635 unless ($pkg =~ /^main::.*::$/) {
3636 $pkg = "main$pkg" if $pkg =~ /^::/;
3637 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3638 $pkg .= '::' unless $pkg =~ /::$/;
3639 }
3640
3641 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3642 my $stem_symtab = *{$stem}{HASH};
3643
3644 defined $stem_symtab and exists $stem_symtab->{$leaf}
3645 or return;
3646
3647 # clear all symbols
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 }
3653 warn "cleared package $pkg\n";#d#
3427} 3654}
3428 3655
3429sub do_reload_perl() { 3656sub do_reload_perl() {
3430 # can/must only be called in main 3657 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3658 if ($Coro::current != $Coro::main) {
3432 warn "can only reload from main coroutine"; 3659 warn "can only reload from main coroutine";
3433 return; 3660 return;
3434 } 3661 }
3435 3662
3663 return if $RELOAD++;
3664
3665 my $t1 = EV::time;
3666
3667 while ($RELOAD) {
3436 warn "reloading..."; 3668 warn "reloading...";
3437 3669
3438 warn "entering sync_job"; 3670 warn "entering sync_job";
3439 3671
3440 cf::sync_job { 3672 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark 3673 cf::write_runtime_sync; # external watchdog should not bark
3442 cf::emergency_save; 3674 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark 3675 cf::write_runtime_sync; # external watchdog should not bark
3444 3676
3445 warn "syncing database to disk"; 3677 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV; 3678 BDB::db_env_txn_checkpoint $DB_ENV;
3447 3679
3448 # if anything goes wrong in here, we should simply crash as we already saved 3680 # if anything goes wrong in here, we should simply crash as we already saved
3449 3681
3450 warn "flushing outstanding aio requests"; 3682 warn "flushing outstanding aio requests";
3451 for (;;) {
3452 BDB::flush;
3453 IO::AIO::flush;
3454 Coro::cede_notself;
3455 last unless IO::AIO::nreqs || BDB::nreqs; 3683 while (IO::AIO::nreqs || BDB::nreqs) {
3456 warn "iterate..."; 3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3457 }
3458
3459 ++$RELOAD;
3460
3461 warn "cancelling all extension coros";
3462 $_->cancel for values %EXT_CORO;
3463 %EXT_CORO = ();
3464
3465 warn "removing commands";
3466 %COMMAND = ();
3467
3468 warn "removing ext/exti commands";
3469 %EXTCMD = ();
3470 %EXTICMD = ();
3471
3472 warn "unloading/nuking all extensions";
3473 for my $pkg (@EXTS) {
3474 warn "... unloading $pkg";
3475
3476 if (my $cb = $pkg->can ("unload")) {
3477 eval {
3478 $cb->($pkg);
3479 1
3480 } or warn "$pkg unloaded, but with errors: $@";
3481 } 3685 }
3482 3686
3483 warn "... nuking $pkg"; 3687 warn "cancelling all extension coros";
3484 Symbol::delete_package $pkg; 3688 $_->cancel for values %EXT_CORO;
3485 } 3689 %EXT_CORO = ();
3486 3690
3487 warn "unloading all perl modules loaded from $LIBDIR"; 3691 warn "removing commands";
3488 while (my ($k, $v) = each %INC) { 3692 %COMMAND = ();
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 3693
3694 warn "removing ext/exti commands";
3695 %EXTCMD = ();
3696 %EXTICMD = ();
3697
3698 warn "unloading/nuking all extensions";
3699 for my $pkg (@EXTS) {
3491 warn "... unloading $k"; 3700 warn "... unloading $pkg";
3492 delete $INC{$k};
3493 3701
3494 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g;
3496
3497 if (my $cb = $k->can ("unload_module")) { 3702 if (my $cb = $pkg->can ("unload")) {
3703 eval {
3498 $cb->(); 3704 $cb->($pkg);
3705 1
3706 } or warn "$pkg unloaded, but with errors: $@";
3707 }
3708
3709 warn "... clearing $pkg";
3710 clear_package $pkg;
3499 } 3711 }
3500 3712
3501 Symbol::delete_package $k; 3713 warn "unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716
3717 warn "... unloading $k";
3718 delete $INC{$k};
3719
3720 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g;
3722
3723 if (my $cb = $k->can ("unload_module")) {
3724 $cb->();
3725 }
3726
3727 clear_package $k;
3502 } 3728 }
3503 3729
3504 warn "getting rid of safe::, as good as possible"; 3730 warn "getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 3731 clear_package "safe::$_"
3506 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3507 3733
3508 warn "unloading cf.pm \"a bit\""; 3734 warn "unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 3735 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 3737
3512 # don't, removes xs symbols, too, 3738 # don't, removes xs symbols, too,
3513 # and global variables created in xs 3739 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 3740 #clear_package __PACKAGE__;
3515 3741
3516 warn "unload completed, starting to reload now"; 3742 warn "unload completed, starting to reload now";
3517 3743
3518 warn "reloading cf.pm"; 3744 warn "reloading cf.pm";
3519 require cf; 3745 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3521 3747
3522 warn "loading config and database again"; 3748 warn "loading config and database again";
3523 cf::reload_config; 3749 cf::reload_config;
3524 3750
3525 warn "loading extensions"; 3751 warn "loading extensions";
3526 cf::load_extensions; 3752 cf::load_extensions;
3527 3753
3754 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 3755 warn "reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 3756 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 3757 warn "reattaching attachments to maps";
3531 reattach $_ for values %MAP; 3758 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 3759 warn "reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 3760 reattach $_ for values %PLAYER;
3761 }
3534 3762
3763 warn "running post_init jobs";
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3765
3535 warn "leaving sync_job"; 3766 warn "leaving sync_job";
3536 3767
3537 1 3768 1
3538 } or do { 3769 } or do {
3539 warn $@; 3770 warn $@;
3540 warn "error while reloading, exiting."; 3771 cf::cleanup "error while reloading, exiting.";
3541 exit 1;
3542 }; 3772 };
3543 3773
3544 warn "reloaded"; 3774 warn "reloaded";
3775 --$RELOAD;
3776 }
3777
3778 $t1 = EV::time - $t1;
3779 warn "reload completed in ${t1}s\n";
3545}; 3780};
3546 3781
3547our $RELOAD_WATCHER; # used only during reload 3782our $RELOAD_WATCHER; # used only during reload
3548 3783
3549sub reload_perl() { 3784sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 3785 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 3786 # coro crashes during coro_state_free->destroy here.
3552 3787
3788 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions;
3790
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3792 do_reload_perl;
3554 undef $RELOAD_WATCHER; 3793 undef $RELOAD_WATCHER;
3555 do_reload_perl; 3794 };
3556 }; 3795 };
3557} 3796}
3558 3797
3559register_command "reload" => sub { 3798register_command "reload" => sub {
3560 my ($who, $arg) = @_; 3799 my ($who, $arg) = @_;
3574 3813
3575our @WAIT_FOR_TICK; 3814our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 3815our @WAIT_FOR_TICK_BEGIN;
3577 3816
3578sub wait_for_tick { 3817sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 3818 return if tick_inhibit || $Coro::current == $Coro::main;
3581 3819
3582 my $signal = new Coro::Signal; 3820 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 3821 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 3822 $signal->wait;
3585} 3823}
3586 3824
3587sub wait_for_tick_begin { 3825sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 3826 return if tick_inhibit || $Coro::current == $Coro::main;
3590 3827
3591 my $signal = new Coro::Signal; 3828 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 3829 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 3830 $signal->wait;
3594} 3831}
3595 3832
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3833sub tick {
3597 if ($Coro::current != $Coro::main) { 3834 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3835 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 3836 unless ++$bug_warning > 10;
3600 return; 3837 return;
3601 } 3838 }
3602 3839
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 3840 cf::server_tick; # one server iteration
3606 3841
3607 $RUNTIME += $TICK;
3608 $NEXT_TICK += $TICK;
3609
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3842 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 3843 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 3844 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 3845 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 3846 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 3847 or warn "ERROR: unable to write runtime file: $!";
3616 }; 3848 };
3617 } 3849 }
3618 3850
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3621 } 3853 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 3854 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 3855 $sig->send;
3624 } 3856 }
3625 3857
3626 $LOAD = ($NOW - $tick_start) / $TICK; 3858 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3859 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 3860
3629 _post_tick; 3861 if (0) {
3630}; 3862 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 3863 my $jitter = $TICK_START - $NEXT_TICK;
3864 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865 warn "jitter $JITTER\n";#d#
3866 }
3867 }
3868}
3632 3869
3633{ 3870{
3871 # configure BDB
3872
3634 BDB::min_parallel 8; 3873 BDB::min_parallel 8;
3635 BDB::max_poll_time $TICK * 0.1; 3874 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 3875 $AnyEvent::BDB::WATCHER->priority (1);
3637
3638 BDB::set_sync_prepare {
3639 my $status;
3640 my $current = $Coro::current;
3641 (
3642 sub {
3643 $status = $!;
3644 $current->ready; undef $current;
3645 },
3646 sub {
3647 Coro::schedule while defined $current;
3648 $! = $status;
3649 },
3650 )
3651 };
3652 3876
3653 unless ($DB_ENV) { 3877 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3878 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3879 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 3880 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3881 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3882 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3883 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 3884
3660 cf::sync_job { 3885 cf::sync_job {
3661 eval { 3886 eval {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3908 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 3909 };
3685} 3910}
3686 3911
3687{ 3912{
3913 # configure IO::AIO
3914
3688 IO::AIO::min_parallel 8; 3915 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3916 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 3917 undef $AnyEvent::AIO::WATCHER;
3693} 3918}
3694 3919
3695my $_log_backtrace; 3920my $_log_backtrace;
3696 3921
3697sub _log_backtrace { 3922sub _log_backtrace {
3700 $msg =~ s/\n//; 3925 $msg =~ s/\n//;
3701 3926
3702 # limit the # of concurrent backtraces 3927 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 3928 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 3929 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg;
3705 async { 3931 async {
3706 $Coro::current->{desc} = "abt $msg"; 3932 $Coro::current->{desc} = "abt $msg";
3707 3933
3708 my @bt = fork_call { 3934 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 3935 @addr = map { sprintf "%x", $_ } @addr;
3720 } 3946 }
3721 3947
3722 @funcs 3948 @funcs
3723 }; 3949 };
3724 3950
3725 LOG llevInfo, "[ABT] $msg\n"; 3951 LOG llevInfo, "[ABT] $perl_bt\n";
3952 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 3953 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 3954 --$_log_backtrace;
3728 }; 3955 };
3729 } else { 3956 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 3958 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 3959 }
3733} 3960}
3734 3961
3735# load additional modules 3962# load additional modules
3736use cf::pod; 3963require "cf/$_.pm" for @EXTRA_MODULES;
3737 3964
3738END { cf::emergency_save } 3965END { cf::emergency_save }
3739 3966
37401 39671
3741 3968

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines