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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.493 by root, Mon Oct 26 02:34:37 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 it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# 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 Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV 1.86; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.32 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
18use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
23use Coro::BDB; 51use Coro::BDB 1.6;
24use Coro::Storable; 52use Coro::Storable;
25use Coro::Util (); 53use Coro::Util ();
26 54
27use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
28use BDB (); 56use BDB ();
29use Data::Dumper; 57use Data::Dumper;
30use Digest::MD5; 58use Digest::MD5;
31use Fcntl; 59use Fcntl;
32use YAML::Syck (); 60use YAML::XS ();
33use IO::AIO 2.51 (); 61use IO::AIO ();
34use Time::HiRes; 62use Time::HiRes;
35use Compress::LZF; 63use Compress::LZF;
36use Digest::MD5 (); 64use Digest::MD5 ();
65
66AnyEvent::detect;
37 67
38# configure various modules to our taste 68# configure various modules to our taste
39# 69#
40$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 71Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
72
73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
74
75# make sure c-lzf reinitialises itself
76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 78
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 79# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 81
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 83
51our %COMMAND = (); 84our %COMMAND = ();
52our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
55our %EXTCMD = (); 88our %EXTCMD = ();
56our %EXTICMD = (); 89our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
59 92
60our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
62 97
63our $CONFDIR = confdir; 98our $CONFDIR = confdir;
64our $DATADIR = datadir; 99our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 103our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 104our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 106our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 107our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 108our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime";
111
74our %RESOURCE; 112our %RESOURCE;
75 113
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 116our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
82 118
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 122our $DB_ENV;
88 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
89our %CFG; 126our %CFG;
90 127
91our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 129our $RUNTIME;
93our $NOW; 130our $NOW;
99# used to convert map paths into valid unix filenames by replacing / by ∕ 136# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 137our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 138
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
141our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
143
144our @POST_INIT;
145
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
105 148
106binmode STDOUT; 149binmode STDOUT;
107binmode STDERR; 150binmode STDERR;
108 151
109# read virtual server time, if available 152# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 153unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 154 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
114} 157}
158
159eval "sub TICK() { $TICK } 1" or die;
115 160
116mkdir $_ 161mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 163
119our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
120 165
121sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 178
123############################################################################# 179#############################################################################
124 180
125=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
126 182
173returns directly I<after> the tick processing (and consequently, can only wake one process 229returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 231
176=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
177 233
178This array contains the results of the last C<invoke ()> call. When 234This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 236that call.
181 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
182=back 244=back
183 245
184=cut 246=cut
185 247
186BEGIN { 248$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 249 my $msg = join "", @_;
189 250
190 $msg .= "\n" 251 $msg .= "\n"
191 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
192 253
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 255
195 LOG llevError, $msg; 256 LOG llevError, $msg;
196 }; 257};
197}
198 258
199$Coro::State::DIEHOOK = sub { 259$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "=="
261
200 warn Carp::longmess $_[0]; 262 warn Carp::longmess $_[0];
263
264 if ($Coro::current == $Coro::main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d#
267 }#d#
268
269 # kill coroutine otherwise
201 Coro::terminate; 270 Coro::terminate
202}; 271};
203 272
204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214for my $pkg (qw( 283for my $pkg (qw(
215 cf::global cf::attachable 284 cf::global cf::attachable
216 cf::object cf::object::player 285 cf::object cf::object::player
217 cf::client cf::player 286 cf::client cf::player
218 cf::arch cf::living 287 cf::arch cf::living
288 cf::map cf::mapspace
219 cf::map cf::party cf::region 289 cf::party cf::region
220)) { 290)) {
221 no strict 'refs';
222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
223} 292}
224 293
225$EV::DIED = sub { 294$EV::DIED = sub {
226 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
227}; 296};
228 297
229############################################################################# 298#############################################################################
230 299
231=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
268our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
269 338
270sub encode_json($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
271sub decode_json($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
272 341
342=item cf::post_init { BLOCK }
343
344Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again.
346
347The cdoeblock will have a single boolean argument to indicate whether this
348is a reload or not.
349
350=cut
351
352sub post_init(&) {
353 push @POST_INIT, shift;
354}
355
273=item cf::lock_wait $string 356=item cf::lock_wait $string
274 357
275Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
276 359
277=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
278 361
279Wait until the given lock is available and then acquires it and returns 362Wait until the given lock is available and then acquires it and returns
280a Coro::guard object. If the guard object gets destroyed (goes out of scope, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
281for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
282returned. 365returned.
283 366
284Locks are *not* recursive, locking from the same coro twice results in a 367Locks are *not* recursive, locking from the same coro twice results in a
285deadlocked coro. 368deadlocked coro.
291 374
292Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
293 376
294=cut 377=cut
295 378
296our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
297our %LOCKER;#d#
298 380
299sub lock_wait($) { 381sub lock_wait($) {
300 my ($key) = @_; 382 $LOCKS->wait ($_[0]);
301
302 if ($LOCKER{$key} == $Coro::current) {#d#
303 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
304 return;#d#
305 }#d#
306
307 # wait for lock, if any
308 while ($LOCK{$key}) {
309 push @{ $LOCK{$key} }, $Coro::current;
310 Coro::schedule;
311 }
312} 383}
313 384
314sub lock_acquire($) { 385sub lock_acquire($) {
315 my ($key) = @_; 386 $LOCKS->guard ($_[0])
316
317 # wait, to be sure we are not locked
318 lock_wait $key;
319
320 $LOCK{$key} = [];
321 $LOCKER{$key} = $Coro::current;#d#
322
323 Coro::guard {
324 delete $LOCKER{$key};#d#
325 # wake up all waiters, to be on the safe side
326 $_->ready for @{ delete $LOCK{$key} };
327 }
328} 387}
329 388
330sub lock_active($) { 389sub lock_active($) {
331 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
332
333 ! ! $LOCK{$key}
334} 391}
335 392
336sub freeze_mainloop { 393sub freeze_mainloop {
337 return unless $TICK_WATCHER->is_active; 394 tick_inhibit_inc;
338 395
339 my $guard = Coro::guard { 396 &Guard::guard (\&tick_inhibit_dec);
340 $TICK_WATCHER->start;
341 };
342 $TICK_WATCHER->stop;
343 $guard
344} 397}
345 398
346=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
347 400
348Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
403 } 456 }
404 } 457 }
405}; 458};
406 459
407sub get_slot($;$$) { 460sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main;
462
408 my ($time, $pri, $name) = @_; 463 my ($time, $pri, $name) = @_;
409 464
410 $time = $TICK * .6 if $time > $TICK * .6; 465 $time = $TICK * .6 if $time > $TICK * .6;
411 my $sig = new Coro::Signal; 466 my $sig = new Coro::Signal;
412 467
449 # this is the main coro, too bad, we have to block 504 # this is the main coro, too bad, we have to block
450 # till the operation succeeds, freezing the server :/ 505 # till the operation succeeds, freezing the server :/
451 506
452 LOG llevError, Carp::longmess "sync job";#d# 507 LOG llevError, Carp::longmess "sync job";#d#
453 508
454 # TODO: use suspend/resume instead
455 # (but this is cancel-safe)
456 my $freeze_guard = freeze_mainloop; 509 my $freeze_guard = freeze_mainloop;
457 510
458 my $busy = 1; 511 my $busy = 1;
459 my @res; 512 my @res;
460 513
471 } else { 524 } else {
472 EV::loop EV::LOOP_ONESHOT; 525 EV::loop EV::LOOP_ONESHOT;
473 } 526 }
474 } 527 }
475 528
476 $time = EV::time - $time; 529 my $time = EV::time - $time;
477 530
478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481 $tick_start += $time; # do not account sync jobs to server load 531 $TICK_START += $time; # do not account sync jobs to server load
482 532
483 wantarray ? @res : $res[0] 533 wantarray ? @res : $res[0]
484 } else { 534 } else {
485 # we are in another coroutine, how wonderful, everything just works 535 # we are in another coroutine, how wonderful, everything just works
486 536
528 reset_signals; 578 reset_signals;
529 &$cb 579 &$cb
530 }, @args; 580 }, @args;
531 581
532 wantarray ? @res : $res[-1] 582 wantarray ? @res : $res[-1]
583}
584
585=item $coin = coin_from_name $name
586
587=cut
588
589our %coin_alias = (
590 "silver" => "silvercoin",
591 "silvercoin" => "silvercoin",
592 "silvercoins" => "silvercoin",
593 "gold" => "goldcoin",
594 "goldcoin" => "goldcoin",
595 "goldcoins" => "goldcoin",
596 "platinum" => "platinacoin",
597 "platinumcoin" => "platinacoin",
598 "platinumcoins" => "platinacoin",
599 "platina" => "platinacoin",
600 "platinacoin" => "platinacoin",
601 "platinacoins" => "platinacoin",
602 "royalty" => "royalty",
603 "royalties" => "royalty",
604);
605
606sub coin_from_name($) {
607 $coin_alias{$_[0]}
608 ? cf::arch::find $coin_alias{$_[0]}
609 : undef
533} 610}
534 611
535=item $value = cf::db_get $family => $key 612=item $value = cf::db_get $family => $key
536 613
537Returns a single value from the environment database. 614Returns a single value from the environment database.
676 753
677############################################################################# 754#############################################################################
678 755
679=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
680 757
681Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
682attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
683to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
684 761
685In the following description, CLASS can be any of C<global>, C<object> 762In the following description, CLASS can be any of C<global>, C<object>
686C<player>, C<client> or C<map> (i.e. the attachable objects in 763C<player>, C<client> or C<map> (i.e. the attachable objects in
736=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
737 814
738Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
739given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
740 817
741Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
742that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
743 820
744These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
745 822
746=over 4 823=over 4
1037 1114
1038sub reattach { 1115sub reattach {
1039 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
1040 my ($obj) = @_; 1117 my ($obj) = @_;
1041 1118
1119 # no longer needed after getting rid of delete_package?
1042 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1043 1121
1044 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
1045 1123
1046 @$registry = (); 1124 @$registry = ();
1047 1125
1093 utf8::decode (my $decname = $filename); 1171 utf8::decode (my $decname = $filename);
1094 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
1095 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1096 1174
1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1100 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 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;
1180 aio_fsync $fh;
1181 }
1101 close $fh; 1182 aio_close $fh;
1102 1183
1103 if (@$objs) { 1184 if (@$objs) {
1104 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1186 aio_chmod $fh, SAVE_MODE;
1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1107 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1108 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 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;
1191 aio_fsync $fh;
1192 }
1109 close $fh; 1193 aio_close $fh;
1110 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1111 } 1195 }
1112 } else { 1196 } else {
1113 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1114 } 1198 }
1115 1199
1116 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
1117 } else { 1204 } else {
1118 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1119 } 1206 }
1120 } else { 1207 } else {
1121 aio_unlink $filename; 1208 aio_unlink $filename;
1122 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1123 } 1210 }
1214 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1215 1302
1216 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1217} 1304}
1218 1305
1306use File::Glob ();
1307
1219cf::player->attach ( 1308cf::player->attach (
1220 on_command => sub { 1309 on_command => sub {
1221 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1222 1311
1223 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
1255 1344
1256 cf::override; 1345 cf::override;
1257 }, 1346 },
1258); 1347);
1259 1348
1349# "readahead" all extensions
1350sub cache_extensions {
1351 my $grp = IO::AIO::aio_group;
1352
1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1354 for (grep /\.ext$/, @{$_[0]}) {
1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1356 }
1357 };
1358
1359 $grp
1360}
1361
1260sub load_extensions { 1362sub load_extensions {
1261 cf::sync_job { 1363 cf::sync_job {
1262 my %todo; 1364 my %todo;
1263 1365
1264 for my $path (<$LIBDIR/*.ext>) { 1366 for my $path (<$LIBDIR/*.ext>) {
1283 1385
1284 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1285 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1286 1388
1287 $ext{source} = 1389 $ext{source} =
1288 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1289 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1290 . $source 1392 . $source
1291 . "\n};\n1"; 1393 . "\n};\n1";
1292 1394
1293 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
1309 my $msg = $@ ? "$v->{path}: $@\n" 1411 my $msg = $@ ? "$v->{path}: $@\n"
1310 : "$v->{base}: extension inactive.\n"; 1412 : "$v->{base}: extension inactive.\n";
1311 1413
1312 if (exists $v->{meta}{mandatory}) { 1414 if (exists $v->{meta}{mandatory}) {
1313 warn $msg; 1415 warn $msg;
1314 warn "mandatory extension failed to load, exiting.\n"; 1416 cf::cleanup "mandatory extension failed to load, exiting.";
1315 exit 1;
1316 } 1417 }
1317 1418
1318 warn $msg; 1419 warn $msg;
1319 } 1420 }
1320 1421
1334 1435
1335=back 1436=back
1336 1437
1337=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1338 1439
1339Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1340 1441
1341=cut 1442=cut
1342 1443
1343package cf::player; 1444package cf::player;
1344 1445
1387 1488
1388sub exists($) { 1489sub exists($) {
1389 my ($login) = @_; 1490 my ($login) = @_;
1390 1491
1391 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1392 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1393} 1494}
1394 1495
1395sub find($) { 1496sub find($) {
1396 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1397 my $login = $_[0]; 1498 my $login = $_[0];
1409 my $f = new_from_file cf::object::thawer path $login 1510 my $f = new_from_file cf::object::thawer path $login
1410 or return; 1511 or return;
1411 1512
1412 my $pl = cf::player::load_pl $f 1513 my $pl = cf::player::load_pl $f
1413 or return; 1514 or return;
1515
1414 local $cf::PLAYER_LOADING{$login} = $pl; 1516 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs; 1517 $f->resolve_delayed_derefs;
1416 $cf::PLAYER{$login} = $pl 1518 $cf::PLAYER{$login} = $pl
1417 } 1519 }
1418 } 1520 }
1428 1530
1429 return if $pl->{deny_save}; 1531 return if $pl->{deny_save};
1430 1532
1431 aio_mkdir playerdir $pl, 0770; 1533 aio_mkdir playerdir $pl, 0770;
1432 $pl->{last_save} = $cf::RUNTIME; 1534 $pl->{last_save} = $cf::RUNTIME;
1535
1536 cf::get_slot 0.01;
1433 1537
1434 $pl->save_pl ($path); 1538 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1539 cf::cede_to_tick;
1436} 1540}
1437 1541
1469 my ($pl) = @_; 1573 my ($pl) = @_;
1470 1574
1471 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1472 1576
1473 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1474 $pl->password ("*"); # this should lock out the player until we nuked the dir 1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1475 1579
1476 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1477 $pl->deactivate; 1581 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1478 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1584 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1479 $pl->ns->destroy if $pl->ns; 1585 $pl->ns->destroy if $pl->ns;
1480 1586
1481 my $path = playerdir $pl; 1587 my $path = playerdir $pl;
1482 my $temp = "$path~$cf::RUNTIME~deleting~"; 1588 my $temp = "$path~$cf::RUNTIME~deleting~";
1521 1627
1522 for my $login (@$dirs) { 1628 for my $login (@$dirs) {
1523 my $path = path $login; 1629 my $path = path $login;
1524 1630
1525 # a .pst is a dead give-away for a valid player 1631 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") { 1632 # if no pst file found, open and chekc for blocked users
1633 if (aio_stat "$path.pst") {
1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1634 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528 aio_read $fh, 0, 512, my $buf, 0 or next; 1635 aio_read $fh, 0, 512, my $buf, 0 or next;
1529 $buf !~ /^password -------------$/m or next; # official not-valid tag 1636 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 } 1637 }
1531 1638
1562 } 1669 }
1563 1670
1564 \@paths 1671 \@paths
1565} 1672}
1566 1673
1567=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1568 1675
1569Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1570
1571=cut
1572
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1584sub expand_cfpod {
1585 my ($self, $pod) = @_;
1586
1587 my $xml;
1588
1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1592
1593 $group =~ s/&/&amp;/g;
1594 $group =~ s/</&lt;/g;
1595
1596 $xml .= $group;
1597 } elsif ($pod =~ m%\G
1598 ([BCGHITU])
1599 <
1600 (?:
1601 ([^<>]*) (?{ $group = $^N })
1602 | < $interior >
1603 )
1604 >
1605 %gcsx
1606 ) {
1607 my ($code, $data) = ($1, $group);
1608
1609 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617 } elsif ($code eq "T") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619 } elsif ($code eq "G") {
1620 my ($male, $female) = split /\|/, $data;
1621 $data = $self->gender ? $female : $male;
1622 $xml .= expand_cfpod ($self, $data);
1623 } elsif ($code eq "H") {
1624 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1626 "")
1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1638
1639 for ($xml) {
1640 # create single paragraphs (very hackish)
1641 s/(?<=\S)\n(?=\w)/ /g;
1642
1643 # compress some whitespace
1644 s/\s+\n/\n/g; # ws line-ends
1645 s/\n\n+/\n/g; # double lines
1646 s/^\n+//; # beginning lines
1647 s/\n+$//; # ending lines
1648 }
1649
1650 $xml
1651}
1652
1653no re 'eval';
1654
1655sub hintmode {
1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1657 $_[0]{hintmode}
1658}
1659 1677
1660=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1661 1679
1662Sends an ext reply to the player. 1680Sends an ext reply to the player.
1663 1681
1730our $MAX_RESET = 3600; 1748our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 1749our $DEFAULT_RESET = 3000;
1732 1750
1733sub generate_random_map { 1751sub generate_random_map {
1734 my ($self, $rmp) = @_; 1752 my ($self, $rmp) = @_;
1753
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755
1735 # mit "rum" bekleckern, nicht 1756 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1757 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1861 1882
1862# the temporary/swap location 1883# the temporary/swap location
1863sub save_path { 1884sub save_path {
1864 my ($self) = @_; 1885 my ($self) = @_;
1865 1886
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1887 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1888 "$TMPDIR/$path.map"
1868} 1889}
1869 1890
1870# the unique path, undef == no special unique path 1891# the unique path, undef == no special unique path
1871sub uniq_path { 1892sub uniq_path {
1872 my ($self) = @_; 1893 my ($self) = @_;
1873 1894
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1876}
1877
1878# and all this just because we cannot iterate over
1879# all maps in C++...
1880sub change_all_map_light {
1881 my ($change) = @_;
1882
1883 $_->change_map_light ($change)
1884 for grep $_->outdoor, values %cf::MAP;
1885} 1897}
1886 1898
1887sub decay_objects { 1899sub decay_objects {
1888 my ($self) = @_; 1900 my ($self) = @_;
1889 1901
1973sub find { 1985sub find {
1974 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
1975 1987
1976 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
1977 1989
1978 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
1980 1992
1981 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1984
1985 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
1986 or return; 1995 or return;
1987 1996
1988 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
1989 1998
1991 or return; 2000 or return;
1992 2001
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2002 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 2003 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 2004 #$cf::WAIT_FOR_TICK->wait;
2005 undef $guard2;
1996 undef $guard1; 2006 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 2007 $map->reset;
1999 return find $path; 2008 return find $path;
2000 } 2009 }
2001 2010
2002 $cf::MAP{$path} = $map 2011 $cf::MAP{$path} = $map
2029 my $f = new_from_file cf::object::thawer $self->{load_path}; 2038 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block; 2039 $f->skip_block;
2031 $self->_load_objects ($f) 2040 $self->_load_objects ($f)
2032 or return; 2041 or return;
2033 2042
2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
2035 if delete $self->{load_original}; 2044 if delete $self->{load_original};
2036 2045
2037 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
2038 utf8::encode $uniq; 2047 utf8::encode $uniq;
2039 unless (aio_stat $uniq) { 2048 unless (aio_stat $uniq) {
2057 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2058 $self->decay_objects; 2067 $self->decay_objects;
2059 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2060 $self->update_buttons; 2069 $self->update_buttons;
2061 cf::cede_to_tick; 2070 cf::cede_to_tick;
2062 $self->set_darkness_map;
2063 cf::cede_to_tick;
2064 $self->activate; 2071 $self->activate;
2065 } 2072 }
2066 2073
2067 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
2069 2076
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2078 }
2072 2079
2073 $self->post_load; 2080 $self->post_load;
2074} 2081}
2075 2082
2133 my ($path, $origin, $load) = @_; 2140 my ($path, $origin, $load) = @_;
2134 2141
2135 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
2136 2143
2137 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2146 }
2140 2147
2141 $MAP_PREFETCH{$path} |= $load; 2148 $MAP_PREFETCH{$path} |= $load;
2142 2149
2143 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2180 cf::async { 2187 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2188 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2183 }; 2190 };
2184 2191
2192 cf::get_slot 0.02;
2193
2185 if ($uniq) { 2194 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2196 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2197 } else {
2189 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 $self->save; 2206 $self->save;
2198 2207
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2208 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2209
2201 return if $self->players; 2210 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY; 2211 return if $self->in_memory != cf::MAP_ACTIVE;
2203 return if $self->{deny_save}; 2212 return if $self->{deny_save};
2204 2213
2205 $self->in_memory (cf::MAP_SWAPPED); 2214 $self->in_memory (cf::MAP_SWAPPED);
2206 2215
2207 $self->deactivate; 2216 $self->deactivate;
2232 2241
2233 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2234 2243
2235 return if $self->players; 2244 return if $self->players;
2236 2245
2237 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2238 2247
2239 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2240 2249
2241 # need to save uniques path 2250 # need to save uniques path
2242 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2325 2334
2326sub unique_maps() { 2335sub unique_maps() {
2327 [ 2336 [
2328 map { 2337 map {
2329 utf8::decode $_; 2338 utf8::decode $_;
2330 /\.map$/ 2339 s/\.map$//; # TODO future compatibility hack
2340 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2341 ? ()
2331 ? normalise $_ 2342 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2344 ]
2335} 2345}
2336 2346
2337package cf; 2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2338 2378
2339=back 2379=back
2340 2380
2341=head3 cf::object 2381=head3 cf::object
2342 2382
2346 2386
2347=over 4 2387=over 4
2348 2388
2349=item $ob->inv_recursive 2389=item $ob->inv_recursive
2350 2390
2351Returns the inventory of the object _and_ their inventories, recursively. 2391Returns the inventory of the object I<and> their inventories, recursively,
2392but I<not> the object itself.
2352 2393
2353=cut 2394=cut
2354 2395
2355sub inv_recursive_; 2396sub inv_recursive_;
2356sub inv_recursive_ { 2397sub inv_recursive_ {
2361 inv_recursive_ inv $_[0] 2402 inv_recursive_ inv $_[0]
2362} 2403}
2363 2404
2364=item $ref = $ob->ref 2405=item $ref = $ob->ref
2365 2406
2366creates and returns a persistent reference to an objetc that can be stored as a string. 2407Creates and returns a persistent reference to an object that can be stored as a string.
2367 2408
2368=item $ob = cf::object::deref ($refstring) 2409=item $ob = cf::object::deref ($refstring)
2369 2410
2370returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2411returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2371even if the object actually exists. May block. 2412even if the object actually exists. May block.
2403can be C<undef>. Does the right thing when the player is currently in a 2444can be C<undef>. Does the right thing when the player is currently in a
2404dialogue with the given NPC character. 2445dialogue with the given NPC character.
2405 2446
2406=cut 2447=cut
2407 2448
2449our $SAY_CHANNEL = {
2450 id => "say",
2451 title => "Map",
2452 reply => "say ",
2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2454};
2455
2456our $CHAT_CHANNEL = {
2457 id => "chat",
2458 title => "Chat",
2459 reply => "chat ",
2460 tooltip => "Player chat and shouts, global to the server.",
2461};
2462
2408# rough implementation of a future "reply" method that works 2463# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2464# with dialog boxes.
2410#TODO: the first argument must go, split into a $npc->reply_to ( method 2465#TODO: the first argument must go, split into a $npc->reply_to ( method
2411sub cf::object::player::reply($$$;$) { 2466sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2467 my ($self, $npc, $msg, $flags) = @_;
2423 my $dialog = $pl->{npc_dialog}; 2478 my $dialog = $pl->{npc_dialog};
2424 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2479 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2425 2480
2426 } else { 2481 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2482 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2483 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2484 }
2430 } 2485 }
2431} 2486}
2432 2487
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2488=item $object->send_msg ($channel, $msg, $color, [extra...])
2458 2513
2459=item $player_object->enter_link 2514=item $player_object->enter_link
2460 2515
2461Freezes the player and moves him/her to a special map (C<{link}>). 2516Freezes the player and moves him/her to a special map (C<{link}>).
2462 2517
2463The player should be reasonably safe there for short amounts of time. You 2518The player should be reasonably safe there for short amounts of time (e.g.
2464I<MUST> call C<leave_link> as soon as possible, though. 2519for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link
2521map.
2465 2522
2466Will never block. 2523Will never block.
2467 2524
2468=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2469 2526
2521 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2522 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2523 2580
2524 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2525 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2526 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2527 2584
2528 $map->load; 2585 $map->load;
2529 $map->load_neighbours; 2586 $map->load_neighbours;
2530 2587
2531 return unless $self->contr->active; 2588 return unless $self->contr->active;
2532 $self->activate_recursive;
2533 2589
2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2535 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2536} 2595}
2537 2596
2538=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2539 2598
2540Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
2541her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2542that has to return the map if sucecssful, and then unfreezes the player on 2601that has to return the map if sucecssful, and then unfreezes the player on
2543the new (success) or old (failed) map position. In either case, $done will 2602the new (success) or old (failed) map position. In either case, $done will
2544be called at the end of this process. 2603be called at the end of this process.
2604
2605Note that $check will be called with a potentially non-loaded map, so if
2606it needs a loaded map it has to call C<< ->load >>.
2545 2607
2546=cut 2608=cut
2547 2609
2548our $GOTOGEN; 2610our $GOTOGEN;
2549 2611
2628} 2690}
2629 2691
2630sub prepare_random_map { 2692sub prepare_random_map {
2631 my ($exit) = @_; 2693 my ($exit) = @_;
2632 2694
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2695 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2696 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2697 # that depends on the exit object
2638 2698
2639 my $rmp = parse_random_map_params $exit->msg; 2699 my $rmp = parse_random_map_params $exit->msg;
2641 if ($exit->map) { 2701 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 2702 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 2703 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 2704 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 2705 $rmp->{origin_y} = $exit->y;
2706
2707 $exit->map->touch;
2646 } 2708 }
2647 2709
2648 $rmp->{random_seed} ||= $exit->random_seed; 2710 $rmp->{random_seed} ||= $exit->random_seed;
2649 2711
2650 my $data = cf::encode_json $rmp; 2712 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2713 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2714 my $meta = "$RANDOMDIR/$md5.meta";
2653 2715
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2716 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2717 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 2718 undef $fh;
2657 aio_rename "$meta~", $meta; 2719 aio_rename "$meta~", $meta;
2658 2720
2721 my $slaying = "?random/$md5";
2722
2723 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 2724 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 2725 $exit->msg (undef);
2726 }
2661 } 2727 }
2662} 2728}
2663 2729
2664sub cf::object::player::enter_exit { 2730sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 2731 my ($self, $exit) = @_;
2666 2732
2667 return unless $self->type == cf::PLAYER; 2733 return unless $self->type == cf::PLAYER;
2668 2734
2669 if ($exit->slaying eq "/!") {
2670 #TODO: this should de-fi-ni-te-ly not be a sync-job
2671 # the problem is that $exit might not survive long enough
2672 # so it needs to be done right now, right here
2673 cf::sync_job { prepare_random_map $exit };
2674 }
2675
2676 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2677 my $hp = $exit->stats->hp;
2678 my $sp = $exit->stats->sp;
2679
2680 $self->enter_link; 2735 $self->enter_link;
2681 2736
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2686 (async { 2737 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2738 $Coro::current->{desc} = "enter_exit";
2688 2739
2689 $self->deactivate_recursive; # just to be sure
2690 unless (eval { 2740 unless (eval {
2741 $self->deactivate_recursive; # just to be sure
2742
2743 # random map handling
2744 {
2745 my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747 prepare_random_map $exit
2748 if $exit->slaying eq "/!";
2749 }
2750
2751 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2752 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp;
2754
2691 $self->goto ($slaying, $hp, $sp); 2755 $self->goto ($map, $x, $y);
2692 2756
2757 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y)
2759 if $exit->flag (cf::FLAG_DAMNED);
2760
2693 1; 2761 1
2694 }) { 2762 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2696 . "I'll try to bring you back to the map you were before. " 2764 . "I'll try to bring you back to the map you were before. "
2697 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2699 2767
2700 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2730 2798
2731=cut 2799=cut
2732 2800
2733# non-persistent channels (usually the info channel) 2801# non-persistent channels (usually the info channel)
2734our %CHANNEL = ( 2802our %CHANNEL = (
2803 "c/motd" => {
2804 id => "infobox",
2805 title => "MOTD",
2806 reply => undef,
2807 tooltip => "The message of the day",
2808 },
2735 "c/identify" => { 2809 "c/identify" => {
2736 id => "infobox", 2810 id => "infobox",
2737 title => "Identify", 2811 title => "Identify",
2738 reply => undef, 2812 reply => undef,
2739 tooltip => "Items recently identified", 2813 tooltip => "Items recently identified",
2741 "c/examine" => { 2815 "c/examine" => {
2742 id => "infobox", 2816 id => "infobox",
2743 title => "Examine", 2817 title => "Examine",
2744 reply => undef, 2818 reply => undef,
2745 tooltip => "Signs and other items you examined", 2819 tooltip => "Signs and other items you examined",
2820 },
2821 "c/shopinfo" => {
2822 id => "infobox",
2823 title => "Shop Info",
2824 reply => undef,
2825 tooltip => "What your bargaining skill tells you about the shop",
2746 }, 2826 },
2747 "c/book" => { 2827 "c/book" => {
2748 id => "infobox", 2828 id => "infobox",
2749 title => "Book", 2829 title => "Book",
2750 reply => undef, 2830 reply => undef,
2766 id => "infobox", 2846 id => "infobox",
2767 title => "Body Parts", 2847 title => "Body Parts",
2768 reply => undef, 2848 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available", 2849 tooltip => "Shows which body parts you posess and are available",
2770 }, 2850 },
2851 "c/statistics" => {
2852 id => "infobox",
2853 title => "Statistics",
2854 reply => undef,
2855 tooltip => "Shows your primary statistics",
2856 },
2857 "c/skills" => {
2858 id => "infobox",
2859 title => "Skills",
2860 reply => undef,
2861 tooltip => "Shows your experience per skill and item power",
2862 },
2863 "c/shopitems" => {
2864 id => "infobox",
2865 title => "Shop Items",
2866 reply => undef,
2867 tooltip => "Shows the items currently for sale in this shop",
2868 },
2869 "c/resistances" => {
2870 id => "infobox",
2871 title => "Resistances",
2872 reply => undef,
2873 tooltip => "Shows your resistances",
2874 },
2875 "c/pets" => {
2876 id => "infobox",
2877 title => "Pets",
2878 reply => undef,
2879 tooltip => "Shows information abotu your pets/a specific pet",
2880 },
2881 "c/perceiveself" => {
2882 id => "infobox",
2883 title => "Perceive Self",
2884 reply => undef,
2885 tooltip => "You gained detailed knowledge about yourself",
2886 },
2771 "c/uptime" => { 2887 "c/uptime" => {
2772 id => "infobox", 2888 id => "infobox",
2773 title => "Uptime", 2889 title => "Uptime",
2774 reply => undef, 2890 reply => undef,
2775 tooltip => "How long the server has been running since last restart", 2891 tooltip => "How long the server has been running since last restart",
2778 id => "infobox", 2894 id => "infobox",
2779 title => "Map Info", 2895 title => "Map Info",
2780 reply => undef, 2896 reply => undef,
2781 tooltip => "Information related to the maps", 2897 tooltip => "Information related to the maps",
2782 }, 2898 },
2899 "c/party" => {
2900 id => "party",
2901 title => "Party",
2902 reply => "gsay ",
2903 tooltip => "Messages and chat related to your party",
2904 },
2905 "c/death" => {
2906 id => "death",
2907 title => "Death",
2908 reply => undef,
2909 tooltip => "Reason for and more info about your most recent death",
2910 },
2911 "c/say" => $SAY_CHANNEL,
2912 "c/chat" => $CHAT_CHANNEL,
2783); 2913);
2784 2914
2785sub cf::client::send_msg { 2915sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 2916 my ($self, $channel, $msg, $color, @extra) = @_;
2787 2917
2788 $msg = $self->pl->expand_cfpod ($msg); 2918 $msg = $self->pl->expand_cfpod ($msg)
2919 unless $color & cf::NDI_VERBATIM;
2789 2920
2790 $color &= cf::NDI_CLIENT_MASK; # just in case... 2921 $color &= cf::NDI_CLIENT_MASK; # just in case...
2791 2922
2792 # check predefined channels, for the benefit of C 2923 # check predefined channels, for the benefit of C
2793 if ($CHANNEL{$channel}) { 2924 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel}; 2925 $channel = $CHANNEL{$channel};
2795 2926
2796 $self->ext_msg (channel_info => $channel) 2927 $self->ext_msg (channel_info => $channel);
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id}; 2928 $channel = $channel->{id};
2800 2929
2801 } elsif (ref $channel) { 2930 } elsif (ref $channel) {
2802 # send meta info to client, if not yet sent 2931 # send meta info to client, if not yet sent
2803 unless (exists $self->{channel}{$channel->{id}}) { 2932 unless (exists $self->{channel}{$channel->{id}}) {
2804 $self->{channel}{$channel->{id}} = $channel; 2933 $self->{channel}{$channel->{id}} = $channel;
2805 $self->ext_msg (channel_info => $channel) 2934 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807 } 2935 }
2808 2936
2809 $channel = $channel->{id}; 2937 $channel = $channel->{id};
2810 } 2938 }
2811 2939
2812 return unless @extra || length $msg; 2940 return unless @extra || length $msg;
2813 2941
2814 if ($self->can_msg) {
2815 # default colour, mask it out 2942 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2943 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF; 2944 if $color & cf::NDI_DEF;
2818 2945
2819 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2946 my $pkt = "msg "
2947 . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2821 } else { 2949 );
2822 if ($color >= 0) {
2823 # replace some tags by gcfclient-compatible ones
2824 for ($msg) {
2825 1 while
2826 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2827 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2828 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2829 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2830 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2831 }
2832 2950
2833 $color &= cf::NDI_COLOR_MASK; 2951 # try lzf for large packets
2952 $pkt = "lzf " . Compress::LZF::compress $pkt
2953 if 1024 <= length $pkt and $self->{can_lzf};
2834 2954
2835 utf8::encode $msg; 2955 # split very large packets
2836 2956 if (8192 < length $pkt and $self->{can_lzf}) {
2837 if (0 && $msg =~ /\[/) { 2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2838 # COMMAND/INFO 2958 $pkt = "frag";
2839 $self->send_packet ("drawextinfo $color 10 8 $msg")
2840 } else {
2841 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2842 $self->send_packet ("drawinfo $color $msg")
2843 }
2844 }
2845 } 2959 }
2960
2961 $self->send_packet ($pkt);
2846} 2962}
2847 2963
2848=item $client->ext_msg ($type, @msg) 2964=item $client->ext_msg ($type, @msg)
2849 2965
2850Sends an ext event to the client. 2966Sends an ext event to the client.
3024 3140
3025The following functions and methods are available within a safe environment: 3141The following functions and methods are available within a safe environment:
3026 3142
3027 cf::object 3143 cf::object
3028 contr pay_amount pay_player map x y force_find force_add destroy 3144 contr pay_amount pay_player map x y force_find force_add destroy
3029 insert remove name archname title slaying race decrease_ob_nr 3145 insert remove name archname title slaying race decrease split
3146 value
3030 3147
3031 cf::object::player 3148 cf::object::player
3032 player 3149 player
3033 3150
3034 cf::player 3151 cf::player
3039 3156
3040=cut 3157=cut
3041 3158
3042for ( 3159for (
3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3160 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3044 insert remove inv name archname title slaying race 3161 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3162 decrease split destroy change_exp value msg lore send_msg)],
3046 ["cf::object::player" => qw(player)], 3163 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3164 ["cf::player" => qw(peaceful send_msg)],
3048 ["cf::map" => qw(trigger)], 3165 ["cf::map" => qw(trigger)],
3049) { 3166) {
3050 no strict 'refs'; 3167 no strict 'refs';
3051 my ($pkg, @funs) = @$_; 3168 my ($pkg, @funs) = @$_;
3052 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3169 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3069 my ($code, %vars) = @_; 3186 my ($code, %vars) = @_;
3070 3187
3071 my $qcode = $code; 3188 my $qcode = $code;
3072 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3073 $qcode =~ s/\n/\\n/g; 3190 $qcode =~ s/\n/\\n/g;
3191
3192 %vars = (_dummy => 0) unless %vars;
3074 3193
3075 local $_; 3194 local $_;
3076 local @safe::cf::_safe_eval_args = values %vars; 3195 local @safe::cf::_safe_eval_args = values %vars;
3077 3196
3078 my $eval = 3197 my $eval =
3258 while (my ($k, $v) = each %$want) { 3377 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3378 $ns->fx_want ($k, $v);
3260 } 3379 }
3261}; 3380};
3262 3381
3382sub load_resource_file($) {
3383 my $guard = lock_acquire "load_resource_file";
3384
3385 my $status = load_resource_file_ $_[0];
3386 get_slot 0.1, 100;
3387 cf::arch::commit_load;
3388
3389 $status
3390}
3391
3263sub reload_regions { 3392sub reload_regions {
3264 # HACK to clear player env face cache, we need some signal framework 3393 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?) 3394 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3395 %ext::player_env::MUSIC_FACE_CACHE = ();
3267 3396
3280} 3409}
3281 3410
3282sub reload_archetypes { 3411sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3412 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3413 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
3288 load_resource_file "$DATADIR/archetypes"
3289 or die "unable to load archetypes\n";
3290} 3414}
3291 3415
3292sub reload_treasures { 3416sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3417 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3418 or die "unable to load treasurelists\n";
3295} 3419}
3296 3420
3297sub reload_resources { 3421sub reload_resources {
3298 warn "reloading resource files...\n"; 3422 warn "reloading resource files...\n";
3299 3423
3424 reload_facedata;
3425 reload_archetypes;
3300 reload_regions; 3426 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3427 reload_treasures;
3305 3428
3306 warn "finished reloading resource files\n"; 3429 warn "finished reloading resource files\n";
3307} 3430}
3308 3431
3309sub init {
3310 reload_resources;
3311}
3312
3313sub reload_config { 3432sub reload_config {
3433 warn "reloading config file...\n";
3434
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3435 open my $fh, "<:utf8", "$CONFDIR/config"
3315 or return; 3436 or return;
3316 3437
3317 local $/; 3438 local $/;
3318 *CFG = YAML::Syck::Load <$fh>; 3439 *CFG = YAML::XS::Load scalar <$fh>;
3319 3440
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3441 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3321 3442
3322 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3443 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3323 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3444 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3327 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3448 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3328 and die "WARNING: m(un)lockall failed: $!\n"; 3449 and die "WARNING: m(un)lockall failed: $!\n";
3329 }; 3450 };
3330 warn $@ if $@; 3451 warn $@ if $@;
3331 } 3452 }
3453
3454 warn "finished reloading resource files\n";
3455}
3456
3457sub pidfile() {
3458 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3459 or die "$PIDFILE: $!";
3460 flock $fh, &Fcntl::LOCK_EX
3461 or die "$PIDFILE: flock: $!";
3462 $fh
3463}
3464
3465# make sure only one server instance is running at any one time
3466sub atomic {
3467 my $fh = pidfile;
3468
3469 my $pid = <$fh>;
3470 kill 9, $pid if $pid > 0;
3471
3472 seek $fh, 0, 0;
3473 print $fh $$;
3474}
3475
3476sub main_loop {
3477 warn "EV::loop starting\n";
3478 if (1) {
3479 EV::loop;
3480 }
3481 warn "EV::loop returned\n";
3482 goto &main_loop unless $REALLY_UNLOOP;
3332} 3483}
3333 3484
3334sub main { 3485sub main {
3486 cf::init_globals; # initialise logging
3487
3488 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3489 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3490 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3491 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3492
3493 cf::init_experience;
3494 cf::init_anim;
3495 cf::init_attackmess;
3496 cf::init_dynamic;
3497
3498 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3499
3335 # we must not ever block the main coroutine 3500 # we must not ever block the main coroutine
3336 local $Coro::idle = sub { 3501 local $Coro::idle = sub {
3337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3502 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3338 (async { 3503 (async {
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3504 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3505 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3506 })->prio (Coro::PRIO_MAX);
3342 }; 3507 };
3343 3508
3509 evthread_start IO::AIO::poll_fileno;
3510
3511 cf::sync_job {
3512 reload_resources;
3344 reload_config; 3513 reload_config;
3345 db_init; 3514 db_init;
3515
3516 cf::load_settings;
3517 cf::load_materials;
3518 cf::init_uuid;
3519 cf::init_signals;
3520 cf::init_commands;
3521 cf::init_skills;
3522
3523 cf::init_beforeplay;
3524
3525 atomic;
3526
3346 load_extensions; 3527 load_extensions;
3347 3528
3348 $TICK_WATCHER->start; 3529 utime time, time, $RUNTIMEFILE;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3530
3350 EV::loop; 3531 # no (long-running) fork's whatsoever before this point(!)
3532 use POSIX ();
3533 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3534
3535 (pop @POST_INIT)->(0) while @POST_INIT;
3536 };
3537
3538 main_loop;
3351} 3539}
3352 3540
3353############################################################################# 3541#############################################################################
3354# initialisation and cleanup 3542# initialisation and cleanup
3355 3543
3361 cf::cleanup "SIG$signal"; 3549 cf::cleanup "SIG$signal";
3362 }; 3550 };
3363 } 3551 }
3364} 3552}
3365 3553
3366sub write_runtime { 3554sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime";
3368
3369 # first touch the runtime file to show we are still running: 3555 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3556 # the fsync below can take a very very long time.
3371 3557
3372 IO::AIO::aio_utime $runtime, undef, undef; 3558 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3373 3559
3374 my $guard = cf::lock_acquire "write_runtime"; 3560 my $guard = cf::lock_acquire "write_runtime";
3375 3561
3376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3562 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3377 or return; 3563 or return;
3378 3564
3379 my $value = $cf::RUNTIME + 90 + 10; 3565 my $value = $cf::RUNTIME + 90 + 10;
3380 # 10 is the runtime save interval, for a monotonic clock 3566 # 10 is the runtime save interval, for a monotonic clock
3381 # 60 allows for the watchdog to kill the server. 3567 # 60 allows for the watchdog to kill the server.
3391 aio_utime $fh, undef, undef; 3577 aio_utime $fh, undef, undef;
3392 3578
3393 close $fh 3579 close $fh
3394 or return; 3580 or return;
3395 3581
3396 aio_rename "$runtime~", $runtime 3582 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3397 and return; 3583 and return;
3398 3584
3399 warn "runtime file written.\n"; 3585 warn "runtime file written.\n";
3400 3586
3401 1 3587 1
3588}
3589
3590our $uuid_lock;
3591our $uuid_skip;
3592
3593sub write_uuid_sync($) {
3594 $uuid_skip ||= $_[0];
3595
3596 return if $uuid_lock;
3597 local $uuid_lock = 1;
3598
3599 my $uuid = "$LOCALDIR/uuid";
3600
3601 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3602 or return;
3603
3604 my $value = uuid_seq uuid_cur;
3605
3606 unless ($value) {
3607 warn "cowardly refusing to write zero uuid value!\n";
3608 return;
3609 }
3610
3611 my $value = uuid_str $value + $uuid_skip;
3612 $uuid_skip = 0;
3613
3614 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3615 and return;
3616
3617 # always fsync - this file is important
3618 aio_fsync $fh
3619 and return;
3620
3621 close $fh
3622 or return;
3623
3624 aio_rename "$uuid~", $uuid
3625 and return;
3626
3627 warn "uuid file written ($value).\n";
3628
3629 1
3630
3631}
3632
3633sub write_uuid($$) {
3634 my ($skip, $sync) = @_;
3635
3636 $sync ? write_uuid_sync $skip
3637 : async { write_uuid_sync $skip };
3402} 3638}
3403 3639
3404sub emergency_save() { 3640sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3641 my $freeze_guard = cf::freeze_mainloop;
3406 3642
3407 warn "enter emergency perl save\n"; 3643 warn "emergency_perl_save: enter\n";
3408 3644
3409 cf::sync_job { 3645 cf::sync_job {
3646 # this is a trade-off: we want to be very quick here, so
3647 # save all maps without fsync, and later call a global sync
3648 # (which in turn might be very very slow)
3649 local $USE_FSYNC = 0;
3650
3410 # use a peculiar iteration method to avoid tripping on perl 3651 # use a peculiar iteration method to avoid tripping on perl
3411 # refcount bugs in for. also avoids problems with players 3652 # refcount bugs in for. also avoids problems with players
3412 # and maps saved/destroyed asynchronously. 3653 # and maps saved/destroyed asynchronously.
3413 warn "begin emergency player save\n"; 3654 warn "emergency_perl_save: begin player save\n";
3414 for my $login (keys %cf::PLAYER) { 3655 for my $login (keys %cf::PLAYER) {
3415 my $pl = $cf::PLAYER{$login} or next; 3656 my $pl = $cf::PLAYER{$login} or next;
3416 $pl->valid or next; 3657 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3658 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3418 $pl->save; 3659 $pl->save;
3419 } 3660 }
3420 warn "end emergency player save\n"; 3661 warn "emergency_perl_save: end player save\n";
3421 3662
3422 warn "begin emergency map save\n"; 3663 warn "emergency_perl_save: begin map save\n";
3423 for my $path (keys %cf::MAP) { 3664 for my $path (keys %cf::MAP) {
3424 my $map = $cf::MAP{$path} or next; 3665 my $map = $cf::MAP{$path} or next;
3425 $map->valid or next; 3666 $map->valid or next;
3426 $map->save; 3667 $map->save;
3427 } 3668 }
3428 warn "end emergency map save\n"; 3669 warn "emergency_perl_save: end map save\n";
3429 3670
3430 warn "begin emergency database checkpoint\n"; 3671 warn "emergency_perl_save: begin database checkpoint\n";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3672 BDB::db_env_txn_checkpoint $DB_ENV;
3432 warn "end emergency database checkpoint\n"; 3673 warn "emergency_perl_save: end database checkpoint\n";
3674
3675 warn "emergency_perl_save: begin write uuid\n";
3676 write_uuid_sync 1;
3677 warn "emergency_perl_save: end write uuid\n";
3433 }; 3678 };
3434 3679
3680 warn "emergency_perl_save: starting sync()\n";
3681 IO::AIO::aio_sync sub {
3682 warn "emergency_perl_save: finished sync()\n";
3683 };
3684
3435 warn "leave emergency perl save\n"; 3685 warn "emergency_perl_save: leave\n";
3436} 3686}
3437 3687
3438sub post_cleanup { 3688sub post_cleanup {
3439 my ($make_core) = @_; 3689 my ($make_core) = @_;
3440 3690
3441 warn Carp::longmess "post_cleanup backtrace" 3691 warn Carp::longmess "post_cleanup backtrace"
3442 if $make_core; 3692 if $make_core;
3693
3694 my $fh = pidfile;
3695 unlink $PIDFILE if <$fh> == $$;
3696}
3697
3698# a safer delete_package, copied from Symbol
3699sub clear_package($) {
3700 my $pkg = shift;
3701
3702 # expand to full symbol table name if needed
3703 unless ($pkg =~ /^main::.*::$/) {
3704 $pkg = "main$pkg" if $pkg =~ /^::/;
3705 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3706 $pkg .= '::' unless $pkg =~ /::$/;
3707 }
3708
3709 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3710 my $stem_symtab = *{$stem}{HASH};
3711
3712 defined $stem_symtab and exists $stem_symtab->{$leaf}
3713 or return;
3714
3715 # clear all symbols
3716 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3717 for my $name (keys %$leaf_symtab) {
3718 _gv_clear *{"$pkg$name"};
3719# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3720 }
3721 warn "cleared package $pkg\n";#d#
3443} 3722}
3444 3723
3445sub do_reload_perl() { 3724sub do_reload_perl() {
3446 # can/must only be called in main 3725 # can/must only be called in main
3447 if ($Coro::current != $Coro::main) { 3726 if ($Coro::current != $Coro::main) {
3448 warn "can only reload from main coroutine"; 3727 warn "can only reload from main coroutine";
3449 return; 3728 return;
3450 } 3729 }
3451 3730
3731 return if $RELOAD++;
3732
3733 my $t1 = EV::time;
3734
3735 while ($RELOAD) {
3452 warn "reloading..."; 3736 warn "reloading...";
3453 3737
3454 warn "entering sync_job"; 3738 warn "entering sync_job";
3455 3739
3456 cf::sync_job { 3740 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark 3741 cf::write_runtime_sync; # external watchdog should not bark
3458 cf::emergency_save; 3742 cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark 3743 cf::write_runtime_sync; # external watchdog should not bark
3460 3744
3461 warn "syncing database to disk"; 3745 warn "syncing database to disk";
3462 BDB::db_env_txn_checkpoint $DB_ENV; 3746 BDB::db_env_txn_checkpoint $DB_ENV;
3463 3747
3464 # if anything goes wrong in here, we should simply crash as we already saved 3748 # if anything goes wrong in here, we should simply crash as we already saved
3465 3749
3466 warn "flushing outstanding aio requests"; 3750 warn "flushing outstanding aio requests";
3467 for (;;) {
3468 BDB::flush;
3469 IO::AIO::flush;
3470 Coro::cede_notself;
3471 last unless IO::AIO::nreqs || BDB::nreqs; 3751 while (IO::AIO::nreqs || BDB::nreqs) {
3472 warn "iterate..."; 3752 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3473 }
3474
3475 ++$RELOAD;
3476
3477 warn "cancelling all extension coros";
3478 $_->cancel for values %EXT_CORO;
3479 %EXT_CORO = ();
3480
3481 warn "removing commands";
3482 %COMMAND = ();
3483
3484 warn "removing ext/exti commands";
3485 %EXTCMD = ();
3486 %EXTICMD = ();
3487
3488 warn "unloading/nuking all extensions";
3489 for my $pkg (@EXTS) {
3490 warn "... unloading $pkg";
3491
3492 if (my $cb = $pkg->can ("unload")) {
3493 eval {
3494 $cb->($pkg);
3495 1
3496 } or warn "$pkg unloaded, but with errors: $@";
3497 } 3753 }
3498 3754
3499 warn "... nuking $pkg"; 3755 warn "cancelling all extension coros";
3500 Symbol::delete_package $pkg; 3756 $_->cancel for values %EXT_CORO;
3501 } 3757 %EXT_CORO = ();
3502 3758
3503 warn "unloading all perl modules loaded from $LIBDIR"; 3759 warn "removing commands";
3504 while (my ($k, $v) = each %INC) { 3760 %COMMAND = ();
3505 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506 3761
3762 warn "removing ext/exti commands";
3763 %EXTCMD = ();
3764 %EXTICMD = ();
3765
3766 warn "unloading/nuking all extensions";
3767 for my $pkg (@EXTS) {
3507 warn "... unloading $k"; 3768 warn "... unloading $pkg";
3508 delete $INC{$k};
3509 3769
3510 $k =~ s/\.pm$//;
3511 $k =~ s/\//::/g;
3512
3513 if (my $cb = $k->can ("unload_module")) { 3770 if (my $cb = $pkg->can ("unload")) {
3771 eval {
3514 $cb->(); 3772 $cb->($pkg);
3773 1
3774 } or warn "$pkg unloaded, but with errors: $@";
3775 }
3776
3777 warn "... clearing $pkg";
3778 clear_package $pkg;
3515 } 3779 }
3516 3780
3517 Symbol::delete_package $k; 3781 warn "unloading all perl modules loaded from $LIBDIR";
3782 while (my ($k, $v) = each %INC) {
3783 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3784
3785 warn "... unloading $k";
3786 delete $INC{$k};
3787
3788 $k =~ s/\.pm$//;
3789 $k =~ s/\//::/g;
3790
3791 if (my $cb = $k->can ("unload_module")) {
3792 $cb->();
3793 }
3794
3795 clear_package $k;
3518 } 3796 }
3519 3797
3520 warn "getting rid of safe::, as good as possible"; 3798 warn "getting rid of safe::, as good as possible";
3521 Symbol::delete_package "safe::$_" 3799 clear_package "safe::$_"
3522 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3800 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3523 3801
3524 warn "unloading cf.pm \"a bit\""; 3802 warn "unloading cf.pm \"a bit\"";
3525 delete $INC{"cf.pm"}; 3803 delete $INC{"cf.pm"};
3526 delete $INC{"cf/pod.pm"}; 3804 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3527 3805
3528 # don't, removes xs symbols, too, 3806 # don't, removes xs symbols, too,
3529 # and global variables created in xs 3807 # and global variables created in xs
3530 #Symbol::delete_package __PACKAGE__; 3808 #clear_package __PACKAGE__;
3531 3809
3532 warn "unload completed, starting to reload now"; 3810 warn "unload completed, starting to reload now";
3533 3811
3534 warn "reloading cf.pm"; 3812 warn "reloading cf.pm";
3535 require cf; 3813 require cf;
3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3814 cf::_connect_to_perl_1;
3537 3815
3538 warn "loading config and database again"; 3816 warn "loading config and database again";
3539 cf::reload_config; 3817 cf::reload_config;
3540 3818
3541 warn "loading extensions"; 3819 warn "loading extensions";
3542 cf::load_extensions; 3820 cf::load_extensions;
3543 3821
3822 if ($REATTACH_ON_RELOAD) {
3544 warn "reattaching attachments to objects/players"; 3823 warn "reattaching attachments to objects/players";
3545 _global_reattach; # objects, sockets 3824 _global_reattach; # objects, sockets
3546 warn "reattaching attachments to maps"; 3825 warn "reattaching attachments to maps";
3547 reattach $_ for values %MAP; 3826 reattach $_ for values %MAP;
3548 warn "reattaching attachments to players"; 3827 warn "reattaching attachments to players";
3549 reattach $_ for values %PLAYER; 3828 reattach $_ for values %PLAYER;
3829 }
3550 3830
3831 warn "running post_init jobs";
3832 (pop @POST_INIT)->(1) while @POST_INIT;
3833
3551 warn "leaving sync_job"; 3834 warn "leaving sync_job";
3552 3835
3553 1 3836 1
3554 } or do { 3837 } or do {
3555 warn $@; 3838 warn $@;
3556 warn "error while reloading, exiting."; 3839 cf::cleanup "error while reloading, exiting.";
3557 exit 1;
3558 }; 3840 };
3559 3841
3560 warn "reloaded"; 3842 warn "reloaded";
3843 --$RELOAD;
3844 }
3845
3846 $t1 = EV::time - $t1;
3847 warn "reload completed in ${t1}s\n";
3561}; 3848};
3562 3849
3563our $RELOAD_WATCHER; # used only during reload 3850our $RELOAD_WATCHER; # used only during reload
3564 3851
3565sub reload_perl() { 3852sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 3853 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 3854 # coro crashes during coro_state_free->destroy here.
3568 3855
3856 $RELOAD_WATCHER ||= cf::async {
3857 Coro::AIO::aio_wait cache_extensions;
3858
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3859 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3860 do_reload_perl;
3570 undef $RELOAD_WATCHER; 3861 undef $RELOAD_WATCHER;
3571 do_reload_perl; 3862 };
3572 }; 3863 };
3573} 3864}
3574 3865
3575register_command "reload" => sub { 3866register_command "reload" => sub {
3576 my ($who, $arg) = @_; 3867 my ($who, $arg) = @_;
3590 3881
3591our @WAIT_FOR_TICK; 3882our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 3883our @WAIT_FOR_TICK_BEGIN;
3593 3884
3594sub wait_for_tick { 3885sub wait_for_tick {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3886 return if tick_inhibit || $Coro::current == $Coro::main;
3597 3887
3598 my $signal = new Coro::Signal; 3888 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 3889 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 3890 $signal->wait;
3601} 3891}
3602 3892
3603sub wait_for_tick_begin { 3893sub wait_for_tick_begin {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 3894 return if tick_inhibit || $Coro::current == $Coro::main;
3606 3895
3607 my $signal = new Coro::Signal; 3896 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 3897 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 3898 $signal->wait;
3610} 3899}
3611 3900
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3901sub tick {
3613 if ($Coro::current != $Coro::main) { 3902 if ($Coro::current != $Coro::main) {
3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3903 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3615 unless ++$bug_warning > 10; 3904 unless ++$bug_warning > 10;
3616 return; 3905 return;
3617 } 3906 }
3618 3907
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 3908 cf::server_tick; # one server iteration
3622
3623 $RUNTIME += $TICK;
3624 $NEXT_TICK = $_[0]->at;
3625 3909
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3910 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3911 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3628 Coro::async_pool { 3912 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 3913 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 3914 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 3915 or warn "ERROR: unable to write runtime file: $!";
3632 }; 3916 };
3633 } 3917 }
3634 3918
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3919 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3637 } 3921 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 3922 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 3923 $sig->send;
3640 } 3924 }
3641 3925
3642 $LOAD = ($NOW - $tick_start) / $TICK; 3926 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3927 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 3928
3645 _post_tick; 3929 if (0) {
3646}; 3930 if ($NEXT_TICK) {
3647$TICK_WATCHER->priority (EV::MAXPRI); 3931 my $jitter = $TICK_START - $NEXT_TICK;
3932 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3933 warn "jitter $JITTER\n";#d#
3934 }
3935 }
3936}
3648 3937
3649{ 3938{
3650 # configure BDB 3939 # configure BDB
3651 3940
3652 BDB::min_parallel 8; 3941 BDB::min_parallel 8;
3653 BDB::max_poll_reqs $TICK * 0.1; 3942 BDB::max_poll_reqs $TICK * 0.1;
3654 $Coro::BDB::WATCHER->priority (1); 3943 $AnyEvent::BDB::WATCHER->priority (1);
3655 3944
3656 unless ($DB_ENV) { 3945 unless ($DB_ENV) {
3657 $DB_ENV = BDB::db_env_create; 3946 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3947 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659 | BDB::LOG_AUTOREMOVE, 1); 3948 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3949 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3950 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3951 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662 3952
3663 cf::sync_job { 3953 cf::sync_job {
3664 eval { 3954 eval {
3690{ 3980{
3691 # configure IO::AIO 3981 # configure IO::AIO
3692 3982
3693 IO::AIO::min_parallel 8; 3983 IO::AIO::min_parallel 8;
3694 IO::AIO::max_poll_time $TICK * 0.1; 3984 IO::AIO::max_poll_time $TICK * 0.1;
3695 $Coro::AIO::WATCHER->priority (1); 3985 undef $AnyEvent::AIO::WATCHER;
3696} 3986}
3697 3987
3698my $_log_backtrace; 3988my $_log_backtrace;
3699 3989
3700sub _log_backtrace { 3990sub _log_backtrace {
3703 $msg =~ s/\n//; 3993 $msg =~ s/\n//;
3704 3994
3705 # limit the # of concurrent backtraces 3995 # limit the # of concurrent backtraces
3706 if ($_log_backtrace < 2) { 3996 if ($_log_backtrace < 2) {
3707 ++$_log_backtrace; 3997 ++$_log_backtrace;
3998 my $perl_bt = Carp::longmess $msg;
3708 async { 3999 async {
3709 $Coro::current->{desc} = "abt $msg"; 4000 $Coro::current->{desc} = "abt $msg";
3710 4001
3711 my @bt = fork_call { 4002 my @bt = fork_call {
3712 @addr = map { sprintf "%x", $_ } @addr; 4003 @addr = map { sprintf "%x", $_ } @addr;
3723 } 4014 }
3724 4015
3725 @funcs 4016 @funcs
3726 }; 4017 };
3727 4018
3728 LOG llevInfo, "[ABT] $msg\n"; 4019 LOG llevInfo, "[ABT] $perl_bt\n";
4020 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3729 LOG llevInfo, "[ABT] $_\n" for @bt; 4021 LOG llevInfo, "[ABT] $_\n" for @bt;
3730 --$_log_backtrace; 4022 --$_log_backtrace;
3731 }; 4023 };
3732 } else { 4024 } else {
3733 LOG llevInfo, "[ABT] $msg\n"; 4025 LOG llevInfo, "[ABT] $msg\n";
3734 LOG llevInfo, "[ABT] [suppressed]\n"; 4026 LOG llevInfo, "[ABT] [suppressed]\n";
3735 } 4027 }
3736} 4028}
3737 4029
3738# load additional modules 4030# load additional modules
3739use cf::pod; 4031require "cf/$_.pm" for @EXTRA_MODULES;
4032cf::_connect_to_perl_2;
3740 4033
3741END { cf::emergency_save } 4034END { cf::emergency_save }
3742 4035
37431 40361
3744 4037

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines