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.396 by root, Wed Nov 14 08:09:46 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.1 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5; 56use Digest::MD5;
30use Fcntl; 57use Fcntl;
31use YAML::Syck (); 58use YAML ();
32use IO::AIO 2.51 (); 59use IO::AIO ();
33use Time::HiRes; 60use Time::HiRes;
34use Compress::LZF; 61use Compress::LZF;
35use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
36 65
37# configure various modules to our taste 66# configure various modules to our taste
38# 67#
39$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 76
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 77# strictly for debugging
44$YAML::Syck::ImplicitUnicode = 1; 78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 79
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 81
50our %COMMAND = (); 82our %COMMAND = ();
51our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
54our %EXTCMD = (); 86our %EXTCMD = ();
55our %EXTICMD = (); 87our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
58 90
59our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
61 95
62our $CONFDIR = confdir; 96our $CONFDIR = confdir;
63our $DATADIR = datadir; 97our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 100our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 101our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 102our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 104our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 105our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 106our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime";
109
110our %RESOURCE;
73 111
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $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 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 114our $NEXT_TICK;
79our $NOW;
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;
128our $NOW;
92 129
93our (%PLAYER, %PLAYER_LOADING); # all users 130our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 131our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 132our $LINK_MAP; # the special {link} map, which is always available
96 133
97# 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 ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 135our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 136
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 137our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
139our $JITTER; # average jitter
102our $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 :)
103 146
104binmode STDOUT; 147binmode STDOUT;
105binmode STDERR; 148binmode STDERR;
106 149
107# read virtual server time, if available 150# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 151unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 152 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
112} 155}
156
157eval "sub TICK() { $TICK } 1" or die;
113 158
114mkdir $_ 159mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 161
117our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
118 163
119sub 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::"}];
120 176
121############################################################################# 177#############################################################################
122 178
123=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
124 180
175 231
176This array contains the results of the last C<invoke ()> call. When 232This 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 233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
178that call. 234that call.
179 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
180=back 242=back
181 243
182=cut 244=cut
183 245
184BEGIN { 246$Coro::State::WARNHOOK = sub {
185 *CORE::GLOBAL::warn = sub {
186 my $msg = join "", @_; 247 my $msg = join "", @_;
187 248
188 $msg .= "\n" 249 $msg .= "\n"
189 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
190 251
191 $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;
192 253
193 LOG llevError, $msg; 254 LOG llevError, $msg;
194 }; 255};
195} 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};
196 270
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 274@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 281for my $pkg (qw(
208 cf::global cf::attachable 282 cf::global cf::attachable
209 cf::object cf::object::player 283 cf::object cf::object::player
210 cf::client cf::player 284 cf::client cf::player
211 cf::arch cf::living 285 cf::arch cf::living
286 cf::map cf::mapspace
212 cf::map cf::party cf::region 287 cf::party cf::region
213)) { 288)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 290}
217 291
218$EV::DIED = sub { 292$EV::DIED = sub {
219 warn "error in event callback: @_"; 293 warn "error in event callback: @_";
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 320 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 321 $d
248 } || "[unable to dump $_[0]: '$@']"; 322 } || "[unable to dump $_[0]: '$@']";
249} 323}
250 324
251=item $ref = cf::from_json $json 325=item $ref = cf::decode_json $json
252 326
253Converts a JSON string into the corresponding perl data structure. 327Converts a JSON string into the corresponding perl data structure.
254 328
255=item $json = cf::to_json $ref 329=item $json = cf::encode_json $ref
256 330
257Converts a perl data structure into its JSON representation. 331Converts a perl data structure into its JSON representation.
258 332
259=cut 333=cut
260 334
261our $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
262 336
263sub to_json ($) { $json_coder->encode ($_[0]) } 337sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 338sub decode_json($) { $json_coder->decode ($_[0]) }
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}
265 353
266=item cf::lock_wait $string 354=item cf::lock_wait $string
267 355
268Wait until the given lock is available. See cf::lock_acquire. 356Wait until the given lock is available. See cf::lock_acquire.
269 357
270=item my $lock = cf::lock_acquire $string 358=item my $lock = cf::lock_acquire $string
271 359
272Wait 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
273a 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,
274for example when the coroutine gets canceled), the lock is automatically 362for example when the coroutine gets canceled), the lock is automatically
275returned. 363returned.
276 364
277Locks 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
278deadlocked coro. 366deadlocked coro.
284 372
285Return 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.
286 374
287=cut 375=cut
288 376
289our %LOCK; 377our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 378
292sub lock_wait($) { 379sub lock_wait($) {
293 my ($key) = @_; 380 $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} 381}
306 382
307sub lock_acquire($) { 383sub lock_acquire($) {
308 my ($key) = @_; 384 $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} 385}
322 386
323sub lock_active($) { 387sub lock_active($) {
324 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 389}
328 390
329sub freeze_mainloop { 391sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 392 tick_inhibit_inc;
331 393
332 my $guard = Coro::guard { 394 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 395}
338 396
339=item cf::periodic $interval, $cb 397=item cf::periodic $interval, $cb
340 398
341Like 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
396 } 454 }
397 } 455 }
398}; 456};
399 457
400sub get_slot($;$$) { 458sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main;
460
401 my ($time, $pri, $name) = @_; 461 my ($time, $pri, $name) = @_;
402 462
403 $time = $TICK * .6 if $time > $TICK * .6; 463 $time = $TICK * .6 if $time > $TICK * .6;
404 my $sig = new Coro::Signal; 464 my $sig = new Coro::Signal;
405 465
442 # this is the main coro, too bad, we have to block 502 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 503 # till the operation succeeds, freezing the server :/
444 504
445 LOG llevError, Carp::longmess "sync job";#d# 505 LOG llevError, Carp::longmess "sync job";#d#
446 506
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 507 my $freeze_guard = freeze_mainloop;
450 508
451 my $busy = 1; 509 my $busy = 1;
452 my @res; 510 my @res;
453 511
464 } else { 522 } else {
465 EV::loop EV::LOOP_ONESHOT; 523 EV::loop EV::LOOP_ONESHOT;
466 } 524 }
467 } 525 }
468 526
469 $time = EV::time - $time; 527 my $time = EV::time - $time;
470 528
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 529 $TICK_START += $time; # do not account sync jobs to server load
475 530
476 wantarray ? @res : $res[0] 531 wantarray ? @res : $res[0]
477 } else { 532 } else {
478 # we are in another coroutine, how wonderful, everything just works 533 # we are in another coroutine, how wonderful, everything just works
479 534
521 reset_signals; 576 reset_signals;
522 &$cb 577 &$cb
523 }, @args; 578 }, @args;
524 579
525 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
526} 608}
527 609
528=item $value = cf::db_get $family => $key 610=item $value = cf::db_get $family => $key
529 611
530Returns a single value from the environment database. 612Returns a single value from the environment database.
669 751
670############################################################################# 752#############################################################################
671 753
672=head2 ATTACHABLE OBJECTS 754=head2 ATTACHABLE OBJECTS
673 755
674Many 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
675attach callbacks/event handlers (a collection of which is called an "attachment") 757attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 758to it. All such attachable objects support the following methods.
677 759
678In 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>
679C<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
729=item cf::CLASS::attachment $name, ... 811=item cf::CLASS::attachment $name, ...
730 812
731Register an attachment by C<$name> through which attachable objects of the 813Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 814given CLASS can refer to this attachment.
733 815
734Some classes such as crossfire maps and objects can specify attachments 816Some classes such as deliantra maps and objects can specify attachments
735that 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.
736 818
737These calls expect any number of the following handler/hook descriptions: 819These calls expect any number of the following handler/hook descriptions:
738 820
739=over 4 821=over 4
967 } 1049 }
968 1050
969 0 1051 0
970} 1052}
971 1053
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1054=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1055
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1056=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1057
976Generate an object-specific event with the given arguments. 1058Generate an object-specific event with the given arguments.
977 1059
1030 1112
1031sub reattach { 1113sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1114 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1115 my ($obj) = @_;
1034 1116
1117 # no longer needed after getting rid of delete_package?
1035 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
1036 1119
1037 my $registry = $obj->registry; 1120 my $registry = $obj->registry;
1038 1121
1039 @$registry = (); 1122 @$registry = ();
1040 1123
1055cf::attachable->attach ( 1138cf::attachable->attach (
1056 prio => -1000000, 1139 prio => -1000000,
1057 on_instantiate => sub { 1140 on_instantiate => sub {
1058 my ($obj, $data) = @_; 1141 my ($obj, $data) = @_;
1059 1142
1060 $data = from_json $data; 1143 $data = decode_json $data;
1061 1144
1062 for (@$data) { 1145 for (@$data) {
1063 my ($name, $args) = @$_; 1146 my ($name, $args) = @$_;
1064 1147
1065 $obj->attach ($name, %{$args || {} }); 1148 $obj->attach ($name, %{$args || {} });
1086 utf8::decode (my $decname = $filename); 1169 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1170 warn sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
1089 1172
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1174 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 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 }
1094 close $fh; 1180 aio_close $fh;
1095 1181
1096 if (@$objs) { 1182 if (@$objs) {
1097 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) {
1098 chmod SAVE_MODE, $fh; 1184 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
1101 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 }
1102 close $fh; 1191 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1193 }
1105 } else { 1194 } else {
1106 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
1107 } 1196 }
1108 1197
1109 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1199
1200 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1202 } else {
1111 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
1112 } 1204 }
1113 } else { 1205 } else {
1114 aio_unlink $filename; 1206 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1116 } 1208 }
1207 my ($name, $cb) = @_; 1299 my ($name, $cb) = @_;
1208 1300
1209 $EXTICMD{$name} = $cb; 1301 $EXTICMD{$name} = $cb;
1210} 1302}
1211 1303
1304use File::Glob ();
1305
1212cf::player->attach ( 1306cf::player->attach (
1213 on_command => sub { 1307 on_command => sub {
1214 my ($pl, $name, $params) = @_; 1308 my ($pl, $name, $params) = @_;
1215 1309
1216 my $cb = $COMMAND{$name} 1310 my $cb = $COMMAND{$name}
1248 1342
1249 cf::override; 1343 cf::override;
1250 }, 1344 },
1251); 1345);
1252 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
1253sub load_extensions { 1360sub load_extensions {
1254 cf::sync_job { 1361 cf::sync_job {
1255 my %todo; 1362 my %todo;
1256 1363
1257 for my $path (<$LIBDIR/*.ext>) { 1364 for my $path (<$LIBDIR/*.ext>) {
1276 1383
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1386
1280 $ext{source} = 1387 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1282 . "#line 1 \"$path\"\n{\n" 1389 . "#line 1 \"$path\"\n{\n"
1283 . $source 1390 . $source
1284 . "\n};\n1"; 1391 . "\n};\n1";
1285 1392
1286 $todo{$base} = \%ext; 1393 $todo{$base} = \%ext;
1302 my $msg = $@ ? "$v->{path}: $@\n" 1409 my $msg = $@ ? "$v->{path}: $@\n"
1303 : "$v->{base}: extension inactive.\n"; 1410 : "$v->{base}: extension inactive.\n";
1304 1411
1305 if (exists $v->{meta}{mandatory}) { 1412 if (exists $v->{meta}{mandatory}) {
1306 warn $msg; 1413 warn $msg;
1307 warn "mandatory extension failed to load, exiting.\n"; 1414 cf::cleanup "mandatory extension failed to load, exiting.";
1308 exit 1;
1309 } 1415 }
1310 1416
1311 warn $msg; 1417 warn $msg;
1312 } 1418 }
1313 1419
1327 1433
1328=back 1434=back
1329 1435
1330=head2 CORE EXTENSIONS 1436=head2 CORE EXTENSIONS
1331 1437
1332Functions and methods that extend core crossfire objects. 1438Functions and methods that extend core deliantra objects.
1333 1439
1334=cut 1440=cut
1335 1441
1336package cf::player; 1442package cf::player;
1337 1443
1380 1486
1381sub exists($) { 1487sub exists($) {
1382 my ($login) = @_; 1488 my ($login) = @_;
1383 1489
1384 $cf::PLAYER{$login} 1490 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1491 or !aio_stat path $login
1386} 1492}
1387 1493
1388sub find($) { 1494sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1495 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1496 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1508 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1509 or return;
1404 1510
1405 my $pl = cf::player::load_pl $f 1511 my $pl = cf::player::load_pl $f
1406 or return; 1512 or return;
1513
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1514 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1515 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1516 $cf::PLAYER{$login} = $pl
1410 } 1517 }
1411 } 1518 }
1421 1528
1422 return if $pl->{deny_save}; 1529 return if $pl->{deny_save};
1423 1530
1424 aio_mkdir playerdir $pl, 0770; 1531 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1532 $pl->{last_save} = $cf::RUNTIME;
1533
1534 cf::get_slot 0.01;
1426 1535
1427 $pl->save_pl ($path); 1536 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1537 cf::cede_to_tick;
1429} 1538}
1430 1539
1462 my ($pl) = @_; 1571 my ($pl) = @_;
1463 1572
1464 my $name = $pl->ob->name; 1573 my $name = $pl->ob->name;
1465 1574
1466 $pl->{deny_save} = 1; 1575 $pl->{deny_save} = 1;
1467 $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
1468 1577
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1470 $pl->deactivate; 1579 $pl->deactivate;
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1582 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1472 $pl->ns->destroy if $pl->ns; 1583 $pl->ns->destroy if $pl->ns;
1473 1584
1474 my $path = playerdir $pl; 1585 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1586 my $temp = "$path~$cf::RUNTIME~deleting~";
1514 1625
1515 for my $login (@$dirs) { 1626 for my $login (@$dirs) {
1516 my $path = path $login; 1627 my $path = path $login;
1517 1628
1518 # a .pst is a dead give-away for a valid player 1629 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1630 # if no pst file found, open and chekc for blocked users
1631 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1632 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1633 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1634 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1635 }
1524 1636
1555 } 1667 }
1556 1668
1557 \@paths 1669 \@paths
1558} 1670}
1559 1671
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1672=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1673
1562Expand crossfire pod fragments into protocol xml. 1674Expand 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 1675
1653=item $player->ext_reply ($msgid, @msg) 1676=item $player->ext_reply ($msgid, @msg)
1654 1677
1655Sends an ext reply to the player. 1678Sends an ext reply to the player.
1656 1679
1723our $MAX_RESET = 3600; 1746our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1747our $DEFAULT_RESET = 3000;
1725 1748
1726sub generate_random_map { 1749sub generate_random_map {
1727 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
1728 # mit "rum" bekleckern, nicht 1754 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1755 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1854 1880
1855# the temporary/swap location 1881# the temporary/swap location
1856sub save_path { 1882sub save_path {
1857 my ($self) = @_; 1883 my ($self) = @_;
1858 1884
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1885 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 1886 "$TMPDIR/$path.map"
1861} 1887}
1862 1888
1863# the unique path, undef == no special unique path 1889# the unique path, undef == no special unique path
1864sub uniq_path { 1890sub uniq_path {
1865 my ($self) = @_; 1891 my ($self) = @_;
1866 1892
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 1894 "$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} 1895}
1879 1896
1880sub decay_objects { 1897sub decay_objects {
1881 my ($self) = @_; 1898 my ($self) = @_;
1882 1899
1966sub find { 1983sub find {
1967 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
1968 1985
1969 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
1970 1987
1971 cf::lock_wait "map_data:$path";#d#remove 1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
1973 1990
1974 $cf::MAP{$path} || do { 1991 $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 1992 my $map = new_from_path cf::map $path
1979 or return; 1993 or return;
1980 1994
1981 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1982 1996
1984 or return; 1998 or return;
1985 1999
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard2;
1989 undef $guard1; 2004 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2005 $map->reset;
1992 return find $path; 2006 return find $path;
1993 } 2007 }
1994 2008
1995 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2037 $f->skip_block;
2024 $self->_load_objects ($f) 2038 $self->_load_objects ($f)
2025 or return; 2039 or return;
2026 2040
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->post_load_original
2028 if delete $self->{load_original}; 2042 if delete $self->{load_original};
2029 2043
2030 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2045 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2046 unless (aio_stat $uniq) {
2050 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2065 $self->decay_objects;
2052 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
2053 $self->update_buttons; 2067 $self->update_buttons;
2054 cf::cede_to_tick; 2068 cf::cede_to_tick;
2055 $self->set_darkness_map;
2056 cf::cede_to_tick;
2057 $self->activate; 2069 $self->activate;
2058 } 2070 }
2059 2071
2060 $self->{last_save} = $cf::RUNTIME; 2072 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2073 $self->last_access ($cf::RUNTIME);
2062 2074
2063 $self->in_memory (cf::MAP_IN_MEMORY); 2075 $self->in_memory (cf::MAP_ACTIVE);
2064 } 2076 }
2065 2077
2066 $self->post_load; 2078 $self->post_load;
2067} 2079}
2068 2080
2126 my ($path, $origin, $load) = @_; 2138 my ($path, $origin, $load) = @_;
2127 2139
2128 $path = normalise $path, $origin && $origin->{path}; 2140 $path = normalise $path, $origin && $origin->{path};
2129 2141
2130 if (my $map = $cf::MAP{$path}) { 2142 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2132 } 2144 }
2133 2145
2134 $MAP_PREFETCH{$path} |= $load; 2146 $MAP_PREFETCH{$path} |= $load;
2135 2147
2136 $MAP_PREFETCHER ||= cf::async { 2148 $MAP_PREFETCHER ||= cf::async {
2173 cf::async { 2185 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2186 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2187 $_->contr->save for $self->players;
2176 }; 2188 };
2177 2189
2190 cf::get_slot 0.02;
2191
2178 if ($uniq) { 2192 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2194 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2195 } else {
2182 $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);
2190 $self->save; 2204 $self->save;
2191 2205
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2207
2194 return if $self->players; 2208 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_ACTIVE;
2196 return if $self->{deny_save}; 2210 return if $self->{deny_save};
2197 2211
2198 $self->in_memory (cf::MAP_SWAPPED); 2212 $self->in_memory (cf::MAP_SWAPPED);
2199 2213
2200 $self->deactivate; 2214 $self->deactivate;
2225 2239
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2241
2228 return if $self->players; 2242 return if $self->players;
2229 2243
2230 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2231 2245
2232 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2233 2247
2234 # need to save uniques path 2248 # need to save uniques path
2235 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
2318 2332
2319sub unique_maps() { 2333sub unique_maps() {
2320 [ 2334 [
2321 map { 2335 map {
2322 utf8::decode $_; 2336 utf8::decode $_;
2323 /\.map$/ 2337 s/\.map$//; # TODO future compatibility hack
2338 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2339 ? ()
2324 ? normalise $_ 2340 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2341 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2342 ]
2328} 2343}
2329 2344
2330package cf;
2331
2332=back 2345=back
2333 2346
2334=head3 cf::object 2347=head3 cf::object
2335 2348
2336=cut 2349=cut
2339 2352
2340=over 4 2353=over 4
2341 2354
2342=item $ob->inv_recursive 2355=item $ob->inv_recursive
2343 2356
2344Returns 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.
2345 2359
2346=cut 2360=cut
2347 2361
2348sub inv_recursive_; 2362sub inv_recursive_;
2349sub inv_recursive_ { 2363sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2355} 2369}
2356 2370
2357=item $ref = $ob->ref 2371=item $ref = $ob->ref
2358 2372
2359creates 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.
2360 2374
2361=item $ob = cf::object::deref ($refstring) 2375=item $ob = cf::object::deref ($refstring)
2362 2376
2363returns 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,
2364even if the object actually exists. May block. 2378even if the object actually exists. May block.
2396can 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
2397dialogue with the given NPC character. 2411dialogue with the given NPC character.
2398 2412
2399=cut 2413=cut
2400 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
2401# rough implementation of a future "reply" method that works 2429# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2430# with dialog boxes.
2403#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
2404sub cf::object::player::reply($$$;$) { 2432sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2433 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2444 my $dialog = $pl->{npc_dialog};
2417 $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));
2418 2446
2419 } else { 2447 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2448 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2449 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2450 }
2423 } 2451 }
2424} 2452}
2425 2453
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2454=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2479
2452=item $player_object->enter_link 2480=item $player_object->enter_link
2453 2481
2454Freezes 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}>).
2455 2483
2456The 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.
2457I<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.
2458 2488
2459Will never block. 2489Will never block.
2460 2490
2461=item $player_object->leave_link ($map, $x, $y) 2491=item $player_object->leave_link ($map, $x, $y)
2462 2492
2520 2550
2521 $map->load; 2551 $map->load;
2522 $map->load_neighbours; 2552 $map->load_neighbours;
2523 2553
2524 return unless $self->contr->active; 2554 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2555
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $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;
2529} 2561}
2530 2562
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532 2564
2533Moves 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
2534her, loading and preparing them map, calling the provided $check callback 2566her, loading and preparing them map, calling the provided $check callback
2535that 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
2536the 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
2537be 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 >>.
2538 2573
2539=cut 2574=cut
2540 2575
2541our $GOTOGEN; 2576our $GOTOGEN;
2542 2577
2621} 2656}
2622 2657
2623sub prepare_random_map { 2658sub prepare_random_map {
2624 my ($exit) = @_; 2659 my ($exit) = @_;
2625 2660
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2661 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2662 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2663 # that depends on the exit object
2631 2664
2632 my $rmp = parse_random_map_params $exit->msg; 2665 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2667 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2668 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2669 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2670 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2671 $rmp->{origin_y} = $exit->y;
2672
2673 $exit->map->touch;
2639 } 2674 }
2640 2675
2641 $rmp->{random_seed} ||= $exit->random_seed; 2676 $rmp->{random_seed} ||= $exit->random_seed;
2642 2677
2643 my $data = cf::to_json $rmp; 2678 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2679 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2680 my $meta = "$RANDOMDIR/$md5.meta";
2646 2681
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2682 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2683 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2684 undef $fh;
2650 aio_rename "$meta~", $meta; 2685 aio_rename "$meta~", $meta;
2651 2686
2687 my $slaying = "?random/$md5";
2688
2689 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2690 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2691 $exit->msg (undef);
2692 }
2654 } 2693 }
2655} 2694}
2656 2695
2657sub cf::object::player::enter_exit { 2696sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2697 my ($self, $exit) = @_;
2659 2698
2660 return unless $self->type == cf::PLAYER; 2699 return unless $self->type == cf::PLAYER;
2661 2700
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; 2701 $self->enter_link;
2674 2702
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 { 2703 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2704 $Coro::current->{desc} = "enter_exit";
2681 2705
2682 $self->deactivate_recursive; # just to be sure
2683 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
2684 $self->goto ($slaying, $hp, $sp); 2721 $self->goto ($map, $x, $y);
2685 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
2686 1; 2727 1
2687 }) { 2728 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 2729 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "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. "
2690 . "Please report this to the dungeon master!", 2731 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 2732 cf::NDI_UNIQUE | cf::NDI_RED);
2692 2733
2693 warn "ERROR in enter_exit: $@"; 2734 warn "ERROR in enter_exit: $@";
2759 id => "infobox", 2800 id => "infobox",
2760 title => "Body Parts", 2801 title => "Body Parts",
2761 reply => undef, 2802 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 2803 tooltip => "Shows which body parts you posess and are available",
2763 }, 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 },
2764 "c/uptime" => { 2841 "c/uptime" => {
2765 id => "infobox", 2842 id => "infobox",
2766 title => "Uptime", 2843 title => "Uptime",
2767 reply => undef, 2844 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 2845 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 2848 id => "infobox",
2772 title => "Map Info", 2849 title => "Map Info",
2773 reply => undef, 2850 reply => undef,
2774 tooltip => "Information related to the maps", 2851 tooltip => "Information related to the maps",
2775 }, 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,
2776); 2867);
2777 2868
2778sub cf::client::send_msg { 2869sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2780 2871
2781 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg)
2873 unless $color & cf::NDI_VERBATIM;
2782 2874
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 2876
2785 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 2878 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 2879 $channel = $CHANNEL{$channel};
2788 2880
2789 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 2882 $channel = $channel->{id};
2793 2883
2794 } elsif (ref $channel) { 2884 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 2888 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 2889 }
2801 2890
2802 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2803 } 2892 }
2804 2893
2805 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2806 2895
2807 if ($self->can_msg) {
2808 # default colour, mask it out 2896 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 2898 if $color & cf::NDI_DEF;
2811 2899
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2900 my $pkt = "msg "
2901 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 2903 );
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 2904
2826 $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};
2827 2908
2828 utf8::encode $msg; 2909 # split very large packets
2829 2910 if (8192 < length $pkt and $self->{can_lzf}) {
2830 if (0 && $msg =~ /\[/) { 2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2831 # COMMAND/INFO 2912 $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 } 2913 }
2914
2915 $self->send_packet ($pkt);
2839} 2916}
2840 2917
2841=item $client->ext_msg ($type, @msg) 2918=item $client->ext_msg ($type, @msg)
2842 2919
2843Sends an ext event to the client. 2920Sends an ext event to the client.
3017 3094
3018The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3019 3096
3020 cf::object 3097 cf::object
3021 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
3022 insert remove name archname title slaying race decrease_ob_nr 3099 insert remove name archname title slaying race decrease split
3100 value
3023 3101
3024 cf::object::player 3102 cf::object::player
3025 player 3103 player
3026 3104
3027 cf::player 3105 cf::player
3032 3110
3033=cut 3111=cut
3034 3112
3035for ( 3113for (
3036 ["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
3037 insert remove inv name archname title slaying race 3115 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3116 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
3042) { 3120) {
3043 no strict 'refs'; 3121 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3062 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
3063 3141
3064 my $qcode = $code; 3142 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
3067 3147
3068 local $_; 3148 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
3070 3150
3071 my $eval = 3151 my $eval =
3148 { 3228 {
3149 my $faces = $facedata->{faceinfo}; 3229 my $faces = $facedata->{faceinfo};
3150 3230
3151 while (my ($face, $info) = each %$faces) { 3231 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3232 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233
3153 cf::face::set_visibility $idx, $info->{visibility}; 3234 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3235 cf::face::set_magicmap $idx, $info->{magicmap};
3155 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};
3156 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};
3157 3238
3158 cf::cede_to_tick; 3239 cf::cede_to_tick;
3159 } 3240 }
3160 3241
3161 while (my ($face, $info) = each %$faces) { 3242 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3243 next unless $info->{smooth};
3244
3163 my $idx = cf::face::find $face 3245 my $idx = cf::face::find $face
3164 or next; 3246 or next;
3247
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3248 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3249 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3251 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3252 warn "smooth face '$info->{smooth}' not found for face '$face'";
3187 { 3270 {
3188 # TODO: for gcfclient pleasure, we should give resources 3271 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index. 3272 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3273 my $res = $facedata->{resource};
3191 3274
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3275 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) {
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3277 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data; 3278 my $data;
3197 3279
3198 if ($info->{type} & 1) { 3280 if ($info->{type} & 1) {
3199 # prepend meta info 3281 # prepend meta info
3200 3282
3201 my $meta = $enc->encode ({ 3283 my $meta = $enc->encode ({
3202 name => $name, 3284 name => $name,
3203 %{ $info->{meta} || {} }, 3285 %{ $info->{meta} || {} },
3204 }); 3286 });
3205 3287
3206 $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};
3207 } else { 3295 } else {
3208 $data = $info->{data}; 3296 $RESOURCE{$name} = $info;
3209 } 3297 }
3210 3298
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; 3299 cf::cede_to_tick;
3215 } 3300 }
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 } 3301 }
3302
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3304
3236 1 3305 1
3237} 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});
3238 3327
3239register_exticmd fx_want => sub { 3328register_exticmd fx_want => sub {
3240 my ($ns, $want) = @_; 3329 my ($ns, $want) = @_;
3241 3330
3242 while (my ($k, $v) = each %$want) { 3331 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3332 $ns->fx_want ($k, $v);
3244 } 3333 }
3245}; 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}
3246 3345
3247sub reload_regions { 3346sub reload_regions {
3248 # 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
3249 # for this (global event?) 3348 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3349 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3363}
3265 3364
3266sub reload_archetypes { 3365sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3366 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3367 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} 3368}
3275 3369
3276sub reload_treasures { 3370sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3371 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3372 or die "unable to load treasurelists\n";
3279} 3373}
3280 3374
3281sub reload_resources { 3375sub reload_resources {
3282 warn "reloading resource files...\n"; 3376 warn "reloading resource files...\n";
3283 3377
3378 reload_facedata;
3379 reload_archetypes;
3284 reload_regions; 3380 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3381 reload_treasures;
3289 3382
3290 warn "finished reloading resource files\n"; 3383 warn "finished reloading resource files\n";
3291}
3292
3293sub init {
3294 reload_resources;
3295} 3384}
3296 3385
3297sub reload_config { 3386sub reload_config {
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3387 open my $fh, "<:utf8", "$CONFDIR/config"
3299 or return; 3388 or return;
3300 3389
3301 local $/; 3390 local $/;
3302 *CFG = YAML::Syck::Load <$fh>; 3391 *CFG = YAML::Load <$fh>;
3303 3392
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3305 3394
3306 $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};
3307 $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};
3313 }; 3402 };
3314 warn $@ if $@; 3403 warn $@ if $@;
3315 } 3404 }
3316} 3405}
3317 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
3318sub 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
3319 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3321 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#
3322 (async { 3453 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3326 }; 3457 };
3327 3458
3459 evthread_start IO::AIO::poll_fileno;
3460
3461 cf::sync_job {
3462 reload_resources;
3328 reload_config; 3463 reload_config;
3329 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
3330 load_extensions; 3477 load_extensions;
3331 3478
3332 $TICK_WATCHER->start; 3479 utime time, time, $RUNTIMEFILE;
3333 EV::loop; 3480
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;
3334} 3489}
3335 3490
3336############################################################################# 3491#############################################################################
3337# initialisation and cleanup 3492# initialisation and cleanup
3338 3493
3344 cf::cleanup "SIG$signal"; 3499 cf::cleanup "SIG$signal";
3345 }; 3500 };
3346 } 3501 }
3347} 3502}
3348 3503
3349sub write_runtime { 3504sub write_runtime_sync {
3350 my $runtime = "$LOCALDIR/runtime";
3351
3352 # first touch the runtime file to show we are still running: 3505 # first touch the runtime file to show we are still running:
3353 # the fsync below can take a very very long time. 3506 # the fsync below can take a very very long time.
3354 3507
3355 IO::AIO::aio_utime $runtime, undef, undef; 3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3356 3509
3357 my $guard = cf::lock_acquire "write_runtime"; 3510 my $guard = cf::lock_acquire "write_runtime";
3358 3511
3359 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3360 or return; 3513 or return;
3361 3514
3362 my $value = $cf::RUNTIME + 90 + 10; 3515 my $value = $cf::RUNTIME + 90 + 10;
3363 # 10 is the runtime save interval, for a monotonic clock 3516 # 10 is the runtime save interval, for a monotonic clock
3364 # 60 allows for the watchdog to kill the server. 3517 # 60 allows for the watchdog to kill the server.
3374 aio_utime $fh, undef, undef; 3527 aio_utime $fh, undef, undef;
3375 3528
3376 close $fh 3529 close $fh
3377 or return; 3530 or return;
3378 3531
3379 aio_rename "$runtime~", $runtime 3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3380 and return; 3533 and return;
3381 3534
3382 warn "runtime file written.\n"; 3535 warn "runtime file written.\n";
3383 3536
3384 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 };
3385} 3588}
3386 3589
3387sub emergency_save() { 3590sub emergency_save() {
3388 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
3389 3592
3390 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
3391 3594
3392 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
3393 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
3394 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
3395 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
3396 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
3397 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
3398 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
3399 $pl->valid or next; 3607 $pl->valid or next;
3400 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3401 $pl->save; 3609 $pl->save;
3402 } 3610 }
3403 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
3404 3612
3405 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
3406 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
3407 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
3408 $map->valid or next; 3616 $map->valid or next;
3409 $map->save; 3617 $map->save;
3410 } 3618 }
3411 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
3412 3620
3413 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
3414 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3415 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";
3416 }; 3628 };
3417 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
3418 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
3419} 3636}
3420 3637
3421sub post_cleanup { 3638sub post_cleanup {
3422 my ($make_core) = @_; 3639 my ($make_core) = @_;
3423 3640
3424 warn Carp::longmess "post_cleanup backtrace" 3641 warn Carp::longmess "post_cleanup backtrace"
3425 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#
3426} 3672}
3427 3673
3428sub do_reload_perl() { 3674sub do_reload_perl() {
3429 # can/must only be called in main 3675 # can/must only be called in main
3430 if ($Coro::current != $Coro::main) { 3676 if ($Coro::current != $Coro::main) {
3431 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
3432 return; 3678 return;
3433 } 3679 }
3434 3680
3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3684
3685 while ($RELOAD) {
3435 warn "reloading..."; 3686 warn "reloading...";
3436 3687
3437 warn "entering sync_job"; 3688 warn "entering sync_job";
3438 3689
3439 cf::sync_job { 3690 cf::sync_job {
3440 cf::write_runtime; # external watchdog should not bark 3691 cf::write_runtime_sync; # external watchdog should not bark
3441 cf::emergency_save; 3692 cf::emergency_save;
3442 cf::write_runtime; # external watchdog should not bark 3693 cf::write_runtime_sync; # external watchdog should not bark
3443 3694
3444 warn "syncing database to disk"; 3695 warn "syncing database to disk";
3445 BDB::db_env_txn_checkpoint $DB_ENV; 3696 BDB::db_env_txn_checkpoint $DB_ENV;
3446 3697
3447 # 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
3448 3699
3449 warn "flushing outstanding aio requests"; 3700 warn "flushing outstanding aio requests";
3450 for (;;) {
3451 BDB::flush;
3452 IO::AIO::flush;
3453 Coro::cede_notself;
3454 last unless IO::AIO::nreqs || BDB::nreqs; 3701 while (IO::AIO::nreqs || BDB::nreqs) {
3455 warn "iterate..."; 3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3456 }
3457
3458 ++$RELOAD;
3459
3460 warn "cancelling all extension coros";
3461 $_->cancel for values %EXT_CORO;
3462 %EXT_CORO = ();
3463
3464 warn "removing commands";
3465 %COMMAND = ();
3466
3467 warn "removing ext/exti commands";
3468 %EXTCMD = ();
3469 %EXTICMD = ();
3470
3471 warn "unloading/nuking all extensions";
3472 for my $pkg (@EXTS) {
3473 warn "... unloading $pkg";
3474
3475 if (my $cb = $pkg->can ("unload")) {
3476 eval {
3477 $cb->($pkg);
3478 1
3479 } or warn "$pkg unloaded, but with errors: $@";
3480 } 3703 }
3481 3704
3482 warn "... nuking $pkg"; 3705 warn "cancelling all extension coros";
3483 Symbol::delete_package $pkg; 3706 $_->cancel for values %EXT_CORO;
3484 } 3707 %EXT_CORO = ();
3485 3708
3486 warn "unloading all perl modules loaded from $LIBDIR"; 3709 warn "removing commands";
3487 while (my ($k, $v) = each %INC) { 3710 %COMMAND = ();
3488 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3489 3711
3712 warn "removing ext/exti commands";
3713 %EXTCMD = ();
3714 %EXTICMD = ();
3715
3716 warn "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) {
3490 warn "... unloading $k"; 3718 warn "... unloading $pkg";
3491 delete $INC{$k};
3492 3719
3493 $k =~ s/\.pm$//;
3494 $k =~ s/\//::/g;
3495
3496 if (my $cb = $k->can ("unload_module")) { 3720 if (my $cb = $pkg->can ("unload")) {
3721 eval {
3497 $cb->(); 3722 $cb->($pkg);
3723 1
3724 } or warn "$pkg unloaded, but with errors: $@";
3725 }
3726
3727 warn "... clearing $pkg";
3728 clear_package $pkg;
3498 } 3729 }
3499 3730
3500 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;
3501 } 3746 }
3502 3747
3503 warn "getting rid of safe::, as good as possible"; 3748 warn "getting rid of safe::, as good as possible";
3504 Symbol::delete_package "safe::$_" 3749 clear_package "safe::$_"
3505 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);
3506 3751
3507 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3508 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3509 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3510 3755
3511 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3512 # and global variables created in xs 3757 # and global variables created in xs
3513 #Symbol::delete_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3514 3759
3515 warn "unload completed, starting to reload now"; 3760 warn "unload completed, starting to reload now";
3516 3761
3517 warn "reloading cf.pm"; 3762 warn "reloading cf.pm";
3518 require cf; 3763 require cf;
3519 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3520 3765
3521 warn "loading config and database again"; 3766 warn "loading config and database again";
3522 cf::reload_config; 3767 cf::reload_config;
3523 3768
3524 warn "loading extensions"; 3769 warn "loading extensions";
3525 cf::load_extensions; 3770 cf::load_extensions;
3526 3771
3772 if ($REATTACH_ON_RELOAD) {
3527 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
3528 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
3529 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
3530 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
3531 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
3532 reattach $_ for values %PLAYER; 3778 reattach $_ for values %PLAYER;
3779 }
3533 3780
3781 warn "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783
3534 warn "leaving sync_job"; 3784 warn "leaving sync_job";
3535 3785
3536 1 3786 1
3537 } or do { 3787 } or do {
3538 warn $@; 3788 warn $@;
3539 warn "error while reloading, exiting."; 3789 cf::cleanup "error while reloading, exiting.";
3540 exit 1;
3541 }; 3790 };
3542 3791
3543 warn "reloaded"; 3792 warn "reloaded";
3793 --$RELOAD;
3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
3544}; 3798};
3545 3799
3546our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
3547 3801
3548sub reload_perl() { 3802sub reload_perl() {
3549 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
3550 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
3551 3805
3806 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions;
3808
3552 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl;
3553 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
3554 do_reload_perl; 3812 };
3555 }; 3813 };
3556} 3814}
3557 3815
3558register_command "reload" => sub { 3816register_command "reload" => sub {
3559 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
3573 3831
3574our @WAIT_FOR_TICK; 3832our @WAIT_FOR_TICK;
3575our @WAIT_FOR_TICK_BEGIN; 3833our @WAIT_FOR_TICK_BEGIN;
3576 3834
3577sub wait_for_tick { 3835sub wait_for_tick {
3578 return unless $TICK_WATCHER->is_active;
3579 return if $Coro::current == $Coro::main; 3836 return if tick_inhibit || $Coro::current == $Coro::main;
3580 3837
3581 my $signal = new Coro::Signal; 3838 my $signal = new Coro::Signal;
3582 push @WAIT_FOR_TICK, $signal; 3839 push @WAIT_FOR_TICK, $signal;
3583 $signal->wait; 3840 $signal->wait;
3584} 3841}
3585 3842
3586sub wait_for_tick_begin { 3843sub wait_for_tick_begin {
3587 return unless $TICK_WATCHER->is_active;
3588 return if $Coro::current == $Coro::main; 3844 return if tick_inhibit || $Coro::current == $Coro::main;
3589 3845
3590 my $signal = new Coro::Signal; 3846 my $signal = new Coro::Signal;
3591 push @WAIT_FOR_TICK_BEGIN, $signal; 3847 push @WAIT_FOR_TICK_BEGIN, $signal;
3592 $signal->wait; 3848 $signal->wait;
3593} 3849}
3594 3850
3595$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3851sub tick {
3596 if ($Coro::current != $Coro::main) { 3852 if ($Coro::current != $Coro::main) {
3597 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"
3598 unless ++$bug_warning > 10; 3854 unless ++$bug_warning > 10;
3599 return; 3855 return;
3600 } 3856 }
3601 3857
3602 $NOW = $tick_start = EV::now;
3603
3604 cf::server_tick; # one server iteration 3858 cf::server_tick; # one server iteration
3605 3859
3606 $RUNTIME += $TICK;
3607 $NEXT_TICK += $TICK;
3608
3609 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3860 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3610 $NEXT_RUNTIME_WRITE = $NOW + 10; 3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3611 Coro::async_pool { 3862 Coro::async_pool {
3612 $Coro::current->{desc} = "runtime saver"; 3863 $Coro::current->{desc} = "runtime saver";
3613 write_runtime 3864 write_runtime_sync
3614 or warn "ERROR: unable to write runtime file: $!"; 3865 or warn "ERROR: unable to write runtime file: $!";
3615 }; 3866 };
3616 } 3867 }
3617 3868
3618 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3620 } 3871 }
3621 while (my $sig = shift @WAIT_FOR_TICK) { 3872 while (my $sig = shift @WAIT_FOR_TICK) {
3622 $sig->send; 3873 $sig->send;
3623 } 3874 }
3624 3875
3625 $LOAD = ($NOW - $tick_start) / $TICK; 3876 $LOAD = ($NOW - $TICK_START) / $TICK;
3626 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3877 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3627 3878
3628 _post_tick; 3879 if (0) {
3629}; 3880 if ($NEXT_TICK) {
3630$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}
3631 3887
3632{ 3888{
3889 # configure BDB
3890
3633 BDB::min_parallel 8; 3891 BDB::min_parallel 8;
3634 BDB::max_poll_time $TICK * 0.1; 3892 BDB::max_poll_reqs $TICK * 0.1;
3635 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 3893 $AnyEvent::BDB::WATCHER->priority (1);
3636
3637 BDB::set_sync_prepare {
3638 my $status;
3639 my $current = $Coro::current;
3640 (
3641 sub {
3642 $status = $!;
3643 $current->ready; undef $current;
3644 },
3645 sub {
3646 Coro::schedule while defined $current;
3647 $! = $status;
3648 },
3649 )
3650 };
3651 3894
3652 unless ($DB_ENV) { 3895 unless ($DB_ENV) {
3653 $DB_ENV = BDB::db_env_create; 3896 $DB_ENV = BDB::db_env_create;
3654 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3655 | 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;
3656 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3900 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3657 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3901 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3658 3902
3659 cf::sync_job { 3903 cf::sync_job {
3660 eval { 3904 eval {
3682 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3926 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3683 }; 3927 };
3684} 3928}
3685 3929
3686{ 3930{
3931 # configure IO::AIO
3932
3687 IO::AIO::min_parallel 8; 3933 IO::AIO::min_parallel 8;
3688
3689 undef $Coro::AIO::WATCHER;
3690 IO::AIO::max_poll_time $TICK * 0.1; 3934 IO::AIO::max_poll_time $TICK * 0.1;
3691 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 3935 undef $AnyEvent::AIO::WATCHER;
3692} 3936}
3693 3937
3694my $_log_backtrace; 3938my $_log_backtrace;
3695 3939
3696sub _log_backtrace { 3940sub _log_backtrace {
3699 $msg =~ s/\n//; 3943 $msg =~ s/\n//;
3700 3944
3701 # limit the # of concurrent backtraces 3945 # limit the # of concurrent backtraces
3702 if ($_log_backtrace < 2) { 3946 if ($_log_backtrace < 2) {
3703 ++$_log_backtrace; 3947 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg;
3704 async { 3949 async {
3705 $Coro::current->{desc} = "abt $msg"; 3950 $Coro::current->{desc} = "abt $msg";
3706 3951
3707 my @bt = fork_call { 3952 my @bt = fork_call {
3708 @addr = map { sprintf "%x", $_ } @addr; 3953 @addr = map { sprintf "%x", $_ } @addr;
3719 } 3964 }
3720 3965
3721 @funcs 3966 @funcs
3722 }; 3967 };
3723 3968
3724 LOG llevInfo, "[ABT] $msg\n"; 3969 LOG llevInfo, "[ABT] $perl_bt\n";
3970 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3725 LOG llevInfo, "[ABT] $_\n" for @bt; 3971 LOG llevInfo, "[ABT] $_\n" for @bt;
3726 --$_log_backtrace; 3972 --$_log_backtrace;
3727 }; 3973 };
3728 } else { 3974 } else {
3729 LOG llevInfo, "[ABT] $msg\n"; 3975 LOG llevInfo, "[ABT] $msg\n";
3730 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3731 } 3977 }
3732} 3978}
3733 3979
3734# load additional modules 3980# load additional modules
3735use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3736 3982
3737END { cf::emergency_save } 3983END { cf::emergency_save }
3738 3984
37391 39851
3740 3986

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines