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.398 by root, Wed Dec 5 11:08:34 2007 UTC vs.
Revision 1.478 by root, Thu Sep 17 01:57:31 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines