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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines