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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines