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.399 by root, Sun Dec 16 02:50:33 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.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 2.01 (); 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 $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
80 114
81our $BDB_POLL_WATCHER;
82our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
83our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
84our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 118our $DB_ENV;
86 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
87our %CFG; 122our %CFG;
88 123
89our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 125our $RUNTIME;
91our $NOW; 126our $NOW;
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: @_";
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 encode_json($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
264sub decode_json($) { $json_coder->decode ($_[0]) } 322sub decode_json($) { $json_coder->decode ($_[0]) }
265 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
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
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;
2525 $self->activate_recursive;
2526 2539
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $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;
2529} 2545}
2530 2546
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532 2548
2533Moves 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
2534her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2535that 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
2536the 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
2537be 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 >>.
2538 2557
2539=cut 2558=cut
2540 2559
2541our $GOTOGEN; 2560our $GOTOGEN;
2542 2561
2621} 2640}
2622 2641
2623sub prepare_random_map { 2642sub prepare_random_map {
2624 my ($exit) = @_; 2643 my ($exit) = @_;
2625 2644
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2647 # that depends on the exit object
2631 2648
2632 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2651 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2639 } 2658 }
2640 2659
2641 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2642 2661
2643 my $data = cf::encode_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2646 2665
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2668 undef $fh;
2650 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2651 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2654 } 2677 }
2655} 2678}
2656 2679
2657sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2659 2682
2660 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2661 2684
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; 2685 $self->enter_link;
2674 2686
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 { 2687 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2688 $Coro::current->{desc} = "enter_exit";
2681 2689
2682 $self->deactivate_recursive; # just to be sure
2683 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
2684 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2685 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
2686 1; 2711 1
2687 }) { 2712 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "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. "
2690 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2717
2693 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2759 id => "infobox", 2784 id => "infobox",
2760 title => "Body Parts", 2785 title => "Body Parts",
2761 reply => undef, 2786 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2787 tooltip => "Shows which body parts you posess and are available",
2763 }, 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 },
2764 "c/uptime" => { 2825 "c/uptime" => {
2765 id => "infobox", 2826 id => "infobox",
2766 title => "Uptime", 2827 title => "Uptime",
2767 reply => undef, 2828 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 2829 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 2832 id => "infobox",
2772 title => "Map Info", 2833 title => "Map Info",
2773 reply => undef, 2834 reply => undef,
2774 tooltip => "Information related to the maps", 2835 tooltip => "Information related to the maps",
2775 }, 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,
2776); 2851);
2777 2852
2778sub cf::client::send_msg { 2853sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 2854 my ($self, $channel, $msg, $color, @extra) = @_;
2780 2855
2781 $msg = $self->pl->expand_cfpod ($msg); 2856 $msg = $self->pl->expand_cfpod ($msg)
2857 unless $color & cf::NDI_VERBATIM;
2782 2858
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 2859 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 2860
2785 # check predefined channels, for the benefit of C 2861 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 2862 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 2863 $channel = $CHANNEL{$channel};
2788 2864
2789 $self->ext_msg (channel_info => $channel) 2865 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 2866 $channel = $channel->{id};
2793 2867
2794 } elsif (ref $channel) { 2868 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 2869 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 2870 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 2871 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 2872 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 2873 }
2801 2874
2802 $channel = $channel->{id}; 2875 $channel = $channel->{id};
2803 } 2876 }
2804 2877
2805 return unless @extra || length $msg; 2878 return unless @extra || length $msg;
2806 2879
2807 if ($self->can_msg) {
2808 # default colour, mask it out 2880 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2881 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 2882 if $color & cf::NDI_DEF;
2811 2883
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2884 my $pkt = "msg "
2885 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 2887 );
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 2888
2826 $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};
2827 2892
2828 utf8::encode $msg; 2893 # split very large packets
2829 2894 if (8192 < length $pkt and $self->{can_lzf}) {
2830 if (0 && $msg =~ /\[/) { 2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2831 # COMMAND/INFO 2896 $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 } 2897 }
2898
2899 $self->send_packet ($pkt);
2839} 2900}
2840 2901
2841=item $client->ext_msg ($type, @msg) 2902=item $client->ext_msg ($type, @msg)
2842 2903
2843Sends an ext event to the client. 2904Sends an ext event to the client.
3017 3078
3018The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
3019 3080
3020 cf::object 3081 cf::object
3021 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
3022 insert remove name archname title slaying race decrease_ob_nr 3083 insert remove name archname title slaying race decrease split
3084 value
3023 3085
3024 cf::object::player 3086 cf::object::player
3025 player 3087 player
3026 3088
3027 cf::player 3089 cf::player
3032 3094
3033=cut 3095=cut
3034 3096
3035for ( 3097for (
3036 ["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
3037 insert remove inv name archname title slaying race 3099 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3100 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3101 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3102 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3103 ["cf::map" => qw(trigger)],
3042) { 3104) {
3043 no strict 'refs'; 3105 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3106 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3107 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3062 my ($code, %vars) = @_; 3124 my ($code, %vars) = @_;
3063 3125
3064 my $qcode = $code; 3126 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3128 $qcode =~ s/\n/\\n/g;
3129
3130 %vars = (_dummy => 0) unless %vars;
3067 3131
3068 local $_; 3132 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars; 3133 local @safe::cf::_safe_eval_args = values %vars;
3070 3134
3071 my $eval = 3135 my $eval =
3148 { 3212 {
3149 my $faces = $facedata->{faceinfo}; 3213 my $faces = $facedata->{faceinfo};
3150 3214
3151 while (my ($face, $info) = each %$faces) { 3215 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3216 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3217
3153 cf::face::set_visibility $idx, $info->{visibility}; 3218 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3219 cf::face::set_magicmap $idx, $info->{magicmap};
3155 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};
3156 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};
3157 3222
3158 cf::cede_to_tick; 3223 cf::cede_to_tick;
3159 } 3224 }
3160 3225
3161 while (my ($face, $info) = each %$faces) { 3226 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3227 next unless $info->{smooth};
3228
3163 my $idx = cf::face::find $face 3229 my $idx = cf::face::find $face
3164 or next; 3230 or next;
3231
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3232 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3233 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3234 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3235 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3236 warn "smooth face '$info->{smooth}' not found for face '$face'";
3187 { 3254 {
3188 # TODO: for gcfclient pleasure, we should give resources 3255 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index. 3256 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3257 my $res = $facedata->{resource};
3191 3258
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3259 while (my ($name, $info) = each %$res) {
3260 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3261 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data; 3262 my $data;
3197 3263
3198 if ($info->{type} & 1) { 3264 if ($info->{type} & 1) {
3199 # prepend meta info 3265 # prepend meta info
3200 3266
3201 my $meta = $enc->encode ({ 3267 my $meta = $enc->encode ({
3202 name => $name, 3268 name => $name,
3203 %{ $info->{meta} || {} }, 3269 %{ $info->{meta} || {} },
3204 }); 3270 });
3205 3271
3206 $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};
3207 } else { 3279 } else {
3208 $data = $info->{data}; 3280 $RESOURCE{$name} = $info;
3209 } 3281 }
3210 3282
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; 3283 cf::cede_to_tick;
3215 } 3284 }
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 } 3285 }
3286
3287 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3288
3236 1 3289 1
3237} 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});
3238 3311
3239register_exticmd fx_want => sub { 3312register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_; 3313 my ($ns, $want) = @_;
3241 3314
3242 while (my ($k, $v) = each %$want) { 3315 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3316 $ns->fx_want ($k, $v);
3244 } 3317 }
3245}; 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}
3246 3329
3247sub reload_regions { 3330sub reload_regions {
3248 # 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
3249 # for this (global event?) 3332 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3333 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3347}
3265 3348
3266sub reload_archetypes { 3349sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3350 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3351 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} 3352}
3275 3353
3276sub reload_treasures { 3354sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3355 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3356 or die "unable to load treasurelists\n";
3279} 3357}
3280 3358
3281sub reload_resources { 3359sub reload_resources {
3282 warn "reloading resource files...\n"; 3360 warn "reloading resource files...\n";
3283 3361
3362 reload_facedata;
3363 reload_archetypes;
3284 reload_regions; 3364 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3365 reload_treasures;
3289 3366
3290 warn "finished reloading resource files\n"; 3367 warn "finished reloading resource files\n";
3291}
3292
3293sub init {
3294 reload_resources;
3295} 3368}
3296 3369
3297sub reload_config { 3370sub reload_config {
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3371 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3372 or return;
3300 3373
3301 local $/; 3374 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3375 *CFG = YAML::Load <$fh>;
3303 3376
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3305 3378
3306 $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};
3307 $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};
3313 }; 3386 };
3314 warn $@ if $@; 3387 warn $@ if $@;
3315 } 3388 }
3316} 3389}
3317 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
3318sub 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
3319 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
3321 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#
3322 (async { 3437 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3439 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3326 }; 3441 };
3327 3442
3443 evthread_start IO::AIO::poll_fileno;
3444
3445 cf::sync_job {
3446 reload_resources;
3328 reload_config; 3447 reload_config;
3329 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
3330 load_extensions; 3461 load_extensions;
3331 3462
3332 $TICK_WATCHER->start; 3463 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3464
3334 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;
3335} 3473}
3336 3474
3337############################################################################# 3475#############################################################################
3338# initialisation and cleanup 3476# initialisation and cleanup
3339 3477
3345 cf::cleanup "SIG$signal"; 3483 cf::cleanup "SIG$signal";
3346 }; 3484 };
3347 } 3485 }
3348} 3486}
3349 3487
3350sub write_runtime { 3488sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime";
3352
3353 # first touch the runtime file to show we are still running: 3489 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3490 # the fsync below can take a very very long time.
3355 3491
3356 IO::AIO::aio_utime $runtime, undef, undef; 3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3493
3358 my $guard = cf::lock_acquire "write_runtime"; 3494 my $guard = cf::lock_acquire "write_runtime";
3359 3495
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3361 or return; 3497 or return;
3362 3498
3363 my $value = $cf::RUNTIME + 90 + 10; 3499 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3500 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3501 # 60 allows for the watchdog to kill the server.
3375 aio_utime $fh, undef, undef; 3511 aio_utime $fh, undef, undef;
3376 3512
3377 close $fh 3513 close $fh
3378 or return; 3514 or return;
3379 3515
3380 aio_rename "$runtime~", $runtime 3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3517 and return;
3382 3518
3383 warn "runtime file written.\n"; 3519 warn "runtime file written.\n";
3384 3520
3385 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 };
3386} 3572}
3387 3573
3388sub emergency_save() { 3574sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3575 my $freeze_guard = cf::freeze_mainloop;
3390 3576
3391 warn "enter emergency perl save\n"; 3577 warn "emergency_perl_save: enter\n";
3392 3578
3393 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
3394 # use a peculiar iteration method to avoid tripping on perl 3585 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3586 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3587 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3588 warn "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3589 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3590 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3591 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3592 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3593 $pl->save;
3403 } 3594 }
3404 warn "end emergency player save\n"; 3595 warn "emergency_perl_save: end player save\n";
3405 3596
3406 warn "begin emergency map save\n"; 3597 warn "emergency_perl_save: begin map save\n";
3407 for my $path (keys %cf::MAP) { 3598 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3599 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3600 $map->valid or next;
3410 $map->save; 3601 $map->save;
3411 } 3602 }
3412 warn "end emergency map save\n"; 3603 warn "emergency_perl_save: end map save\n";
3413 3604
3414 warn "begin emergency database checkpoint\n"; 3605 warn "emergency_perl_save: begin database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3606 BDB::db_env_txn_checkpoint $DB_ENV;
3416 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";
3417 }; 3612 };
3418 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
3419 warn "leave emergency perl save\n"; 3619 warn "emergency_perl_save: leave\n";
3420} 3620}
3421 3621
3422sub post_cleanup { 3622sub post_cleanup {
3423 my ($make_core) = @_; 3623 my ($make_core) = @_;
3424 3624
3425 warn Carp::longmess "post_cleanup backtrace" 3625 warn Carp::longmess "post_cleanup backtrace"
3426 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#
3427} 3656}
3428 3657
3429sub do_reload_perl() { 3658sub do_reload_perl() {
3430 # can/must only be called in main 3659 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3660 if ($Coro::current != $Coro::main) {
3432 warn "can only reload from main coroutine"; 3661 warn "can only reload from main coroutine";
3433 return; 3662 return;
3434 } 3663 }
3435 3664
3665 return if $RELOAD++;
3666
3667 my $t1 = EV::time;
3668
3669 while ($RELOAD) {
3436 warn "reloading..."; 3670 warn "reloading...";
3437 3671
3438 warn "entering sync_job"; 3672 warn "entering sync_job";
3439 3673
3440 cf::sync_job { 3674 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark 3675 cf::write_runtime_sync; # external watchdog should not bark
3442 cf::emergency_save; 3676 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark 3677 cf::write_runtime_sync; # external watchdog should not bark
3444 3678
3445 warn "syncing database to disk"; 3679 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV; 3680 BDB::db_env_txn_checkpoint $DB_ENV;
3447 3681
3448 # 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
3449 3683
3450 warn "flushing outstanding aio requests"; 3684 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; 3685 while (IO::AIO::nreqs || BDB::nreqs) {
3456 warn "iterate..."; 3686 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 } 3687 }
3482 3688
3483 warn "... nuking $pkg"; 3689 warn "cancelling all extension coros";
3484 Symbol::delete_package $pkg; 3690 $_->cancel for values %EXT_CORO;
3485 } 3691 %EXT_CORO = ();
3486 3692
3487 warn "unloading all perl modules loaded from $LIBDIR"; 3693 warn "removing commands";
3488 while (my ($k, $v) = each %INC) { 3694 %COMMAND = ();
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 3695
3696 warn "removing ext/exti commands";
3697 %EXTCMD = ();
3698 %EXTICMD = ();
3699
3700 warn "unloading/nuking all extensions";
3701 for my $pkg (@EXTS) {
3491 warn "... unloading $k"; 3702 warn "... unloading $pkg";
3492 delete $INC{$k};
3493 3703
3494 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g;
3496
3497 if (my $cb = $k->can ("unload_module")) { 3704 if (my $cb = $pkg->can ("unload")) {
3705 eval {
3498 $cb->(); 3706 $cb->($pkg);
3707 1
3708 } or warn "$pkg unloaded, but with errors: $@";
3709 }
3710
3711 warn "... clearing $pkg";
3712 clear_package $pkg;
3499 } 3713 }
3500 3714
3501 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;
3502 } 3730 }
3503 3731
3504 warn "getting rid of safe::, as good as possible"; 3732 warn "getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 3733 clear_package "safe::$_"
3506 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);
3507 3735
3508 warn "unloading cf.pm \"a bit\""; 3736 warn "unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 3737 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 3738 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 3739
3512 # don't, removes xs symbols, too, 3740 # don't, removes xs symbols, too,
3513 # and global variables created in xs 3741 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 3742 #clear_package __PACKAGE__;
3515 3743
3516 warn "unload completed, starting to reload now"; 3744 warn "unload completed, starting to reload now";
3517 3745
3518 warn "reloading cf.pm"; 3746 warn "reloading cf.pm";
3519 require cf; 3747 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3521 3749
3522 warn "loading config and database again"; 3750 warn "loading config and database again";
3523 cf::reload_config; 3751 cf::reload_config;
3524 3752
3525 warn "loading extensions"; 3753 warn "loading extensions";
3526 cf::load_extensions; 3754 cf::load_extensions;
3527 3755
3756 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 3757 warn "reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 3758 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 3759 warn "reattaching attachments to maps";
3531 reattach $_ for values %MAP; 3760 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 3761 warn "reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 3762 reattach $_ for values %PLAYER;
3763 }
3534 3764
3765 warn "running post_init jobs";
3766 (pop @POST_INIT)->(1) while @POST_INIT;
3767
3535 warn "leaving sync_job"; 3768 warn "leaving sync_job";
3536 3769
3537 1 3770 1
3538 } or do { 3771 } or do {
3539 warn $@; 3772 warn $@;
3540 warn "error while reloading, exiting."; 3773 cf::cleanup "error while reloading, exiting.";
3541 exit 1;
3542 }; 3774 };
3543 3775
3544 warn "reloaded"; 3776 warn "reloaded";
3777 --$RELOAD;
3778 }
3779
3780 $t1 = EV::time - $t1;
3781 warn "reload completed in ${t1}s\n";
3545}; 3782};
3546 3783
3547our $RELOAD_WATCHER; # used only during reload 3784our $RELOAD_WATCHER; # used only during reload
3548 3785
3549sub reload_perl() { 3786sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 3787 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 3788 # coro crashes during coro_state_free->destroy here.
3552 3789
3790 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions;
3792
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3794 do_reload_perl;
3554 undef $RELOAD_WATCHER; 3795 undef $RELOAD_WATCHER;
3555 do_reload_perl; 3796 };
3556 }; 3797 };
3557} 3798}
3558 3799
3559register_command "reload" => sub { 3800register_command "reload" => sub {
3560 my ($who, $arg) = @_; 3801 my ($who, $arg) = @_;
3574 3815
3575our @WAIT_FOR_TICK; 3816our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 3817our @WAIT_FOR_TICK_BEGIN;
3577 3818
3578sub wait_for_tick { 3819sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 3820 return if tick_inhibit || $Coro::current == $Coro::main;
3581 3821
3582 my $signal = new Coro::Signal; 3822 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 3823 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 3824 $signal->wait;
3585} 3825}
3586 3826
3587sub wait_for_tick_begin { 3827sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 3828 return if tick_inhibit || $Coro::current == $Coro::main;
3590 3829
3591 my $signal = new Coro::Signal; 3830 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 3831 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 3832 $signal->wait;
3594} 3833}
3595 3834
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3835sub tick {
3597 if ($Coro::current != $Coro::main) { 3836 if ($Coro::current != $Coro::main) {
3598 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"
3599 unless ++$bug_warning > 10; 3838 unless ++$bug_warning > 10;
3600 return; 3839 return;
3601 } 3840 }
3602 3841
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 3842 cf::server_tick; # one server iteration
3606 3843
3607 $RUNTIME += $TICK;
3608 $NEXT_TICK += $TICK;
3609
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3844 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 3845 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 3846 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 3847 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 3848 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 3849 or warn "ERROR: unable to write runtime file: $!";
3616 }; 3850 };
3617 } 3851 }
3618 3852
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3853 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3621 } 3855 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 3856 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 3857 $sig->send;
3624 } 3858 }
3625 3859
3626 $LOAD = ($NOW - $tick_start) / $TICK; 3860 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3861 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 3862
3629 _post_tick; 3863 if (0) {
3630}; 3864 if ($NEXT_TICK) {
3631$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}
3632 3871
3633{ 3872{
3873 # configure BDB
3874
3634 BDB::min_parallel 8; 3875 BDB::min_parallel 8;
3635 BDB::max_poll_time $TICK * 0.1; 3876 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 3877 $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 3878
3653 unless ($DB_ENV) { 3879 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3880 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3881 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | 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;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3884 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3885 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 3886
3660 cf::sync_job { 3887 cf::sync_job {
3661 eval { 3888 eval {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3910 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 3911 };
3685} 3912}
3686 3913
3687{ 3914{
3915 # configure IO::AIO
3916
3688 IO::AIO::min_parallel 8; 3917 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3918 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 3919 undef $AnyEvent::AIO::WATCHER;
3693} 3920}
3694 3921
3695my $_log_backtrace; 3922my $_log_backtrace;
3696 3923
3697sub _log_backtrace { 3924sub _log_backtrace {
3700 $msg =~ s/\n//; 3927 $msg =~ s/\n//;
3701 3928
3702 # limit the # of concurrent backtraces 3929 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 3930 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 3931 ++$_log_backtrace;
3932 my $perl_bt = Carp::longmess $msg;
3705 async { 3933 async {
3706 $Coro::current->{desc} = "abt $msg"; 3934 $Coro::current->{desc} = "abt $msg";
3707 3935
3708 my @bt = fork_call { 3936 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 3937 @addr = map { sprintf "%x", $_ } @addr;
3720 } 3948 }
3721 3949
3722 @funcs 3950 @funcs
3723 }; 3951 };
3724 3952
3725 LOG llevInfo, "[ABT] $msg\n"; 3953 LOG llevInfo, "[ABT] $perl_bt\n";
3954 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 3955 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 3956 --$_log_backtrace;
3728 }; 3957 };
3729 } else { 3958 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 3959 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 3960 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 3961 }
3733} 3962}
3734 3963
3735# load additional modules 3964# load additional modules
3736use cf::pod; 3965require "cf/$_.pm" for @EXTRA_MODULES;
3737 3966
3738END { cf::emergency_save } 3967END { cf::emergency_save }
3739 3968
37401 39691
3741 3970

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines