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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines