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.487 by root, Fri Oct 16 01:56:41 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
14 37
38use Guard ();
15use Coro 4.1 (); 39use Coro ();
16use Coro::State; 40use Coro::State;
17use Coro::Handle; 41use Coro::Handle;
18use Coro::EV; 42use Coro::EV;
43use Coro::AnyEvent;
19use Coro::Timer; 44use Coro::Timer;
20use Coro::Signal; 45use Coro::Signal;
21use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
48use Coro::AnyEvent;
22use Coro::AIO; 49use Coro::AIO;
50use Coro::BDB 1.6;
23use Coro::Storable; 51use Coro::Storable;
24use Coro::Util (); 52use Coro::Util ();
25 53
26use JSON::XS 2.01 (); 54use JSON::XS 2.01 ();
27use BDB (); 55use BDB ();
28use Data::Dumper; 56use Data::Dumper;
29use Digest::MD5; 57use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.51 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 78# strictly for debugging
44$YAML::Syck::ImplicitUnicode = 1; 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 80
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
63our $DATADIR = datadir; 98our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
73 112
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $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 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 115our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
81 117
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 121our $DB_ENV;
87 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
88our %CFG; 125our %CFG;
89 126
90our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 128our $RUNTIME;
129our $NOW;
92 130
93our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
96 134
97# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 137
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
103 147
104binmode STDOUT; 148binmode STDOUT;
105binmode STDERR; 149binmode STDERR;
106 150
107# read virtual server time, if available 151# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
112} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
113 159
114mkdir $_ 160mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 162
117our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
118 164
119sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
120 177
121############################################################################# 178#############################################################################
122 179
123=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
124 181
175 232
176This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
177C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call. 235that call.
179 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
180=back 243=back
181 244
182=cut 245=cut
183 246
184BEGIN { 247$Coro::State::WARNHOOK = sub {
185 *CORE::GLOBAL::warn = sub {
186 my $msg = join "", @_; 248 my $msg = join "", @_;
187 249
188 $msg .= "\n" 250 $msg .= "\n"
189 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
190 252
191 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
192 254
193 LOG llevError, $msg; 255 LOG llevError, $msg;
194 }; 256};
195} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
196 271
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 282for my $pkg (qw(
208 cf::global cf::attachable 283 cf::global cf::attachable
209 cf::object cf::object::player 284 cf::object cf::object::player
210 cf::client cf::player 285 cf::client cf::player
211 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
212 cf::map cf::party cf::region 288 cf::party cf::region
213)) { 289)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 291}
217 292
218$EV::DIED = sub { 293$EV::DIED = sub {
219 warn "error in event callback: @_"; 294 warn "error in event callback: @_";
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 337
263sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
264sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
265 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
266=item cf::lock_wait $string 355=item cf::lock_wait $string
267 356
268Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
269 358
270=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
271 360
272Wait until the given lock is available and then acquires it and returns 361Wait 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, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
275returned. 364returned.
276 365
277Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 367deadlocked coro.
284 373
285Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
286 375
287=cut 376=cut
288 377
289our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 379
292sub lock_wait($) { 380sub lock_wait($) {
293 my ($key) = @_; 381 $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} 382}
306 383
307sub lock_acquire($) { 384sub lock_acquire($) {
308 my ($key) = @_; 385 $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} 386}
322 387
323sub lock_active($) { 388sub lock_active($) {
324 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 390}
328 391
329sub freeze_mainloop { 392sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
331 394
332 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 396}
338 397
339=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
340 399
341Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
396 } 455 }
397 } 456 }
398}; 457};
399 458
400sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
401 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
402 463
403 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
404 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
405 466
442 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
444 505
445 LOG llevError, Carp::longmess "sync job";#d# 506 LOG llevError, Carp::longmess "sync job";#d#
446 507
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
450 509
451 my $busy = 1; 510 my $busy = 1;
452 my @res; 511 my @res;
453 512
464 } else { 523 } else {
465 EV::loop EV::LOOP_ONESHOT; 524 EV::loop EV::LOOP_ONESHOT;
466 } 525 }
467 } 526 }
468 527
469 $time = EV::time - $time; 528 my $time = EV::time - $time;
470 529
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 530 $TICK_START += $time; # do not account sync jobs to server load
475 531
476 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
477 } else { 533 } else {
478 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
479 535
521 reset_signals; 577 reset_signals;
522 &$cb 578 &$cb
523 }, @args; 579 }, @args;
524 580
525 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
582}
583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
526} 609}
527 610
528=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
529 612
530Returns a single value from the environment database. 613Returns a single value from the environment database.
669 752
670############################################################################# 753#############################################################################
671 754
672=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
673 756
674Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
675attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
677 760
678In the following description, CLASS can be any of C<global>, C<object> 761In 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 762C<player>, C<client> or C<map> (i.e. the attachable objects in
729=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
730 813
731Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
733 816
734Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
735that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
736 819
737These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
738 821
739=over 4 822=over 4
967 } 1050 }
968 1051
969 0 1052 0
970} 1053}
971 1054
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1056
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1058
976Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
977 1060
1030 1113
1031sub reattach { 1114sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1116 my ($obj) = @_;
1034 1117
1118 # no longer needed after getting rid of delete_package?
1035 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1036 1120
1037 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1038 1122
1039 @$registry = (); 1123 @$registry = ();
1040 1124
1086 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1089 1173
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1094 close $fh; 1181 aio_close $fh;
1095 1182
1096 if (@$objs) { 1183 if (@$objs) {
1097 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1101 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1102 close $fh; 1192 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1194 }
1105 } else { 1195 } else {
1106 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1107 } 1197 }
1108 1198
1109 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1203 } else {
1111 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1112 } 1205 }
1113 } else { 1206 } else {
1114 aio_unlink $filename; 1207 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1116 } 1209 }
1207 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1208 1301
1209 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1210} 1303}
1211 1304
1305use File::Glob ();
1306
1212cf::player->attach ( 1307cf::player->attach (
1213 on_command => sub { 1308 on_command => sub {
1214 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1215 1310
1216 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1248 1343
1249 cf::override; 1344 cf::override;
1250 }, 1345 },
1251); 1346);
1252 1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1360
1253sub load_extensions { 1361sub load_extensions {
1254 cf::sync_job { 1362 cf::sync_job {
1255 my %todo; 1363 my %todo;
1256 1364
1257 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
1276 1384
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1387
1280 $ext{source} = 1388 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1282 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1283 . $source 1391 . $source
1284 . "\n};\n1"; 1392 . "\n};\n1";
1285 1393
1286 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1302 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1303 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1304 1412
1305 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1306 warn $msg; 1414 warn $msg;
1307 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1308 exit 1;
1309 } 1416 }
1310 1417
1311 warn $msg; 1418 warn $msg;
1312 } 1419 }
1313 1420
1327 1434
1328=back 1435=back
1329 1436
1330=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1331 1438
1332Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1333 1440
1334=cut 1441=cut
1335 1442
1336package cf::player; 1443package cf::player;
1337 1444
1380 1487
1381sub exists($) { 1488sub exists($) {
1382 my ($login) = @_; 1489 my ($login) = @_;
1383 1490
1384 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1386} 1493}
1387 1494
1388sub find($) { 1495sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1497 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1510 or return;
1404 1511
1405 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1406 or return; 1513 or return;
1514
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1410 } 1518 }
1411 } 1519 }
1421 1529
1422 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1423 1531
1424 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1426 1536
1427 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1538 cf::cede_to_tick;
1429} 1539}
1430 1540
1462 my ($pl) = @_; 1572 my ($pl) = @_;
1463 1573
1464 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1465 1575
1466 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1467 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1468 1578
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1473 1585
1474 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1514 1626
1515 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1516 my $path = path $login; 1628 my $path = path $login;
1517 1629
1518 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1636 }
1524 1637
1555 } 1668 }
1556 1669
1557 \@paths 1670 \@paths
1558} 1671}
1559 1672
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1674
1562Expand crossfire pod fragments into protocol xml. 1675Expand 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 1676
1653=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1654 1678
1655Sends an ext reply to the player. 1679Sends an ext reply to the player.
1656 1680
1723our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1725 1749
1726sub generate_random_map { 1750sub generate_random_map {
1727 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1728 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1756 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1854 1881
1855# the temporary/swap location 1882# the temporary/swap location
1856sub save_path { 1883sub save_path {
1857 my ($self) = @_; 1884 my ($self) = @_;
1858 1885
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1861} 1888}
1862 1889
1863# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1864sub uniq_path { 1891sub uniq_path {
1865 my ($self) = @_; 1892 my ($self) = @_;
1866 1893
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1895 "$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} 1896}
1879 1897
1880sub decay_objects { 1898sub decay_objects {
1881 my ($self) = @_; 1899 my ($self) = @_;
1882 1900
1966sub find { 1984sub find {
1967 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1968 1986
1969 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1970 1988
1971 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1973 1991
1974 $cf::MAP{$path} || do { 1992 $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 1993 my $map = new_from_path cf::map $path
1979 or return; 1994 or return;
1980 1995
1981 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1982 1997
1984 or return; 1999 or return;
1985 2000
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
1989 undef $guard1; 2005 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2006 $map->reset;
1992 return find $path; 2007 return find $path;
1993 } 2008 }
1994 2009
1995 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2038 $f->skip_block;
2024 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
2025 or return; 2040 or return;
2026 2041
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
2028 if delete $self->{load_original}; 2043 if delete $self->{load_original};
2029 2044
2030 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2046 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
2050 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2066 $self->decay_objects;
2052 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2053 $self->update_buttons; 2068 $self->update_buttons;
2054 cf::cede_to_tick; 2069 cf::cede_to_tick;
2055 $self->set_darkness_map;
2056 cf::cede_to_tick;
2057 $self->activate; 2070 $self->activate;
2058 } 2071 }
2059 2072
2060 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
2062 2075
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2077 }
2065 2078
2066 $self->post_load; 2079 $self->post_load;
2067} 2080}
2068 2081
2126 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2127 2140
2128 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2129 2142
2130 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2145 }
2133 2146
2134 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2135 2148
2136 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2173 cf::async { 2186 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2187 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2176 }; 2189 };
2177 2190
2191 cf::get_slot 0.02;
2192
2178 if ($uniq) { 2193 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2196 } else {
2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2190 $self->save; 2205 $self->save;
2191 2206
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2208
2194 return if $self->players; 2209 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2196 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2197 2212
2198 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2199 2214
2200 $self->deactivate; 2215 $self->deactivate;
2225 2240
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2242
2228 return if $self->players; 2243 return if $self->players;
2229 2244
2230 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2231 2246
2232 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2233 2248
2234 # need to save uniques path 2249 # need to save uniques path
2235 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2318 2333
2319sub unique_maps() { 2334sub unique_maps() {
2320 [ 2335 [
2321 map { 2336 map {
2322 utf8::decode $_; 2337 utf8::decode $_;
2323 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2324 ? normalise $_ 2341 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2343 ]
2328} 2344}
2329 2345
2330package cf;
2331
2332=back 2346=back
2333 2347
2334=head3 cf::object 2348=head3 cf::object
2335 2349
2336=cut 2350=cut
2339 2353
2340=over 4 2354=over 4
2341 2355
2342=item $ob->inv_recursive 2356=item $ob->inv_recursive
2343 2357
2344Returns the inventory of the object _and_ their inventories, recursively. 2358Returns the inventory of the object I<and> their inventories, recursively,
2359but I<not> the object itself.
2345 2360
2346=cut 2361=cut
2347 2362
2348sub inv_recursive_; 2363sub inv_recursive_;
2349sub inv_recursive_ { 2364sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2369 inv_recursive_ inv $_[0]
2355} 2370}
2356 2371
2357=item $ref = $ob->ref 2372=item $ref = $ob->ref
2358 2373
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2374Creates and returns a persistent reference to an object that can be stored as a string.
2360 2375
2361=item $ob = cf::object::deref ($refstring) 2376=item $ob = cf::object::deref ($refstring)
2362 2377
2363returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2378returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2364even if the object actually exists. May block. 2379even if the object actually exists. May block.
2396can be C<undef>. Does the right thing when the player is currently in a 2411can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2412dialogue with the given NPC character.
2398 2413
2399=cut 2414=cut
2400 2415
2416our $SAY_CHANNEL = {
2417 id => "say",
2418 title => "Map",
2419 reply => "say ",
2420 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2421};
2422
2423our $CHAT_CHANNEL = {
2424 id => "chat",
2425 title => "Chat",
2426 reply => "chat ",
2427 tooltip => "Player chat and shouts, global to the server.",
2428};
2429
2401# rough implementation of a future "reply" method that works 2430# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2431# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2432#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2433sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2434 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2445 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2446 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2447
2419 } else { 2448 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2449 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2450 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2451 }
2423 } 2452 }
2424} 2453}
2425 2454
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2455=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2480
2452=item $player_object->enter_link 2481=item $player_object->enter_link
2453 2482
2454Freezes the player and moves him/her to a special map (C<{link}>). 2483Freezes the player and moves him/her to a special map (C<{link}>).
2455 2484
2456The player should be reasonably safe there for short amounts of time. You 2485The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2486for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487though, as the palyer cannot control the character while it is on the link
2488map.
2458 2489
2459Will never block. 2490Will never block.
2460 2491
2461=item $player_object->leave_link ($map, $x, $y) 2492=item $player_object->leave_link ($map, $x, $y)
2462 2493
2520 2551
2521 $map->load; 2552 $map->load;
2522 $map->load_neighbours; 2553 $map->load_neighbours;
2523 2554
2524 return unless $self->contr->active; 2555 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2556
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2558 $self->enter_map ($map, $x, $y);
2559
2560 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive;
2529} 2562}
2530 2563
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532 2565
2533Moves the player to the given map-path and coordinates by first freezing 2566Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2567her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2568that 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 2569the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2570be called at the end of this process.
2571
2572Note that $check will be called with a potentially non-loaded map, so if
2573it needs a loaded map it has to call C<< ->load >>.
2538 2574
2539=cut 2575=cut
2540 2576
2541our $GOTOGEN; 2577our $GOTOGEN;
2542 2578
2621} 2657}
2622 2658
2623sub prepare_random_map { 2659sub prepare_random_map {
2624 my ($exit) = @_; 2660 my ($exit) = @_;
2625 2661
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2662 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2663 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2664 # that depends on the exit object
2631 2665
2632 my $rmp = parse_random_map_params $exit->msg; 2666 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2668 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2669 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2670 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2671 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2672 $rmp->{origin_y} = $exit->y;
2673
2674 $exit->map->touch;
2639 } 2675 }
2640 2676
2641 $rmp->{random_seed} ||= $exit->random_seed; 2677 $rmp->{random_seed} ||= $exit->random_seed;
2642 2678
2643 my $data = cf::encode_json $rmp; 2679 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2680 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2681 my $meta = "$RANDOMDIR/$md5.meta";
2646 2682
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2683 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2684 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2685 undef $fh;
2650 aio_rename "$meta~", $meta; 2686 aio_rename "$meta~", $meta;
2651 2687
2688 my $slaying = "?random/$md5";
2689
2690 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2691 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2692 $exit->msg (undef);
2693 }
2654 } 2694 }
2655} 2695}
2656 2696
2657sub cf::object::player::enter_exit { 2697sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2698 my ($self, $exit) = @_;
2659 2699
2660 return unless $self->type == cf::PLAYER; 2700 return unless $self->type == cf::PLAYER;
2661 2701
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; 2702 $self->enter_link;
2674 2703
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 { 2704 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2705 $Coro::current->{desc} = "enter_exit";
2681 2706
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 2707 unless (eval {
2708 $self->deactivate_recursive; # just to be sure
2709
2710 # random map handling
2711 {
2712 my $guard = cf::lock_acquire "exit_prepare:$exit";
2713
2714 prepare_random_map $exit
2715 if $exit->slaying eq "/!";
2716 }
2717
2718 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2719 my $x = $exit->stats->hp;
2720 my $y = $exit->stats->sp;
2721
2684 $self->goto ($slaying, $hp, $sp); 2722 $self->goto ($map, $x, $y);
2685 2723
2724 # if exit is damned, update players death & WoR home-position
2725 $self->contr->savebed ($map, $x, $y)
2726 if $exit->flag (cf::FLAG_DAMNED);
2727
2686 1; 2728 1
2687 }) { 2729 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2730 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 2731 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 2732 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2733 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2734
2693 warn "ERROR in enter_exit: $@"; 2735 warn "ERROR in enter_exit: $@";
2723 2765
2724=cut 2766=cut
2725 2767
2726# non-persistent channels (usually the info channel) 2768# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 2769our %CHANNEL = (
2770 "c/motd" => {
2771 id => "infobox",
2772 title => "MOTD",
2773 reply => undef,
2774 tooltip => "The message of the day",
2775 },
2728 "c/identify" => { 2776 "c/identify" => {
2729 id => "infobox", 2777 id => "infobox",
2730 title => "Identify", 2778 title => "Identify",
2731 reply => undef, 2779 reply => undef,
2732 tooltip => "Items recently identified", 2780 tooltip => "Items recently identified",
2734 "c/examine" => { 2782 "c/examine" => {
2735 id => "infobox", 2783 id => "infobox",
2736 title => "Examine", 2784 title => "Examine",
2737 reply => undef, 2785 reply => undef,
2738 tooltip => "Signs and other items you examined", 2786 tooltip => "Signs and other items you examined",
2787 },
2788 "c/shopinfo" => {
2789 id => "infobox",
2790 title => "Shop Info",
2791 reply => undef,
2792 tooltip => "What your bargaining skill tells you about the shop",
2739 }, 2793 },
2740 "c/book" => { 2794 "c/book" => {
2741 id => "infobox", 2795 id => "infobox",
2742 title => "Book", 2796 title => "Book",
2743 reply => undef, 2797 reply => undef,
2759 id => "infobox", 2813 id => "infobox",
2760 title => "Body Parts", 2814 title => "Body Parts",
2761 reply => undef, 2815 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2816 tooltip => "Shows which body parts you posess and are available",
2763 }, 2817 },
2818 "c/statistics" => {
2819 id => "infobox",
2820 title => "Statistics",
2821 reply => undef,
2822 tooltip => "Shows your primary statistics",
2823 },
2824 "c/skills" => {
2825 id => "infobox",
2826 title => "Skills",
2827 reply => undef,
2828 tooltip => "Shows your experience per skill and item power",
2829 },
2830 "c/shopitems" => {
2831 id => "infobox",
2832 title => "Shop Items",
2833 reply => undef,
2834 tooltip => "Shows the items currently for sale in this shop",
2835 },
2836 "c/resistances" => {
2837 id => "infobox",
2838 title => "Resistances",
2839 reply => undef,
2840 tooltip => "Shows your resistances",
2841 },
2842 "c/pets" => {
2843 id => "infobox",
2844 title => "Pets",
2845 reply => undef,
2846 tooltip => "Shows information abotu your pets/a specific pet",
2847 },
2848 "c/perceiveself" => {
2849 id => "infobox",
2850 title => "Perceive Self",
2851 reply => undef,
2852 tooltip => "You gained detailed knowledge about yourself",
2853 },
2764 "c/uptime" => { 2854 "c/uptime" => {
2765 id => "infobox", 2855 id => "infobox",
2766 title => "Uptime", 2856 title => "Uptime",
2767 reply => undef, 2857 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 2858 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 2861 id => "infobox",
2772 title => "Map Info", 2862 title => "Map Info",
2773 reply => undef, 2863 reply => undef,
2774 tooltip => "Information related to the maps", 2864 tooltip => "Information related to the maps",
2775 }, 2865 },
2866 "c/party" => {
2867 id => "party",
2868 title => "Party",
2869 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party",
2871 },
2872 "c/death" => {
2873 id => "death",
2874 title => "Death",
2875 reply => undef,
2876 tooltip => "Reason for and more info about your most recent death",
2877 },
2878 "c/say" => $SAY_CHANNEL,
2879 "c/chat" => $CHAT_CHANNEL,
2776); 2880);
2777 2881
2778sub cf::client::send_msg { 2882sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 2883 my ($self, $channel, $msg, $color, @extra) = @_;
2780 2884
2781 $msg = $self->pl->expand_cfpod ($msg); 2885 $msg = $self->pl->expand_cfpod ($msg)
2886 unless $color & cf::NDI_VERBATIM;
2782 2887
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 2888 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 2889
2785 # check predefined channels, for the benefit of C 2890 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 2891 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 2892 $channel = $CHANNEL{$channel};
2788 2893
2789 $self->ext_msg (channel_info => $channel) 2894 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 2895 $channel = $channel->{id};
2793 2896
2794 } elsif (ref $channel) { 2897 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 2898 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 2899 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 2900 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 2901 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 2902 }
2801 2903
2802 $channel = $channel->{id}; 2904 $channel = $channel->{id};
2803 } 2905 }
2804 2906
2805 return unless @extra || length $msg; 2907 return unless @extra || length $msg;
2806 2908
2807 if ($self->can_msg) {
2808 # default colour, mask it out 2909 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2910 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 2911 if $color & cf::NDI_DEF;
2811 2912
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2913 my $pkt = "msg "
2914 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2915 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 2916 );
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 2917
2826 $color &= cf::NDI_COLOR_MASK; 2918 # try lzf for large packets
2919 $pkt = "lzf " . Compress::LZF::compress $pkt
2920 if 1024 <= length $pkt and $self->{can_lzf};
2827 2921
2828 utf8::encode $msg; 2922 # split very large packets
2829 2923 if (8192 < length $pkt and $self->{can_lzf}) {
2830 if (0 && $msg =~ /\[/) { 2924 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2831 # COMMAND/INFO 2925 $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 } 2926 }
2927
2928 $self->send_packet ($pkt);
2839} 2929}
2840 2930
2841=item $client->ext_msg ($type, @msg) 2931=item $client->ext_msg ($type, @msg)
2842 2932
2843Sends an ext event to the client. 2933Sends an ext event to the client.
3017 3107
3018The following functions and methods are available within a safe environment: 3108The following functions and methods are available within a safe environment:
3019 3109
3020 cf::object 3110 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3111 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3112 insert remove name archname title slaying race decrease split
3113 value
3023 3114
3024 cf::object::player 3115 cf::object::player
3025 player 3116 player
3026 3117
3027 cf::player 3118 cf::player
3032 3123
3033=cut 3124=cut
3034 3125
3035for ( 3126for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3128 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3129 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
3042) { 3133) {
3043 no strict 'refs'; 3134 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3135 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3136 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3062 my ($code, %vars) = @_; 3153 my ($code, %vars) = @_;
3063 3154
3064 my $qcode = $code; 3155 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3156 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3157 $qcode =~ s/\n/\\n/g;
3158
3159 %vars = (_dummy => 0) unless %vars;
3067 3160
3068 local $_; 3161 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars; 3162 local @safe::cf::_safe_eval_args = values %vars;
3070 3163
3071 my $eval = 3164 my $eval =
3148 { 3241 {
3149 my $faces = $facedata->{faceinfo}; 3242 my $faces = $facedata->{faceinfo};
3150 3243
3151 while (my ($face, $info) = each %$faces) { 3244 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3245 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3246
3153 cf::face::set_visibility $idx, $info->{visibility}; 3247 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3248 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3249 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}; 3250 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3157 3251
3158 cf::cede_to_tick; 3252 cf::cede_to_tick;
3159 } 3253 }
3160 3254
3161 while (my ($face, $info) = each %$faces) { 3255 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3256 next unless $info->{smooth};
3257
3163 my $idx = cf::face::find $face 3258 my $idx = cf::face::find $face
3164 or next; 3259 or next;
3260
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3261 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3262 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3263 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3264 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3265 warn "smooth face '$info->{smooth}' not found for face '$face'";
3187 { 3283 {
3188 # TODO: for gcfclient pleasure, we should give resources 3284 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index. 3285 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3286 my $res = $facedata->{resource};
3191 3287
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3288 while (my ($name, $info) = each %$res) {
3289 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3290 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data; 3291 my $data;
3197 3292
3198 if ($info->{type} & 1) { 3293 if ($info->{type} & 1) {
3199 # prepend meta info 3294 # prepend meta info
3200 3295
3201 my $meta = $enc->encode ({ 3296 my $meta = $enc->encode ({
3202 name => $name, 3297 name => $name,
3203 %{ $info->{meta} || {} }, 3298 %{ $info->{meta} || {} },
3204 }); 3299 });
3205 3300
3206 $data = pack "(w/a*)*", $meta, $info->{data}; 3301 $data = pack "(w/a*)*", $meta, $info->{data};
3302 } else {
3303 $data = $info->{data};
3304 }
3305
3306 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3307 cf::face::set_type $idx, $info->{type};
3207 } else { 3308 } else {
3208 $data = $info->{data}; 3309 $RESOURCE{$name} = $info;
3209 } 3310 }
3210 3311
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; 3312 cf::cede_to_tick;
3215 } 3313 }
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 } 3314 }
3315
3316 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3317
3236 1 3318 1
3237} 3319}
3320
3321cf::global->attach (on_resource_update => sub {
3322 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3323 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3324
3325 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3326 my $sound = $soundconf->{compat}[$_]
3327 or next;
3328
3329 my $face = cf::face::find "sound/$sound->[1]";
3330 cf::sound::set $sound->[0] => $face;
3331 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3332 }
3333
3334 while (my ($k, $v) = each %{$soundconf->{event}}) {
3335 my $face = cf::face::find "sound/$v";
3336 cf::sound::set $k => $face;
3337 }
3338 }
3339});
3238 3340
3239register_exticmd fx_want => sub { 3341register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_; 3342 my ($ns, $want) = @_;
3241 3343
3242 while (my ($k, $v) = each %$want) { 3344 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3345 $ns->fx_want ($k, $v);
3244 } 3346 }
3245}; 3347};
3348
3349sub load_resource_file($) {
3350 my $guard = lock_acquire "load_resource_file";
3351
3352 my $status = load_resource_file_ $_[0];
3353 get_slot 0.1, 100;
3354 cf::arch::commit_load;
3355
3356 $status
3357}
3246 3358
3247sub reload_regions { 3359sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3360 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3361 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3362 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3376}
3265 3377
3266sub reload_archetypes { 3378sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3379 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3380 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} 3381}
3275 3382
3276sub reload_treasures { 3383sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3384 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3385 or die "unable to load treasurelists\n";
3279} 3386}
3280 3387
3281sub reload_resources { 3388sub reload_resources {
3282 warn "reloading resource files...\n"; 3389 warn "reloading resource files...\n";
3283 3390
3391 reload_facedata;
3392 reload_archetypes;
3284 reload_regions; 3393 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3394 reload_treasures;
3289 3395
3290 warn "finished reloading resource files\n"; 3396 warn "finished reloading resource files\n";
3291} 3397}
3292 3398
3293sub init {
3294 reload_resources;
3295}
3296
3297sub reload_config { 3399sub reload_config {
3400 warn "reloading config file...\n";
3401
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3403 or return;
3300 3404
3301 local $/; 3405 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3406 *CFG = YAML::XS::Load scalar <$fh>;
3303 3407
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3305 3409
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3410 $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}; 3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3311 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3415 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3312 and die "WARNING: m(un)lockall failed: $!\n"; 3416 and die "WARNING: m(un)lockall failed: $!\n";
3313 }; 3417 };
3314 warn $@ if $@; 3418 warn $@ if $@;
3315 } 3419 }
3420
3421 warn "finished reloading resource files\n";
3422}
3423
3424sub pidfile() {
3425 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3426 or die "$PIDFILE: $!";
3427 flock $fh, &Fcntl::LOCK_EX
3428 or die "$PIDFILE: flock: $!";
3429 $fh
3430}
3431
3432# make sure only one server instance is running at any one time
3433sub atomic {
3434 my $fh = pidfile;
3435
3436 my $pid = <$fh>;
3437 kill 9, $pid if $pid > 0;
3438
3439 seek $fh, 0, 0;
3440 print $fh $$;
3441}
3442
3443sub main_loop {
3444 warn "EV::loop starting\n";
3445 if (1) {
3446 EV::loop;
3447 }
3448 warn "EV::loop returned\n";
3449 goto &main_loop unless $REALLY_UNLOOP;
3316} 3450}
3317 3451
3318sub main { 3452sub main {
3453 cf::init_globals; # initialise logging
3454
3455 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3456 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3457 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3458 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3459
3460 cf::init_experience;
3461 cf::init_anim;
3462 cf::init_attackmess;
3463 cf::init_dynamic;
3464
3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466
3319 # we must not ever block the main coroutine 3467 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3468 local $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3469 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3470 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3471 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3472 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3473 })->prio (Coro::PRIO_MAX);
3326 }; 3474 };
3327 3475
3476 evthread_start IO::AIO::poll_fileno;
3477
3478 cf::sync_job {
3479 reload_resources;
3328 reload_config; 3480 reload_config;
3329 db_init; 3481 db_init;
3482
3483 cf::load_settings;
3484 cf::load_materials;
3485 cf::init_uuid;
3486 cf::init_signals;
3487 cf::init_commands;
3488 cf::init_skills;
3489
3490 cf::init_beforeplay;
3491
3492 atomic;
3493
3330 load_extensions; 3494 load_extensions;
3331 3495
3332 $TICK_WATCHER->start; 3496 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3497
3334 EV::loop; 3498 # no (long-running) fork's whatsoever before this point(!)
3499 use POSIX ();
3500 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3501
3502 (pop @POST_INIT)->(0) while @POST_INIT;
3503 };
3504
3505 main_loop;
3335} 3506}
3336 3507
3337############################################################################# 3508#############################################################################
3338# initialisation and cleanup 3509# initialisation and cleanup
3339 3510
3345 cf::cleanup "SIG$signal"; 3516 cf::cleanup "SIG$signal";
3346 }; 3517 };
3347 } 3518 }
3348} 3519}
3349 3520
3350sub write_runtime { 3521sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime";
3352
3353 # first touch the runtime file to show we are still running: 3522 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3523 # the fsync below can take a very very long time.
3355 3524
3356 IO::AIO::aio_utime $runtime, undef, undef; 3525 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3526
3358 my $guard = cf::lock_acquire "write_runtime"; 3527 my $guard = cf::lock_acquire "write_runtime";
3359 3528
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3529 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3361 or return; 3530 or return;
3362 3531
3363 my $value = $cf::RUNTIME + 90 + 10; 3532 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3533 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3534 # 60 allows for the watchdog to kill the server.
3375 aio_utime $fh, undef, undef; 3544 aio_utime $fh, undef, undef;
3376 3545
3377 close $fh 3546 close $fh
3378 or return; 3547 or return;
3379 3548
3380 aio_rename "$runtime~", $runtime 3549 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3550 and return;
3382 3551
3383 warn "runtime file written.\n"; 3552 warn "runtime file written.\n";
3384 3553
3385 1 3554 1
3555}
3556
3557our $uuid_lock;
3558our $uuid_skip;
3559
3560sub write_uuid_sync($) {
3561 $uuid_skip ||= $_[0];
3562
3563 return if $uuid_lock;
3564 local $uuid_lock = 1;
3565
3566 my $uuid = "$LOCALDIR/uuid";
3567
3568 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3569 or return;
3570
3571 my $value = uuid_seq uuid_cur;
3572
3573 unless ($value) {
3574 warn "cowardly refusing to write zero uuid value!\n";
3575 return;
3576 }
3577
3578 my $value = uuid_str $value + $uuid_skip;
3579 $uuid_skip = 0;
3580
3581 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3582 and return;
3583
3584 # always fsync - this file is important
3585 aio_fsync $fh
3586 and return;
3587
3588 close $fh
3589 or return;
3590
3591 aio_rename "$uuid~", $uuid
3592 and return;
3593
3594 warn "uuid file written ($value).\n";
3595
3596 1
3597
3598}
3599
3600sub write_uuid($$) {
3601 my ($skip, $sync) = @_;
3602
3603 $sync ? write_uuid_sync $skip
3604 : async { write_uuid_sync $skip };
3386} 3605}
3387 3606
3388sub emergency_save() { 3607sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3608 my $freeze_guard = cf::freeze_mainloop;
3390 3609
3391 warn "enter emergency perl save\n"; 3610 warn "emergency_perl_save: enter\n";
3392 3611
3393 cf::sync_job { 3612 cf::sync_job {
3613 # this is a trade-off: we want to be very quick here, so
3614 # save all maps without fsync, and later call a global sync
3615 # (which in turn might be very very slow)
3616 local $USE_FSYNC = 0;
3617
3394 # use a peculiar iteration method to avoid tripping on perl 3618 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3619 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3620 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3621 warn "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3622 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3623 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3624 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3625 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3626 $pl->save;
3403 } 3627 }
3404 warn "end emergency player save\n"; 3628 warn "emergency_perl_save: end player save\n";
3405 3629
3406 warn "begin emergency map save\n"; 3630 warn "emergency_perl_save: begin map save\n";
3407 for my $path (keys %cf::MAP) { 3631 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3632 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3633 $map->valid or next;
3410 $map->save; 3634 $map->save;
3411 } 3635 }
3412 warn "end emergency map save\n"; 3636 warn "emergency_perl_save: end map save\n";
3413 3637
3414 warn "begin emergency database checkpoint\n"; 3638 warn "emergency_perl_save: begin database checkpoint\n";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3639 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3640 warn "emergency_perl_save: end database checkpoint\n";
3641
3642 warn "emergency_perl_save: begin write uuid\n";
3643 write_uuid_sync 1;
3644 warn "emergency_perl_save: end write uuid\n";
3417 }; 3645 };
3418 3646
3647 warn "emergency_perl_save: starting sync()\n";
3648 IO::AIO::aio_sync sub {
3649 warn "emergency_perl_save: finished sync()\n";
3650 };
3651
3419 warn "leave emergency perl save\n"; 3652 warn "emergency_perl_save: leave\n";
3420} 3653}
3421 3654
3422sub post_cleanup { 3655sub post_cleanup {
3423 my ($make_core) = @_; 3656 my ($make_core) = @_;
3424 3657
3425 warn Carp::longmess "post_cleanup backtrace" 3658 warn Carp::longmess "post_cleanup backtrace"
3426 if $make_core; 3659 if $make_core;
3660
3661 my $fh = pidfile;
3662 unlink $PIDFILE if <$fh> == $$;
3663}
3664
3665# a safer delete_package, copied from Symbol
3666sub clear_package($) {
3667 my $pkg = shift;
3668
3669 # expand to full symbol table name if needed
3670 unless ($pkg =~ /^main::.*::$/) {
3671 $pkg = "main$pkg" if $pkg =~ /^::/;
3672 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3673 $pkg .= '::' unless $pkg =~ /::$/;
3674 }
3675
3676 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3677 my $stem_symtab = *{$stem}{HASH};
3678
3679 defined $stem_symtab and exists $stem_symtab->{$leaf}
3680 or return;
3681
3682 # clear all symbols
3683 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3684 for my $name (keys %$leaf_symtab) {
3685 _gv_clear *{"$pkg$name"};
3686# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3687 }
3688 warn "cleared package $pkg\n";#d#
3427} 3689}
3428 3690
3429sub do_reload_perl() { 3691sub do_reload_perl() {
3430 # can/must only be called in main 3692 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 3693 if ($Coro::current != $Coro::main) {
3432 warn "can only reload from main coroutine"; 3694 warn "can only reload from main coroutine";
3433 return; 3695 return;
3434 } 3696 }
3435 3697
3698 return if $RELOAD++;
3699
3700 my $t1 = EV::time;
3701
3702 while ($RELOAD) {
3436 warn "reloading..."; 3703 warn "reloading...";
3437 3704
3438 warn "entering sync_job"; 3705 warn "entering sync_job";
3439 3706
3440 cf::sync_job { 3707 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark 3708 cf::write_runtime_sync; # external watchdog should not bark
3442 cf::emergency_save; 3709 cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark 3710 cf::write_runtime_sync; # external watchdog should not bark
3444 3711
3445 warn "syncing database to disk"; 3712 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV; 3713 BDB::db_env_txn_checkpoint $DB_ENV;
3447 3714
3448 # if anything goes wrong in here, we should simply crash as we already saved 3715 # if anything goes wrong in here, we should simply crash as we already saved
3449 3716
3450 warn "flushing outstanding aio requests"; 3717 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; 3718 while (IO::AIO::nreqs || BDB::nreqs) {
3456 warn "iterate..."; 3719 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 } 3720 }
3482 3721
3483 warn "... nuking $pkg"; 3722 warn "cancelling all extension coros";
3484 Symbol::delete_package $pkg; 3723 $_->cancel for values %EXT_CORO;
3485 } 3724 %EXT_CORO = ();
3486 3725
3487 warn "unloading all perl modules loaded from $LIBDIR"; 3726 warn "removing commands";
3488 while (my ($k, $v) = each %INC) { 3727 %COMMAND = ();
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 3728
3729 warn "removing ext/exti commands";
3730 %EXTCMD = ();
3731 %EXTICMD = ();
3732
3733 warn "unloading/nuking all extensions";
3734 for my $pkg (@EXTS) {
3491 warn "... unloading $k"; 3735 warn "... unloading $pkg";
3492 delete $INC{$k};
3493 3736
3494 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g;
3496
3497 if (my $cb = $k->can ("unload_module")) { 3737 if (my $cb = $pkg->can ("unload")) {
3738 eval {
3498 $cb->(); 3739 $cb->($pkg);
3740 1
3741 } or warn "$pkg unloaded, but with errors: $@";
3742 }
3743
3744 warn "... clearing $pkg";
3745 clear_package $pkg;
3499 } 3746 }
3500 3747
3501 Symbol::delete_package $k; 3748 warn "unloading all perl modules loaded from $LIBDIR";
3749 while (my ($k, $v) = each %INC) {
3750 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3751
3752 warn "... unloading $k";
3753 delete $INC{$k};
3754
3755 $k =~ s/\.pm$//;
3756 $k =~ s/\//::/g;
3757
3758 if (my $cb = $k->can ("unload_module")) {
3759 $cb->();
3760 }
3761
3762 clear_package $k;
3502 } 3763 }
3503 3764
3504 warn "getting rid of safe::, as good as possible"; 3765 warn "getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 3766 clear_package "safe::$_"
3506 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3767 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3507 3768
3508 warn "unloading cf.pm \"a bit\""; 3769 warn "unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 3770 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 3771 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 3772
3512 # don't, removes xs symbols, too, 3773 # don't, removes xs symbols, too,
3513 # and global variables created in xs 3774 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 3775 #clear_package __PACKAGE__;
3515 3776
3516 warn "unload completed, starting to reload now"; 3777 warn "unload completed, starting to reload now";
3517 3778
3518 warn "reloading cf.pm"; 3779 warn "reloading cf.pm";
3519 require cf; 3780 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3781 cf::_connect_to_perl_1;
3521 3782
3522 warn "loading config and database again"; 3783 warn "loading config and database again";
3523 cf::reload_config; 3784 cf::reload_config;
3524 3785
3525 warn "loading extensions"; 3786 warn "loading extensions";
3526 cf::load_extensions; 3787 cf::load_extensions;
3527 3788
3789 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 3790 warn "reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 3791 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 3792 warn "reattaching attachments to maps";
3531 reattach $_ for values %MAP; 3793 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 3794 warn "reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 3795 reattach $_ for values %PLAYER;
3796 }
3534 3797
3798 warn "running post_init jobs";
3799 (pop @POST_INIT)->(1) while @POST_INIT;
3800
3535 warn "leaving sync_job"; 3801 warn "leaving sync_job";
3536 3802
3537 1 3803 1
3538 } or do { 3804 } or do {
3539 warn $@; 3805 warn $@;
3540 warn "error while reloading, exiting."; 3806 cf::cleanup "error while reloading, exiting.";
3541 exit 1;
3542 }; 3807 };
3543 3808
3544 warn "reloaded"; 3809 warn "reloaded";
3810 --$RELOAD;
3811 }
3812
3813 $t1 = EV::time - $t1;
3814 warn "reload completed in ${t1}s\n";
3545}; 3815};
3546 3816
3547our $RELOAD_WATCHER; # used only during reload 3817our $RELOAD_WATCHER; # used only during reload
3548 3818
3549sub reload_perl() { 3819sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 3820 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 3821 # coro crashes during coro_state_free->destroy here.
3552 3822
3823 $RELOAD_WATCHER ||= cf::async {
3824 Coro::AIO::aio_wait cache_extensions;
3825
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3826 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3827 do_reload_perl;
3554 undef $RELOAD_WATCHER; 3828 undef $RELOAD_WATCHER;
3555 do_reload_perl; 3829 };
3556 }; 3830 };
3557} 3831}
3558 3832
3559register_command "reload" => sub { 3833register_command "reload" => sub {
3560 my ($who, $arg) = @_; 3834 my ($who, $arg) = @_;
3574 3848
3575our @WAIT_FOR_TICK; 3849our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN; 3850our @WAIT_FOR_TICK_BEGIN;
3577 3851
3578sub wait_for_tick { 3852sub wait_for_tick {
3579 return unless $TICK_WATCHER->is_active;
3580 return if $Coro::current == $Coro::main; 3853 return if tick_inhibit || $Coro::current == $Coro::main;
3581 3854
3582 my $signal = new Coro::Signal; 3855 my $signal = new Coro::Signal;
3583 push @WAIT_FOR_TICK, $signal; 3856 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait; 3857 $signal->wait;
3585} 3858}
3586 3859
3587sub wait_for_tick_begin { 3860sub wait_for_tick_begin {
3588 return unless $TICK_WATCHER->is_active;
3589 return if $Coro::current == $Coro::main; 3861 return if tick_inhibit || $Coro::current == $Coro::main;
3590 3862
3591 my $signal = new Coro::Signal; 3863 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 3864 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 3865 $signal->wait;
3594} 3866}
3595 3867
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3868sub tick {
3597 if ($Coro::current != $Coro::main) { 3869 if ($Coro::current != $Coro::main) {
3598 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3870 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3599 unless ++$bug_warning > 10; 3871 unless ++$bug_warning > 10;
3600 return; 3872 return;
3601 } 3873 }
3602 3874
3603 $NOW = $tick_start = EV::now;
3604
3605 cf::server_tick; # one server iteration 3875 cf::server_tick; # one server iteration
3606 3876
3607 $RUNTIME += $TICK;
3608 $NEXT_TICK += $TICK;
3609
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3877 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 3878 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 3879 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 3880 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 3881 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 3882 or warn "ERROR: unable to write runtime file: $!";
3616 }; 3883 };
3617 } 3884 }
3618 3885
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3886 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3621 } 3888 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 3889 while (my $sig = shift @WAIT_FOR_TICK) {
3623 $sig->send; 3890 $sig->send;
3624 } 3891 }
3625 3892
3626 $LOAD = ($NOW - $tick_start) / $TICK; 3893 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3894 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 3895
3629 _post_tick; 3896 if (0) {
3630}; 3897 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 3898 my $jitter = $TICK_START - $NEXT_TICK;
3899 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3900 warn "jitter $JITTER\n";#d#
3901 }
3902 }
3903}
3632 3904
3633{ 3905{
3906 # configure BDB
3907
3634 BDB::min_parallel 8; 3908 BDB::min_parallel 8;
3635 BDB::max_poll_time $TICK * 0.1; 3909 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 3910 $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 3911
3653 unless ($DB_ENV) { 3912 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 3913 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3914 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 3915 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3916 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3917 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3918 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 3919
3660 cf::sync_job { 3920 cf::sync_job {
3661 eval { 3921 eval {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3943 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 3944 };
3685} 3945}
3686 3946
3687{ 3947{
3948 # configure IO::AIO
3949
3688 IO::AIO::min_parallel 8; 3950 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3951 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 3952 undef $AnyEvent::AIO::WATCHER;
3693} 3953}
3694 3954
3695my $_log_backtrace; 3955my $_log_backtrace;
3696 3956
3697sub _log_backtrace { 3957sub _log_backtrace {
3700 $msg =~ s/\n//; 3960 $msg =~ s/\n//;
3701 3961
3702 # limit the # of concurrent backtraces 3962 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 3963 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 3964 ++$_log_backtrace;
3965 my $perl_bt = Carp::longmess $msg;
3705 async { 3966 async {
3706 $Coro::current->{desc} = "abt $msg"; 3967 $Coro::current->{desc} = "abt $msg";
3707 3968
3708 my @bt = fork_call { 3969 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 3970 @addr = map { sprintf "%x", $_ } @addr;
3720 } 3981 }
3721 3982
3722 @funcs 3983 @funcs
3723 }; 3984 };
3724 3985
3725 LOG llevInfo, "[ABT] $msg\n"; 3986 LOG llevInfo, "[ABT] $perl_bt\n";
3987 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 3988 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 3989 --$_log_backtrace;
3728 }; 3990 };
3729 } else { 3991 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 3992 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 3993 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 3994 }
3733} 3995}
3734 3996
3735# load additional modules 3997# load additional modules
3736use cf::pod; 3998require "cf/$_.pm" for @EXTRA_MODULES;
3999cf::_connect_to_perl_2;
3737 4000
3738END { cf::emergency_save } 4001END { cf::emergency_save }
3739 4002
37401 40031
3741 4004

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines