ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.397 by root, Mon Nov 19 15:47:14 2007 UTC vs.
Revision 1.470 by root, Sun Apr 26 19:42:45 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines