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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines