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.394 by root, Thu Nov 8 19:43:25 2007 UTC vs.
Revision 1.521 by root, Fri Apr 16 23:28:42 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Event; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.1 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.51 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
75 115
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 118our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
83 120
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 124our $DB_ENV;
89 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
90our %CFG; 128our %CFG;
91 129
92our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 131our $RUNTIME;
132our $NOW;
94 133
95our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
98 137
99# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 140
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
105 150
106binmode STDOUT; 151binmode STDOUT;
107binmode STDERR; 152binmode STDERR;
108 153
109# read virtual server time, if available 154# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
114} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
115 162
116mkdir $_ 163mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 165
119our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
120 167
121sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 180
123############################################################################# 181#############################################################################
124 182
125=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
126 184
162 220
163The raw value load value from the last tick. 221The raw value load value from the last tick.
164 222
165=item %cf::CFG 223=item %cf::CFG
166 224
167Configuration for the server, loaded from C</etc/crossfire/config>, or 225Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 226from wherever your confdir points to.
169 227
170=item cf::wait_for_tick, cf::wait_for_tick_begin 228=item cf::wait_for_tick, cf::wait_for_tick_begin
171 229
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 230These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 233
176=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
177 235
178This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 238that call.
181 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
182=back 246=back
183 247
184=cut 248=cut
185 249
186BEGIN { 250$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 251 my $msg = join "", @_;
189 252
190 $msg .= "\n" 253 $msg .= "\n"
191 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
192 255
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 257
195 LOG llevError, $msg; 258 LOG llevError, $msg;
196 }; 259};
197} 260
261$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
265
266 if ($Coro::current == $Coro::main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d#
269 }#d#
270
271 # kill coroutine otherwise
272 Coro::terminate
273};
198 274
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 285for my $pkg (qw(
210 cf::global cf::attachable 286 cf::global cf::attachable
211 cf::object cf::object::player 287 cf::object cf::object::player
212 cf::client cf::player 288 cf::client cf::player
213 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
214 cf::map cf::party cf::region 291 cf::party cf::region
215)) { 292)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 294}
219 295
220$Event::DIED = sub { 296$EV::DIED = sub {
221 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
222}; 298};
223 299
224############################################################################# 300#############################################################################
225 301
226=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 324 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 325 $d
250 } || "[unable to dump $_[0]: '$@']"; 326 } || "[unable to dump $_[0]: '$@']";
251} 327}
252 328
253=item $ref = cf::from_json $json 329=item $ref = cf::decode_json $json
254 330
255Converts a JSON string into the corresponding perl data structure. 331Converts a JSON string into the corresponding perl data structure.
256 332
257=item $json = cf::to_json $ref 333=item $json = cf::encode_json $ref
258 334
259Converts a perl data structure into its JSON representation. 335Converts a perl data structure into its JSON representation.
260 336
261=cut 337=cut
262 338
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 340
265sub to_json ($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
267 357
268=item cf::lock_wait $string 358=item cf::lock_wait $string
269 359
270Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
271 361
272=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
273 363
274Wait until the given lock is available and then acquires it and returns 364Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
277returned. 367returned.
278 368
279Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 370deadlocked coro.
286 376
287Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
288 378
289=cut 379=cut
290 380
291our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 382
294sub lock_wait($) { 383sub lock_wait($) {
295 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 385}
308 386
309sub lock_acquire($) { 387sub lock_acquire($) {
310 my ($key) = @_; 388 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 389}
324 390
325sub lock_active($) { 391sub lock_active($) {
326 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 393}
330 394
331sub freeze_mainloop { 395sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 396 tick_inhibit_inc;
333 397
334 my $guard = Coro::guard { 398 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 399}
336 }; 400
337 $TICK_WATCHER->stop; 401=item cf::periodic $interval, $cb
338 $guard 402
403Like EV::periodic, but randomly selects a starting point so that the actions
404get spread over time.
405
406=cut
407
408sub periodic($$) {
409 my ($interval, $cb) = @_;
410
411 my $start = rand List::Util::min 180, $interval;
412
413 EV::periodic $start, $interval, 0, $cb
339} 414}
340 415
341=item cf::get_slot $time[, $priority[, $name]] 416=item cf::get_slot $time[, $priority[, $name]]
342 417
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 418Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 426
352=cut 427=cut
353 428
354our @SLOT_QUEUE; 429our @SLOT_QUEUE;
355our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
356 432
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
360 436
361 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
362 439
363 while () { 440 while () {
364 next_job: 441 next_job:
442
365 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 444
367 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 449 $job->[2]->send;
371 Coro::cede; 450 Coro::cede;
372 goto next_job; 451 goto next_job;
373 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 454 }
375 } 455 }
376 456
377 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 460 $signal->wait;
381 } else { 461 } else {
462 $busy = 0;
382 Coro::schedule; 463 Coro::schedule;
383 } 464 }
384 } 465 }
385}; 466};
386 467
387sub get_slot($;$$) { 468sub get_slot($;$$) {
469 return if tick_inhibit || $Coro::current == $Coro::main;
470
388 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
389 472
390 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
391 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
392 476
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
422 506
423sub sync_job(&) { 507sub sync_job(&) {
424 my ($job) = @_; 508 my ($job) = @_;
425 509
426 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 511 my $time = AE::time;
428 512
429 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
431 515
432 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
433 517
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 518 my $freeze_guard = freeze_mainloop;
437 519
438 my $busy = 1; 520 my $busy = 1;
439 my @res; 521 my @res;
440 522
447 529
448 while ($busy) { 530 while ($busy) {
449 if (Coro::nready) { 531 if (Coro::nready) {
450 Coro::cede_notself; 532 Coro::cede_notself;
451 } else { 533 } else {
452 Event::one_event; 534 EV::loop EV::LOOP_ONESHOT;
453 } 535 }
454 } 536 }
455 537
456 $time = Event::time - $time; 538 my $time = AE::time - $time;
457 539
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
462 541
463 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
464 } else { 543 } else {
465 # we are in another coroutine, how wonderful, everything just works 544 # we are in another coroutine, how wonderful, everything just works
466 545
491=item fork_call { }, $args 570=item fork_call { }, $args
492 571
493Executes the given code block with the given arguments in a seperate 572Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 573process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 574Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 575never block itself or use any form of event handling.
497 576
498=cut 577=cut
499 578
500sub fork_call(&@) { 579sub fork_call(&@) {
501 my ($cb, @args) = @_; 580 my ($cb, @args) = @_;
508 reset_signals; 587 reset_signals;
509 &$cb 588 &$cb
510 }, @args; 589 }, @args;
511 590
512 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
603}
604
605=item $coin = coin_from_name $name
606
607=cut
608
609our %coin_alias = (
610 "silver" => "silvercoin",
611 "silvercoin" => "silvercoin",
612 "silvercoins" => "silvercoin",
613 "gold" => "goldcoin",
614 "goldcoin" => "goldcoin",
615 "goldcoins" => "goldcoin",
616 "platinum" => "platinacoin",
617 "platinumcoin" => "platinacoin",
618 "platinumcoins" => "platinacoin",
619 "platina" => "platinacoin",
620 "platinacoin" => "platinacoin",
621 "platinacoins" => "platinacoin",
622 "royalty" => "royalty",
623 "royalties" => "royalty",
624);
625
626sub coin_from_name($) {
627 $coin_alias{$_[0]}
628 ? cf::arch::find $coin_alias{$_[0]}
629 : undef
513} 630}
514 631
515=item $value = cf::db_get $family => $key 632=item $value = cf::db_get $family => $key
516 633
517Returns a single value from the environment database. 634Returns a single value from the environment database.
656 773
657############################################################################# 774#############################################################################
658 775
659=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
660 777
661Many objects in crossfire are so-called attachable objects. That means you can 778Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
664 781
665In the following description, CLASS can be any of C<global>, C<object> 782In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 783C<player>, C<client> or C<map> (i.e. the attachable objects in
716=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
717 834
718Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
720 837
721Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 839that are attached at load/instantiate time, thus the need for a name.
723 840
724These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
725 842
726=over 4 843=over 4
954 } 1071 }
955 1072
956 0 1073 0
957} 1074}
958 1075
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1076=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1077
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1078=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1079
963Generate an object-specific event with the given arguments. 1080Generate an object-specific event with the given arguments.
964 1081
1017 1134
1018sub reattach { 1135sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1137 my ($obj) = @_;
1021 1138
1139 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1140 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1141
1024 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
1025 1143
1026 @$registry = (); 1144 @$registry = ();
1027 1145
1042cf::attachable->attach ( 1160cf::attachable->attach (
1043 prio => -1000000, 1161 prio => -1000000,
1044 on_instantiate => sub { 1162 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1163 my ($obj, $data) = @_;
1046 1164
1047 $data = from_json $data; 1165 $data = decode_json $data;
1048 1166
1049 for (@$data) { 1167 for (@$data) {
1050 my ($name, $args) = @$_; 1168 my ($name, $args) = @$_;
1051 1169
1052 $obj->attach ($name, %{$args || {} }); 1170 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1191 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1192 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1076 1194
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1196 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1081 close $fh; 1202 aio_close $fh;
1082 1203
1083 if (@$objs) { 1204 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1206 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1089 close $fh; 1213 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1215 }
1092 } else { 1216 } else {
1093 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1094 } 1218 }
1095 1219
1096 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1224 } else {
1098 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1099 } 1226 }
1100 } else { 1227 } else {
1101 aio_unlink $filename; 1228 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1103 } 1230 }
1194 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1195 1322
1196 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1197} 1324}
1198 1325
1326use File::Glob ();
1327
1199cf::player->attach ( 1328cf::player->attach (
1200 on_command => sub { 1329 on_unknown_command => sub {
1201 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1202 1331
1203 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1204 or return; 1333 or return;
1205 1334
1235 1364
1236 cf::override; 1365 cf::override;
1237 }, 1366 },
1238); 1367);
1239 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1240sub load_extensions { 1382sub load_extensions {
1241 cf::sync_job { 1383 cf::sync_job {
1242 my %todo; 1384 my %todo;
1243 1385
1244 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1263 1405
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1408
1267 $ext{source} = 1409 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1270 . $source 1412 . $source
1271 . "\n};\n1"; 1413 . "\n};\n1";
1272 1414
1273 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1274 } 1416 }
1275 1417
1418 my $pass = 0;
1276 my %done; 1419 my %done;
1277 while (%todo) { 1420 while (%todo) {
1278 my $progress; 1421 my $progress;
1279 1422
1423 ++$pass;
1424
1425 ext:
1280 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip 1428 next ext
1283 unless exists $done{$_}; 1429 unless exists $done{$_};
1284 } 1430 }
1285 1431
1286 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1287 1433
1288 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1289 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1290 : "$v->{base}: extension inactive.\n";
1291 1438
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1440 if exists $v->{meta}{mandatory};
1293 warn $msg; 1441
1294 warn "mandatory extension failed to load, exiting.\n"; 1442 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1295 exit 1; 1443 delete $todo{$k};
1296 } 1444 } else {
1297 1445 $done{$k} = delete $todo{$k};
1298 warn $msg; 1446 push @EXTS, $v->{pkg};
1447 $progress = 1;
1448
1449 warn "$v->{base}: extension inactive.\n"
1450 unless $active;
1299 } 1451 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1452 }
1305 1453
1306 skip: 1454 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1455 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 unless $progress; 1456
1457 while (my ($k, $v) = each %todo) {
1458 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1459 if exists $v->{meta}{mandatory};
1460 }
1461 }
1309 } 1462 }
1310 }; 1463 };
1311} 1464}
1312 1465
1313############################################################################# 1466#############################################################################
1314 1467
1315=back 1468=back
1316 1469
1317=head2 CORE EXTENSIONS 1470=head2 CORE EXTENSIONS
1318 1471
1319Functions and methods that extend core crossfire objects. 1472Functions and methods that extend core deliantra objects.
1320 1473
1321=cut 1474=cut
1322 1475
1323package cf::player; 1476package cf::player;
1324 1477
1367 1520
1368sub exists($) { 1521sub exists($) {
1369 my ($login) = @_; 1522 my ($login) = @_;
1370 1523
1371 $cf::PLAYER{$login} 1524 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1525 or !aio_stat path $login
1373} 1526}
1374 1527
1375sub find($) { 1528sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1529 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1530 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1542 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1543 or return;
1391 1544
1392 my $pl = cf::player::load_pl $f 1545 my $pl = cf::player::load_pl $f
1393 or return; 1546 or return;
1547
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1548 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1549 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1550 $cf::PLAYER{$login} = $pl
1397 } 1551 }
1398 } 1552 }
1399} 1553}
1400 1554
1555cf::player->attach (
1556 on_load => sub {
1557 my ($pl, $path) = @_;
1558
1559 # restore slots saved in save, below
1560 my $slots = delete $pl->{_slots};
1561
1562 $pl->ob->current_weapon ($slots->[0]);
1563 $pl->combat_ob ($slots->[1]);
1564 $pl->ranged_ob ($slots->[2]);
1565 },
1566);
1567
1401sub save($) { 1568sub save($) {
1402 my ($pl) = @_; 1569 my ($pl) = @_;
1403 1570
1404 return if $pl->{deny_save}; 1571 return if $pl->{deny_save};
1405 1572
1408 1575
1409 return if $pl->{deny_save}; 1576 return if $pl->{deny_save};
1410 1577
1411 aio_mkdir playerdir $pl, 0770; 1578 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1579 $pl->{last_save} = $cf::RUNTIME;
1580
1581 cf::get_slot 0.01;
1582
1583 # save slots, to be restored later
1584 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1413 1585
1414 $pl->save_pl ($path); 1586 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1587 cf::cede_to_tick;
1416} 1588}
1417 1589
1449 my ($pl) = @_; 1621 my ($pl) = @_;
1450 1622
1451 my $name = $pl->ob->name; 1623 my $name = $pl->ob->name;
1452 1624
1453 $pl->{deny_save} = 1; 1625 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1626 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1627
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1628 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1629 $pl->deactivate;
1630 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1631 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1632 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1633 $pl->ns->destroy if $pl->ns;
1460 1634
1461 my $path = playerdir $pl; 1635 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1636 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1675
1502 for my $login (@$dirs) { 1676 for my $login (@$dirs) {
1503 my $path = path $login; 1677 my $path = path $login;
1504 1678
1505 # a .pst is a dead give-away for a valid player 1679 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1680 # if no pst file found, open and chekc for blocked users
1681 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1682 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1683 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1684 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1685 }
1511 1686
1542 } 1717 }
1543 1718
1544 \@paths 1719 \@paths
1545} 1720}
1546 1721
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1722=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1723
1549Expand crossfire pod fragments into protocol xml. 1724Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639 1725
1640=item $player->ext_reply ($msgid, @msg) 1726=item $player->ext_reply ($msgid, @msg)
1641 1727
1642Sends an ext reply to the player. 1728Sends an ext reply to the player.
1643 1729
1710our $MAX_RESET = 3600; 1796our $MAX_RESET = 3600;
1711our $DEFAULT_RESET = 3000; 1797our $DEFAULT_RESET = 3000;
1712 1798
1713sub generate_random_map { 1799sub generate_random_map {
1714 my ($self, $rmp) = @_; 1800 my ($self, $rmp) = @_;
1801
1802 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1803
1715 # mit "rum" bekleckern, nicht 1804 # mit "rum" bekleckern, nicht
1716 $self->_create_random_map ( 1805 $self->_create_random_map (
1717 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1806 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1718 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1807 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1719 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1808 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1720 $rmp->{exit_on_final_map}, 1809 $rmp->{exit_on_final_map},
1721 $rmp->{xsize}, $rmp->{ysize}, 1810 $rmp->{xsize}, $rmp->{ysize},
1722 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1811 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1723 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1812 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1841 1930
1842# the temporary/swap location 1931# the temporary/swap location
1843sub save_path { 1932sub save_path {
1844 my ($self) = @_; 1933 my ($self) = @_;
1845 1934
1846 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1935 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1847 "$TMPDIR/$path.map" 1936 "$TMPDIR/$path.map"
1848} 1937}
1849 1938
1850# the unique path, undef == no special unique path 1939# the unique path, undef == no special unique path
1851sub uniq_path { 1940sub uniq_path {
1852 my ($self) = @_; 1941 my ($self) = @_;
1853 1942
1854 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1855 "$UNIQUEDIR/$path" 1944 "$UNIQUEDIR/$path"
1856}
1857
1858# and all this just because we cannot iterate over
1859# all maps in C++...
1860sub change_all_map_light {
1861 my ($change) = @_;
1862
1863 $_->change_map_light ($change)
1864 for grep $_->outdoor, values %cf::MAP;
1865} 1945}
1866 1946
1867sub decay_objects { 1947sub decay_objects {
1868 my ($self) = @_; 1948 my ($self) = @_;
1869 1949
1953sub find { 2033sub find {
1954 my ($path, $origin) = @_; 2034 my ($path, $origin) = @_;
1955 2035
1956 $path = normalise $path, $origin && $origin->path; 2036 $path = normalise $path, $origin && $origin->path;
1957 2037
1958 cf::lock_wait "map_data:$path";#d#remove 2038 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 cf::lock_wait "map_find:$path"; 2039 my $guard2 = cf::lock_acquire "map_find:$path";
1960 2040
1961 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1965 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1966 or return; 2043 or return;
1967 2044
1968 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1969 2046
1971 or return; 2048 or return;
1972 2049
1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2050 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1974 # doing this can freeze the server in a sync job, obviously 2051 # doing this can freeze the server in a sync job, obviously
1975 #$cf::WAIT_FOR_TICK->wait; 2052 #$cf::WAIT_FOR_TICK->wait;
2053 undef $guard2;
1976 undef $guard1; 2054 undef $guard1;
1977 undef $guard2;
1978 $map->reset; 2055 $map->reset;
1979 return find $path; 2056 return find $path;
1980 } 2057 }
1981 2058
1982 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1983 } 2060 }
1984} 2061}
1985 2062
1986sub pre_load { } 2063sub pre_load { }
1987sub post_load { } 2064#sub post_load { } # XS
1988 2065
1989sub load { 2066sub load {
1990 my ($self) = @_; 2067 my ($self) = @_;
1991 2068
1992 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
2009 my $f = new_from_file cf::object::thawer $self->{load_path}; 2086 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block; 2087 $f->skip_block;
2011 $self->_load_objects ($f) 2088 $self->_load_objects ($f)
2012 or return; 2089 or return;
2013 2090
2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2091 $self->post_load_original
2015 if delete $self->{load_original}; 2092 if delete $self->{load_original};
2016 2093
2017 if (my $uniq = $self->uniq_path) { 2094 if (my $uniq = $self->uniq_path) {
2018 utf8::encode $uniq; 2095 utf8::encode $uniq;
2019 unless (aio_stat $uniq) { 2096 unless (aio_stat $uniq) {
2037 unless ($self->{deny_activate}) { 2114 unless ($self->{deny_activate}) {
2038 $self->decay_objects; 2115 $self->decay_objects;
2039 $self->fix_auto_apply; 2116 $self->fix_auto_apply;
2040 $self->update_buttons; 2117 $self->update_buttons;
2041 cf::cede_to_tick; 2118 cf::cede_to_tick;
2042 $self->set_darkness_map;
2043 cf::cede_to_tick;
2044 $self->activate; 2119 $self->activate;
2045 } 2120 }
2046 2121
2047 $self->{last_save} = $cf::RUNTIME; 2122 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME); 2123 $self->last_access ($cf::RUNTIME);
2049 2124
2050 $self->in_memory (cf::MAP_IN_MEMORY); 2125 $self->in_memory (cf::MAP_ACTIVE);
2051 } 2126 }
2052 2127
2053 $self->post_load; 2128 $self->post_load;
2054} 2129}
2055 2130
2131# customize the map for a given player, i.e.
2132# return the _real_ map. used by e.g. per-player
2133# maps to change the path to ~playername/mappath
2056sub customise_for { 2134sub customise_for {
2057 my ($self, $ob) = @_; 2135 my ($self, $ob) = @_;
2058 2136
2059 return find "~" . $ob->name . "/" . $self->{path} 2137 return find "~" . $ob->name . "/" . $self->{path}
2060 if $self->per_player; 2138 if $self->per_player;
2113 my ($path, $origin, $load) = @_; 2191 my ($path, $origin, $load) = @_;
2114 2192
2115 $path = normalise $path, $origin && $origin->{path}; 2193 $path = normalise $path, $origin && $origin->{path};
2116 2194
2117 if (my $map = $cf::MAP{$path}) { 2195 if (my $map = $cf::MAP{$path}) {
2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2119 } 2197 }
2120 2198
2121 $MAP_PREFETCH{$path} |= $load; 2199 $MAP_PREFETCH{$path} |= $load;
2122 2200
2123 $MAP_PREFETCHER ||= cf::async { 2201 $MAP_PREFETCHER ||= cf::async {
2137 $MAP_PREFETCHER->prio (6); 2215 $MAP_PREFETCHER->prio (6);
2138 2216
2139 () 2217 ()
2140} 2218}
2141 2219
2220# common code, used by both ->save and ->swapout
2142sub save { 2221sub _save {
2143 my ($self) = @_; 2222 my ($self) = @_;
2144
2145 my $lock = cf::lock_acquire "map_data:$self->{path}";
2146 2223
2147 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
2148 2225
2149 return unless $self->dirty; 2226 return unless $self->dirty;
2150 2227
2159 2236
2160 cf::async { 2237 cf::async {
2161 $Coro::current->{desc} = "map player save"; 2238 $Coro::current->{desc} = "map player save";
2162 $_->contr->save for $self->players; 2239 $_->contr->save for $self->players;
2163 }; 2240 };
2241
2242 cf::get_slot 0.02;
2164 2243
2165 if ($uniq) { 2244 if ($uniq) {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2167 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2246 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2168 } else { 2247 } else {
2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2170 } 2249 }
2171} 2250}
2172 2251
2252sub save {
2253 my ($self) = @_;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256
2257 $self->_save;
2258}
2259
2173sub swap_out { 2260sub swap_out {
2174 my ($self) = @_; 2261 my ($self) = @_;
2175 2262
2176 # save first because save cedes
2177 $self->save;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2264
2265 return if $self->in_memory != cf::MAP_ACTIVE;
2266 return if $self->{deny_save};
2181 return if $self->players; 2267 return if $self->players;
2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
2183 return if $self->{deny_save};
2184 2268
2185 $self->in_memory (cf::MAP_SWAPPED); 2269 # first deactivate the map and "unlink" it from the core
2186
2187 $self->deactivate; 2270 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP; 2271 $_->clear_links_to ($self) for values %cf::MAP;
2272 $self->in_memory (cf::MAP_SWAPPED);
2273
2274 # then atomically save
2275 $self->_save;
2276
2277 # then free the map
2189 $self->clear; 2278 $self->clear;
2190} 2279}
2191 2280
2192sub reset_at { 2281sub reset_at {
2193 my ($self) = @_; 2282 my ($self) = @_;
2212 2301
2213 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2302 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2303
2215 return if $self->players; 2304 return if $self->players;
2216 2305
2217 warn "resetting map ", $self->path; 2306 warn "resetting map ", $self->path, "\n";
2218 2307
2219 $self->in_memory (cf::MAP_SWAPPED); 2308 $self->in_memory (cf::MAP_SWAPPED);
2220 2309
2221 # need to save uniques path 2310 # need to save uniques path
2222 unless ($self->{deny_save}) { 2311 unless ($self->{deny_save}) {
2305 2394
2306sub unique_maps() { 2395sub unique_maps() {
2307 [ 2396 [
2308 map { 2397 map {
2309 utf8::decode $_; 2398 utf8::decode $_;
2310 /\.map$/ 2399 s/\.map$//; # TODO future compatibility hack
2400 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2401 ? ()
2311 ? normalise $_ 2402 : normalise $_
2312 : ()
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2403 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2404 ]
2315} 2405}
2316 2406
2317package cf; 2407=item cf::map::static_maps
2408
2409Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2410file in the shared directory excluding F</styles> and F</editor>). May
2411block.
2412
2413=cut
2414
2415sub static_maps() {
2416 my @dirs = "";
2417 my @maps;
2418
2419 while (@dirs) {
2420 my $dir = shift @dirs;
2421
2422 next if $dir eq "/styles" || $dir eq "/editor";
2423
2424 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2425 or return;
2426
2427 for (@$files) {
2428 s/\.map$// or next;
2429 utf8::decode $_;
2430 push @maps, "$dir/$_";
2431 }
2432
2433 push @dirs, map "$dir/$_", @$dirs;
2434 }
2435
2436 \@maps
2437}
2318 2438
2319=back 2439=back
2320 2440
2321=head3 cf::object 2441=head3 cf::object
2322 2442
2326 2446
2327=over 4 2447=over 4
2328 2448
2329=item $ob->inv_recursive 2449=item $ob->inv_recursive
2330 2450
2331Returns the inventory of the object _and_ their inventories, recursively. 2451Returns the inventory of the object I<and> their inventories, recursively,
2452but I<not> the object itself.
2332 2453
2333=cut 2454=cut
2334 2455
2335sub inv_recursive_; 2456sub inv_recursive_;
2336sub inv_recursive_ { 2457sub inv_recursive_ {
2341 inv_recursive_ inv $_[0] 2462 inv_recursive_ inv $_[0]
2342} 2463}
2343 2464
2344=item $ref = $ob->ref 2465=item $ref = $ob->ref
2345 2466
2346creates and returns a persistent reference to an objetc that can be stored as a string. 2467Creates and returns a persistent reference to an object that can be stored as a string.
2347 2468
2348=item $ob = cf::object::deref ($refstring) 2469=item $ob = cf::object::deref ($refstring)
2349 2470
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2471returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block. 2472even if the object actually exists. May block.
2383can be C<undef>. Does the right thing when the player is currently in a 2504can be C<undef>. Does the right thing when the player is currently in a
2384dialogue with the given NPC character. 2505dialogue with the given NPC character.
2385 2506
2386=cut 2507=cut
2387 2508
2509our $SAY_CHANNEL = {
2510 id => "say",
2511 title => "Map",
2512 reply => "say ",
2513 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2514};
2515
2516our $CHAT_CHANNEL = {
2517 id => "chat",
2518 title => "Chat",
2519 reply => "chat ",
2520 tooltip => "Player chat and shouts, global to the server.",
2521};
2522
2388# rough implementation of a future "reply" method that works 2523# rough implementation of a future "reply" method that works
2389# with dialog boxes. 2524# with dialog boxes.
2390#TODO: the first argument must go, split into a $npc->reply_to ( method 2525#TODO: the first argument must go, split into a $npc->reply_to ( method
2391sub cf::object::player::reply($$$;$) { 2526sub cf::object::player::reply($$$;$) {
2392 my ($self, $npc, $msg, $flags) = @_; 2527 my ($self, $npc, $msg, $flags) = @_;
2403 my $dialog = $pl->{npc_dialog}; 2538 my $dialog = $pl->{npc_dialog};
2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2539 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2405 2540
2406 } else { 2541 } else {
2407 $msg = $npc->name . " says: $msg" if $npc; 2542 $msg = $npc->name . " says: $msg" if $npc;
2408 $self->message ($msg, $flags); 2543 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2409 } 2544 }
2410 } 2545 }
2411} 2546}
2412 2547
2413=item $object->send_msg ($channel, $msg, $color, [extra...]) 2548=item $object->send_msg ($channel, $msg, $color, [extra...])
2438 2573
2439=item $player_object->enter_link 2574=item $player_object->enter_link
2440 2575
2441Freezes the player and moves him/her to a special map (C<{link}>). 2576Freezes the player and moves him/her to a special map (C<{link}>).
2442 2577
2443The player should be reasonably safe there for short amounts of time. You 2578The player should be reasonably safe there for short amounts of time (e.g.
2444I<MUST> call C<leave_link> as soon as possible, though. 2579for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2580though, as the palyer cannot control the character while it is on the link
2581map.
2445 2582
2446Will never block. 2583Will never block.
2447 2584
2448=item $player_object->leave_link ($map, $x, $y) 2585=item $player_object->leave_link ($map, $x, $y)
2449 2586
2474 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2611 return if UNIVERSAL::isa $self->map, "ext::map_link";
2475 2612
2476 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2613 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2477 if $self->map && $self->map->{path} ne "{link}"; 2614 if $self->map && $self->map->{path} ne "{link}";
2478 2615
2479 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2616 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2480} 2617}
2481 2618
2482sub cf::object::player::leave_link { 2619sub cf::object::player::leave_link {
2483 my ($self, $map, $x, $y) = @_; 2620 my ($self, $map, $x, $y) = @_;
2484 2621
2501 ($x, $y) = (-1, -1) 2638 ($x, $y) = (-1, -1)
2502 unless (defined $x) && (defined $y); 2639 unless (defined $x) && (defined $y);
2503 2640
2504 # use -1 or undef as default coordinates, not 0, 0 2641 # use -1 or undef as default coordinates, not 0, 0
2505 ($x, $y) = ($map->enter_x, $map->enter_y) 2642 ($x, $y) = ($map->enter_x, $map->enter_y)
2506 if $x <=0 && $y <= 0; 2643 if $x <= 0 && $y <= 0;
2507 2644
2508 $map->load; 2645 $map->load;
2509 $map->load_neighbours; 2646 $map->load_neighbours;
2510 2647
2511 return unless $self->contr->active; 2648 return unless $self->contr->active;
2512 $self->activate_recursive;
2513 2649
2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2650 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2515 $self->enter_map ($map, $x, $y); 2651 $self->enter_map ($map, $x, $y);
2652
2653 # only activate afterwards, to support waiting in hooks
2654 $self->activate_recursive;
2516} 2655}
2517 2656
2518=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2657=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2519 2658
2520Moves the player to the given map-path and coordinates by first freezing 2659Moves the player to the given map-path and coordinates by first freezing
2521her, loading and preparing them map, calling the provided $check callback 2660her, loading and preparing them map, calling the provided $check callback
2522that has to return the map if sucecssful, and then unfreezes the player on 2661that has to return the map if sucecssful, and then unfreezes the player on
2523the new (success) or old (failed) map position. In either case, $done will 2662the new (success) or old (failed) map position. In either case, $done will
2524be called at the end of this process. 2663be called at the end of this process.
2664
2665Note that $check will be called with a potentially non-loaded map, so if
2666it needs a loaded map it has to call C<< ->load >>.
2525 2667
2526=cut 2668=cut
2527 2669
2528our $GOTOGEN; 2670our $GOTOGEN;
2529 2671
2608} 2750}
2609 2751
2610sub prepare_random_map { 2752sub prepare_random_map {
2611 my ($exit) = @_; 2753 my ($exit) = @_;
2612 2754
2613 my $guard = cf::lock_acquire "exit_prepare:$exit";
2614
2615 # all this does is basically replace the /! path by 2755 # all this does is basically replace the /! path by
2616 # a new random map path (?random/...) with a seed 2756 # a new random map path (?random/...) with a seed
2617 # that depends on the exit object 2757 # that depends on the exit object
2618 2758
2619 my $rmp = parse_random_map_params $exit->msg; 2759 my $rmp = parse_random_map_params $exit->msg;
2621 if ($exit->map) { 2761 if ($exit->map) {
2622 $rmp->{region} = $exit->region->name; 2762 $rmp->{region} = $exit->region->name;
2623 $rmp->{origin_map} = $exit->map->path; 2763 $rmp->{origin_map} = $exit->map->path;
2624 $rmp->{origin_x} = $exit->x; 2764 $rmp->{origin_x} = $exit->x;
2625 $rmp->{origin_y} = $exit->y; 2765 $rmp->{origin_y} = $exit->y;
2766
2767 $exit->map->touch;
2626 } 2768 }
2627 2769
2628 $rmp->{random_seed} ||= $exit->random_seed; 2770 $rmp->{random_seed} ||= $exit->random_seed;
2629 2771
2630 my $data = cf::to_json $rmp; 2772 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2631 my $md5 = Digest::MD5::md5_hex $data; 2773 my $md5 = Digest::MD5::md5_hex $data;
2632 my $meta = "$RANDOMDIR/$md5.meta"; 2774 my $meta = "$RANDOMDIR/$md5.meta";
2633 2775
2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2776 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635 aio_write $fh, 0, (length $data), $data, 0; 2777 aio_write $fh, 0, (length $data), $data, 0;
2636 undef $fh; 2778 undef $fh;
2637 aio_rename "$meta~", $meta; 2779 aio_rename "$meta~", $meta;
2638 2780
2781 my $slaying = "?random/$md5";
2782
2783 if ($exit->valid) {
2639 $exit->slaying ("?random/$md5"); 2784 $exit->slaying ("?random/$md5");
2640 $exit->msg (undef); 2785 $exit->msg (undef);
2786 }
2641 } 2787 }
2642} 2788}
2643 2789
2644sub cf::object::player::enter_exit { 2790sub cf::object::player::enter_exit {
2645 my ($self, $exit) = @_; 2791 my ($self, $exit) = @_;
2646 2792
2647 return unless $self->type == cf::PLAYER; 2793 return unless $self->type == cf::PLAYER;
2648 2794
2649 if ($exit->slaying eq "/!") {
2650 #TODO: this should de-fi-ni-te-ly not be a sync-job
2651 # the problem is that $exit might not survive long enough
2652 # so it needs to be done right now, right here
2653 cf::sync_job { prepare_random_map $exit };
2654 }
2655
2656 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2657 my $hp = $exit->stats->hp;
2658 my $sp = $exit->stats->sp;
2659
2660 $self->enter_link; 2795 $self->enter_link;
2661 2796
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2666 (async { 2797 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2798 $Coro::current->{desc} = "enter_exit";
2668 2799
2669 $self->deactivate_recursive; # just to be sure
2670 unless (eval { 2800 unless (eval {
2801 $self->deactivate_recursive; # just to be sure
2802
2803 # random map handling
2804 {
2805 my $guard = cf::lock_acquire "exit_prepare:$exit";
2806
2807 prepare_random_map $exit
2808 if $exit->slaying eq "/!";
2809 }
2810
2811 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2812 my $x = $exit->stats->hp;
2813 my $y = $exit->stats->sp;
2814
2671 $self->goto ($slaying, $hp, $sp); 2815 $self->goto ($map, $x, $y);
2672 2816
2817 # if exit is damned, update players death & WoR home-position
2818 $self->contr->savebed ($map, $x, $y)
2819 if $exit->flag (cf::FLAG_DAMNED);
2820
2673 1; 2821 1
2674 }) { 2822 }) {
2675 $self->message ("Something went wrong deep within the crossfire server. " 2823 $self->message ("Something went wrong deep within the deliantra server. "
2676 . "I'll try to bring you back to the map you were before. " 2824 . "I'll try to bring you back to the map you were before. "
2677 . "Please report this to the dungeon master!", 2825 . "Please report this to the dungeon master!",
2678 cf::NDI_UNIQUE | cf::NDI_RED); 2826 cf::NDI_UNIQUE | cf::NDI_RED);
2679 2827
2680 warn "ERROR in enter_exit: $@"; 2828 warn "ERROR in enter_exit: $@";
2697sub cf::client::send_drawinfo { 2845sub cf::client::send_drawinfo {
2698 my ($self, $text, $flags) = @_; 2846 my ($self, $text, $flags) = @_;
2699 2847
2700 utf8::encode $text; 2848 utf8::encode $text;
2701 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2849 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2850}
2851
2852=item $client->send_big_packet ($pkt)
2853
2854Like C<send_packet>, but tries to compress large packets, and fragments
2855them as required.
2856
2857=cut
2858
2859our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2860
2861sub cf::client::send_big_packet {
2862 my ($self, $pkt) = @_;
2863
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt);
2702} 2875}
2703 2876
2704=item $client->send_msg ($channel, $msg, $color, [extra...]) 2877=item $client->send_msg ($channel, $msg, $color, [extra...])
2705 2878
2706Send a drawinfo or msg packet to the client, formatting the msg for the 2879Send a drawinfo or msg packet to the client, formatting the msg for the
2710 2883
2711=cut 2884=cut
2712 2885
2713# non-persistent channels (usually the info channel) 2886# non-persistent channels (usually the info channel)
2714our %CHANNEL = ( 2887our %CHANNEL = (
2888 "c/motd" => {
2889 id => "infobox",
2890 title => "MOTD",
2891 reply => undef,
2892 tooltip => "The message of the day",
2893 },
2715 "c/identify" => { 2894 "c/identify" => {
2716 id => "infobox", 2895 id => "infobox",
2717 title => "Identify", 2896 title => "Identify",
2718 reply => undef, 2897 reply => undef,
2719 tooltip => "Items recently identified", 2898 tooltip => "Items recently identified",
2721 "c/examine" => { 2900 "c/examine" => {
2722 id => "infobox", 2901 id => "infobox",
2723 title => "Examine", 2902 title => "Examine",
2724 reply => undef, 2903 reply => undef,
2725 tooltip => "Signs and other items you examined", 2904 tooltip => "Signs and other items you examined",
2905 },
2906 "c/shopinfo" => {
2907 id => "infobox",
2908 title => "Shop Info",
2909 reply => undef,
2910 tooltip => "What your bargaining skill tells you about the shop",
2726 }, 2911 },
2727 "c/book" => { 2912 "c/book" => {
2728 id => "infobox", 2913 id => "infobox",
2729 title => "Book", 2914 title => "Book",
2730 reply => undef, 2915 reply => undef,
2746 id => "infobox", 2931 id => "infobox",
2747 title => "Body Parts", 2932 title => "Body Parts",
2748 reply => undef, 2933 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available", 2934 tooltip => "Shows which body parts you posess and are available",
2750 }, 2935 },
2936 "c/statistics" => {
2937 id => "infobox",
2938 title => "Statistics",
2939 reply => undef,
2940 tooltip => "Shows your primary statistics",
2941 },
2942 "c/skills" => {
2943 id => "infobox",
2944 title => "Skills",
2945 reply => undef,
2946 tooltip => "Shows your experience per skill and item power",
2947 },
2948 "c/shopitems" => {
2949 id => "infobox",
2950 title => "Shop Items",
2951 reply => undef,
2952 tooltip => "Shows the items currently for sale in this shop",
2953 },
2954 "c/resistances" => {
2955 id => "infobox",
2956 title => "Resistances",
2957 reply => undef,
2958 tooltip => "Shows your resistances",
2959 },
2960 "c/pets" => {
2961 id => "infobox",
2962 title => "Pets",
2963 reply => undef,
2964 tooltip => "Shows information abotu your pets/a specific pet",
2965 },
2966 "c/perceiveself" => {
2967 id => "infobox",
2968 title => "Perceive Self",
2969 reply => undef,
2970 tooltip => "You gained detailed knowledge about yourself",
2971 },
2751 "c/uptime" => { 2972 "c/uptime" => {
2752 id => "infobox", 2973 id => "infobox",
2753 title => "Uptime", 2974 title => "Uptime",
2754 reply => undef, 2975 reply => undef,
2755 tooltip => "How long the server has been running since last restart", 2976 tooltip => "How long the server has been running since last restart",
2758 id => "infobox", 2979 id => "infobox",
2759 title => "Map Info", 2980 title => "Map Info",
2760 reply => undef, 2981 reply => undef,
2761 tooltip => "Information related to the maps", 2982 tooltip => "Information related to the maps",
2762 }, 2983 },
2984 "c/party" => {
2985 id => "party",
2986 title => "Party",
2987 reply => "gsay ",
2988 tooltip => "Messages and chat related to your party",
2989 },
2990 "c/death" => {
2991 id => "death",
2992 title => "Death",
2993 reply => undef,
2994 tooltip => "Reason for and more info about your most recent death",
2995 },
2996 "c/say" => $SAY_CHANNEL,
2997 "c/chat" => $CHAT_CHANNEL,
2763); 2998);
2764 2999
2765sub cf::client::send_msg { 3000sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_; 3001 my ($self, $channel, $msg, $color, @extra) = @_;
2767 3002
2768 $msg = $self->pl->expand_cfpod ($msg); 3003 $msg = $self->pl->expand_cfpod ($msg)
3004 unless $color & cf::NDI_VERBATIM;
2769 3005
2770 $color &= cf::NDI_CLIENT_MASK; # just in case... 3006 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771 3007
2772 # check predefined channels, for the benefit of C 3008 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) { 3009 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel}; 3010 $channel = $CHANNEL{$channel};
2775 3011
2776 $self->ext_msg (channel_info => $channel) 3012 $self->ext_msg (channel_info => $channel);
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id}; 3013 $channel = $channel->{id};
2780 3014
2781 } elsif (ref $channel) { 3015 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent 3016 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) { 3017 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel; 3018 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel) 3019 $self->ext_msg (channel_info => $channel);
2786 if $self->can_msg;
2787 } 3020 }
2788 3021
2789 $channel = $channel->{id}; 3022 $channel = $channel->{id};
2790 } 3023 }
2791 3024
2792 return unless @extra || length $msg; 3025 return unless @extra || length $msg;
2793 3026
2794 if ($self->can_msg) {
2795 # default colour, mask it out 3027 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3028 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF; 3029 if $color & cf::NDI_DEF;
2798 3030
2799 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3031 my $pkt = "msg "
3032 . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3033 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2801 } else { 3034 );
2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812 3035
2813 $color &= cf::NDI_COLOR_MASK; 3036 $self->send_big_packet ($pkt);
2814
2815 utf8::encode $msg;
2816
2817 if (0 && $msg =~ /\[/) {
2818 # COMMAND/INFO
2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2820 } else {
2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2822 $self->send_packet ("drawinfo $color $msg")
2823 }
2824 }
2825 }
2826} 3037}
2827 3038
2828=item $client->ext_msg ($type, @msg) 3039=item $client->ext_msg ($type, @msg)
2829 3040
2830Sends an ext event to the client. 3041Sends an ext event to the client.
2833 3044
2834sub cf::client::ext_msg($$@) { 3045sub cf::client::ext_msg($$@) {
2835 my ($self, $type, @msg) = @_; 3046 my ($self, $type, @msg) = @_;
2836 3047
2837 if ($self->extcmd == 2) { 3048 if ($self->extcmd == 2) {
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2839 } elsif ($self->extcmd == 1) { # TODO: remove 3050 } elsif ($self->extcmd == 1) { # TODO: remove
2840 push @msg, msgtype => "event_$type"; 3051 push @msg, msgtype => "event_$type";
2841 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3052 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2842 } 3053 }
2843} 3054}
2844 3055
2845=item $client->ext_reply ($msgid, @msg) 3056=item $client->ext_reply ($msgid, @msg)
2846 3057
2850 3061
2851sub cf::client::ext_reply($$@) { 3062sub cf::client::ext_reply($$@) {
2852 my ($self, $id, @msg) = @_; 3063 my ($self, $id, @msg) = @_;
2853 3064
2854 if ($self->extcmd == 2) { 3065 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3066 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2856 } elsif ($self->extcmd == 1) { 3067 } elsif ($self->extcmd == 1) {
2857 #TODO: version 1, remove 3068 #TODO: version 1, remove
2858 unshift @msg, msgtype => "reply", msgid => $id; 3069 unshift @msg, msgtype => "reply", msgid => $id;
2859 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2860 } 3071 }
2861} 3072}
2862 3073
2863=item $success = $client->query ($flags, "text", \&cb) 3074=item $success = $client->query ($flags, "text", \&cb)
2864 3075
2965 3176
2966 $coro 3177 $coro
2967} 3178}
2968 3179
2969cf::client->attach ( 3180cf::client->attach (
2970 on_destroy => sub { 3181 on_client_destroy => sub {
2971 my ($ns) = @_; 3182 my ($ns) = @_;
2972 3183
2973 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3184 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2974 }, 3185 },
2975); 3186);
2991our $safe_hole = new Safe::Hole; 3202our $safe_hole = new Safe::Hole;
2992 3203
2993$SIG{FPE} = 'IGNORE'; 3204$SIG{FPE} = 'IGNORE';
2994 3205
2995$safe->permit_only (Opcode::opset qw( 3206$safe->permit_only (Opcode::opset qw(
2996 :base_core :base_mem :base_orig :base_math 3207 :base_core :base_mem :base_orig :base_math :base_loop
2997 grepstart grepwhile mapstart mapwhile 3208 grepstart grepwhile mapstart mapwhile
2998 sort time 3209 sort time
2999)); 3210));
3000 3211
3001# here we export the classes and methods available to script code 3212# here we export the classes and methods available to script code
3004 3215
3005The following functions and methods are available within a safe environment: 3216The following functions and methods are available within a safe environment:
3006 3217
3007 cf::object 3218 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy 3219 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr 3220 insert remove name archname title slaying race decrease split
3221 value
3010 3222
3011 cf::object::player 3223 cf::object::player
3012 player 3224 player
3013 3225
3014 cf::player 3226 cf::player
3019 3231
3020=cut 3232=cut
3021 3233
3022for ( 3234for (
3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3235 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race 3236 insert remove inv nrof name archname title slaying race
3025 decrease_ob_nr destroy)], 3237 decrease split destroy change_exp value msg lore send_msg)],
3026 ["cf::object::player" => qw(player)], 3238 ["cf::object::player" => qw(player)],
3027 ["cf::player" => qw(peaceful)], 3239 ["cf::player" => qw(peaceful send_msg)],
3028 ["cf::map" => qw(trigger)], 3240 ["cf::map" => qw(trigger)],
3029) { 3241) {
3030 no strict 'refs'; 3242 no strict 'refs';
3031 my ($pkg, @funs) = @$_; 3243 my ($pkg, @funs) = @$_;
3032 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3244 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3050 3262
3051 my $qcode = $code; 3263 my $qcode = $code;
3052 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3264 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3053 $qcode =~ s/\n/\\n/g; 3265 $qcode =~ s/\n/\\n/g;
3054 3266
3267 %vars = (_dummy => 0) unless %vars;
3268
3269 my @res;
3055 local $_; 3270 local $_;
3056 local @safe::cf::_safe_eval_args = values %vars;
3057 3271
3058 my $eval = 3272 my $eval =
3059 "do {\n" 3273 "do {\n"
3060 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3274 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3061 . "#line 0 \"{$qcode}\"\n" 3275 . "#line 0 \"{$qcode}\"\n"
3062 . $code 3276 . $code
3063 . "\n}" 3277 . "\n}"
3064 ; 3278 ;
3065 3279
3280 if ($CFG{safe_eval}) {
3066 sub_generation_inc; 3281 sub_generation_inc;
3282 local @safe::cf::_safe_eval_args = values %vars;
3067 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3283 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3068 sub_generation_inc; 3284 sub_generation_inc;
3285 } else {
3286 local @cf::_safe_eval_args = values %vars;
3287 @res = wantarray ? eval eval : scalar eval $eval;
3288 }
3069 3289
3070 if ($@) { 3290 if ($@) {
3071 warn "$@"; 3291 warn "$@";
3072 warn "while executing safe code '$code'\n"; 3292 warn "while executing safe code '$code'\n";
3073 warn "with arguments " . (join " ", %vars) . "\n"; 3293 warn "with arguments " . (join " ", %vars) . "\n";
3092=cut 3312=cut
3093 3313
3094sub register_script_function { 3314sub register_script_function {
3095 my ($fun, $cb) = @_; 3315 my ($fun, $cb) = @_;
3096 3316
3097 no strict 'refs'; 3317 $fun = "safe::$fun" if $CFG{safe_eval};
3098 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3318 *$fun = $safe_hole->wrap ($cb);
3099} 3319}
3100 3320
3101=back 3321=back
3102 3322
3103=cut 3323=cut
3124 3344
3125 $facedata->{version} == 2 3345 $facedata->{version} == 2
3126 or cf::cleanup "$path: version mismatch, cannot proceed."; 3346 or cf::cleanup "$path: version mismatch, cannot proceed.";
3127 3347
3128 # patch in the exptable 3348 # patch in the exptable
3349 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3129 $facedata->{resource}{"res/exp_table"} = { 3350 $facedata->{resource}{"res/exp_table"} = {
3130 type => FT_RSRC, 3351 type => FT_RSRC,
3131 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3352 data => $exp_table,
3353 hash => (Digest::MD5::md5 $exp_table),
3132 }; 3354 };
3133 cf::cede_to_tick; 3355 cf::cede_to_tick;
3134 3356
3135 { 3357 {
3136 my $faces = $facedata->{faceinfo}; 3358 my $faces = $facedata->{faceinfo};
3137 3359
3138 while (my ($face, $info) = each %$faces) { 3360 while (my ($face, $info) = each %$faces) {
3139 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3361 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3362
3140 cf::face::set_visibility $idx, $info->{visibility}; 3363 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap}; 3364 cf::face::set_magicmap $idx, $info->{magicmap};
3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3365 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3366 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3144 3367
3145 cf::cede_to_tick; 3368 cf::cede_to_tick;
3146 } 3369 }
3147 3370
3148 while (my ($face, $info) = each %$faces) { 3371 while (my ($face, $info) = each %$faces) {
3149 next unless $info->{smooth}; 3372 next unless $info->{smooth};
3373
3150 my $idx = cf::face::find $face 3374 my $idx = cf::face::find $face
3151 or next; 3375 or next;
3376
3152 if (my $smooth = cf::face::find $info->{smooth}) { 3377 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth; 3378 cf::face::set_smooth $idx, $smooth;
3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3379 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155 } else { 3380 } else {
3156 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3381 warn "smooth face '$info->{smooth}' not found for face '$face'";
3170 3395
3171 cf::anim::invalidate_all; # d'oh 3396 cf::anim::invalidate_all; # d'oh
3172 } 3397 }
3173 3398
3174 { 3399 {
3175 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource}; 3400 my $res = $facedata->{resource};
3178 3401
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) { 3402 while (my ($name, $info) = each %$res) {
3403 if (defined $info->{type}) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3404 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data;
3184 3405
3185 if ($info->{type} & 1) { 3406 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3186 # prepend meta info 3407 cf::face::set_type $idx, $info->{type};
3187
3188 my $meta = $enc->encode ({
3189 name => $name,
3190 %{ $info->{meta} || {} },
3191 });
3192
3193 $data = pack "(w/a*)*", $meta, $info->{data};
3194 } else { 3408 } else {
3195 $data = $info->{data}; 3409 $RESOURCE{$name} = $info;
3196 } 3410 }
3197 3411
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick; 3412 cf::cede_to_tick;
3202 } 3413 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 } 3414 }
3415
3416 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222 3417
3223 1 3418 1
3224} 3419}
3420
3421cf::global->attach (on_resource_update => sub {
3422 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3423 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3424
3425 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3426 my $sound = $soundconf->{compat}[$_]
3427 or next;
3428
3429 my $face = cf::face::find "sound/$sound->[1]";
3430 cf::sound::set $sound->[0] => $face;
3431 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3432 }
3433
3434 while (my ($k, $v) = each %{$soundconf->{event}}) {
3435 my $face = cf::face::find "sound/$v";
3436 cf::sound::set $k => $face;
3437 }
3438 }
3439});
3225 3440
3226register_exticmd fx_want => sub { 3441register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_; 3442 my ($ns, $want) = @_;
3228 3443
3229 while (my ($k, $v) = each %$want) { 3444 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v); 3445 $ns->fx_want ($k, $v);
3231 } 3446 }
3232}; 3447};
3448
3449sub load_resource_file($) {
3450 my $guard = lock_acquire "load_resource_file";
3451
3452 my $status = load_resource_file_ $_[0];
3453 get_slot 0.1, 100;
3454 cf::arch::commit_load;
3455
3456 $status
3457}
3233 3458
3234sub reload_regions { 3459sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework 3460 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?) 3461 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3251} 3476}
3252 3477
3253sub reload_archetypes { 3478sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes" 3479 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n"; 3480 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
3259 load_resource_file "$DATADIR/archetypes"
3260 or die "unable to load archetypes\n";
3261} 3481}
3262 3482
3263sub reload_treasures { 3483sub reload_treasures {
3264 load_resource_file "$DATADIR/treasures" 3484 load_resource_file "$DATADIR/treasures"
3265 or die "unable to load treasurelists\n"; 3485 or die "unable to load treasurelists\n";
3266} 3486}
3267 3487
3268sub reload_resources { 3488sub reload_resources {
3269 warn "reloading resource files...\n"; 3489 warn "reloading resource files...\n";
3270 3490
3491 reload_facedata;
3492 reload_archetypes;
3271 reload_regions; 3493 reload_regions;
3272 reload_facedata;
3273 #reload_archetypes;#d#
3274 reload_archetypes;
3275 reload_treasures; 3494 reload_treasures;
3276 3495
3277 warn "finished reloading resource files\n"; 3496 warn "finished reloading resource files\n";
3278} 3497}
3279 3498
3280sub init {
3281 reload_resources;
3282}
3283
3284sub reload_config { 3499sub reload_config {
3500 warn "reloading config file...\n";
3501
3285 open my $fh, "<:utf8", "$CONFDIR/config" 3502 open my $fh, "<:utf8", "$CONFDIR/config"
3286 or return; 3503 or return;
3287 3504
3288 local $/; 3505 local $/;
3289 *CFG = YAML::Syck::Load <$fh>; 3506 *CFG = YAML::XS::Load scalar <$fh>;
3290 3507
3291 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3508 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3292 3509
3293 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3510 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3294 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3511 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3298 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3515 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3299 and die "WARNING: m(un)lockall failed: $!\n"; 3516 and die "WARNING: m(un)lockall failed: $!\n";
3300 }; 3517 };
3301 warn $@ if $@; 3518 warn $@ if $@;
3302 } 3519 }
3520
3521 warn "finished reloading resource files\n";
3522}
3523
3524sub pidfile() {
3525 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3526 or die "$PIDFILE: $!";
3527 flock $fh, &Fcntl::LOCK_EX
3528 or die "$PIDFILE: flock: $!";
3529 $fh
3530}
3531
3532# make sure only one server instance is running at any one time
3533sub atomic {
3534 my $fh = pidfile;
3535
3536 my $pid = <$fh>;
3537 kill 9, $pid if $pid > 0;
3538
3539 seek $fh, 0, 0;
3540 print $fh $$;
3541}
3542
3543sub main_loop {
3544 warn "EV::loop starting\n";
3545 if (1) {
3546 EV::loop;
3547 }
3548 warn "EV::loop returned\n";
3549 goto &main_loop unless $REALLY_UNLOOP;
3303} 3550}
3304 3551
3305sub main { 3552sub main {
3553 cf::init_globals; # initialise logging
3554
3555 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3556 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3557 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3558 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3559
3560 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3561
3306 # we must not ever block the main coroutine 3562 # we must not ever block the main coroutine
3307 local $Coro::idle = sub { 3563 local $Coro::idle = sub {
3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3564 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3309 (async { 3565 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3566 $Coro::current->{desc} = "IDLE BUG HANDLER";
3311 Event::one_event; 3567 EV::loop EV::LOOP_ONESHOT;
3312 })->prio (Coro::PRIO_MAX); 3568 })->prio (Coro::PRIO_MAX);
3313 }; 3569 };
3314 3570
3571 evthread_start IO::AIO::poll_fileno;
3572
3573 cf::sync_job {
3574 cf::init_experience;
3575 cf::init_anim;
3576 cf::init_attackmess;
3577 cf::init_dynamic;
3578
3579 cf::load_settings;
3580 cf::load_materials;
3581
3582 reload_resources;
3315 reload_config; 3583 reload_config;
3316 db_init; 3584 db_init;
3585
3586 cf::init_uuid;
3587 cf::init_signals;
3588 cf::init_skills;
3589
3590 cf::init_beforeplay;
3591
3592 atomic;
3593
3317 load_extensions; 3594 load_extensions;
3318 3595
3319 $TICK_WATCHER->start; 3596 utime time, time, $RUNTIMEFILE;
3320 Event::loop; 3597
3598 # no (long-running) fork's whatsoever before this point(!)
3599 use POSIX ();
3600 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3601
3602 (pop @POST_INIT)->(0) while @POST_INIT;
3603 };
3604
3605 cf::object::thawer::errors_are_fatal 0;
3606 warn "parse errors in files are no longer fatal from this point on.\n";
3607
3608 main_loop;
3321} 3609}
3322 3610
3323############################################################################# 3611#############################################################################
3324# initialisation and cleanup 3612# initialisation and cleanup
3325 3613
3326# install some emergency cleanup handlers 3614# install some emergency cleanup handlers
3327BEGIN { 3615BEGIN {
3616 our %SIGWATCHER = ();
3328 for my $signal (qw(INT HUP TERM)) { 3617 for my $signal (qw(INT HUP TERM)) {
3329 Event->signal ( 3618 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3330 reentrant => 0,
3331 data => WF_AUTOCANCEL,
3332 signal => $signal,
3333 prio => 0,
3334 cb => sub {
3335 cf::cleanup "SIG$signal"; 3619 cf::cleanup "SIG$signal";
3336 },
3337 ); 3620 };
3338 } 3621 }
3339} 3622}
3340 3623
3341sub write_runtime { 3624sub write_runtime_sync {
3342 my $runtime = "$LOCALDIR/runtime"; 3625 my $t0 = AE::time;
3343 3626
3344 # first touch the runtime file to show we are still running: 3627 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time. 3628 # the fsync below can take a very very long time.
3346 3629
3347 IO::AIO::aio_utime $runtime, undef, undef; 3630 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3348 3631
3349 my $guard = cf::lock_acquire "write_runtime"; 3632 my $guard = cf::lock_acquire "write_runtime";
3350 3633
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3634 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3352 or return; 3635 or return;
3353 3636
3354 my $value = $cf::RUNTIME + 90 + 10; 3637 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock 3638 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server. 3639 # 60 allows for the watchdog to kill the server.
3366 aio_utime $fh, undef, undef; 3649 aio_utime $fh, undef, undef;
3367 3650
3368 close $fh 3651 close $fh
3369 or return; 3652 or return;
3370 3653
3371 aio_rename "$runtime~", $runtime 3654 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3372 and return; 3655 and return;
3373 3656
3374 warn "runtime file written.\n"; 3657 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3375 3658
3376 1 3659 1
3660}
3661
3662our $uuid_lock;
3663our $uuid_skip;
3664
3665sub write_uuid_sync($) {
3666 $uuid_skip ||= $_[0];
3667
3668 return if $uuid_lock;
3669 local $uuid_lock = 1;
3670
3671 my $uuid = "$LOCALDIR/uuid";
3672
3673 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3674 or return;
3675
3676 my $value = uuid_seq uuid_cur;
3677
3678 unless ($value) {
3679 warn "cowardly refusing to write zero uuid value!\n";
3680 return;
3681 }
3682
3683 my $value = uuid_str $value + $uuid_skip;
3684 $uuid_skip = 0;
3685
3686 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3687 and return;
3688
3689 # always fsync - this file is important
3690 aio_fsync $fh
3691 and return;
3692
3693 close $fh
3694 or return;
3695
3696 aio_rename "$uuid~", $uuid
3697 and return;
3698
3699 warn "uuid file written ($value).\n";
3700
3701 1
3702
3703}
3704
3705sub write_uuid($$) {
3706 my ($skip, $sync) = @_;
3707
3708 $sync ? write_uuid_sync $skip
3709 : async { write_uuid_sync $skip };
3377} 3710}
3378 3711
3379sub emergency_save() { 3712sub emergency_save() {
3380 my $freeze_guard = cf::freeze_mainloop; 3713 my $freeze_guard = cf::freeze_mainloop;
3381 3714
3382 warn "enter emergency perl save\n"; 3715 warn "emergency_perl_save: enter\n";
3383 3716
3384 cf::sync_job { 3717 cf::sync_job {
3718 # this is a trade-off: we want to be very quick here, so
3719 # save all maps without fsync, and later call a global sync
3720 # (which in turn might be very very slow)
3721 local $USE_FSYNC = 0;
3722
3385 # use a peculiar iteration method to avoid tripping on perl 3723 # use a peculiar iteration method to avoid tripping on perl
3386 # refcount bugs in for. also avoids problems with players 3724 # refcount bugs in for. also avoids problems with players
3387 # and maps saved/destroyed asynchronously. 3725 # and maps saved/destroyed asynchronously.
3388 warn "begin emergency player save\n"; 3726 warn "emergency_perl_save: begin player save\n";
3389 for my $login (keys %cf::PLAYER) { 3727 for my $login (keys %cf::PLAYER) {
3390 my $pl = $cf::PLAYER{$login} or next; 3728 my $pl = $cf::PLAYER{$login} or next;
3391 $pl->valid or next; 3729 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3730 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3393 $pl->save; 3731 $pl->save;
3394 } 3732 }
3395 warn "end emergency player save\n"; 3733 warn "emergency_perl_save: end player save\n";
3396 3734
3397 warn "begin emergency map save\n"; 3735 warn "emergency_perl_save: begin map save\n";
3398 for my $path (keys %cf::MAP) { 3736 for my $path (keys %cf::MAP) {
3399 my $map = $cf::MAP{$path} or next; 3737 my $map = $cf::MAP{$path} or next;
3400 $map->valid or next; 3738 $map->valid or next;
3401 $map->save; 3739 $map->save;
3402 } 3740 }
3403 warn "end emergency map save\n"; 3741 warn "emergency_perl_save: end map save\n";
3404 3742
3405 warn "begin emergency database checkpoint\n"; 3743 warn "emergency_perl_save: begin database checkpoint\n";
3406 BDB::db_env_txn_checkpoint $DB_ENV; 3744 BDB::db_env_txn_checkpoint $DB_ENV;
3407 warn "end emergency database checkpoint\n"; 3745 warn "emergency_perl_save: end database checkpoint\n";
3746
3747 warn "emergency_perl_save: begin write uuid\n";
3748 write_uuid_sync 1;
3749 warn "emergency_perl_save: end write uuid\n";
3408 }; 3750 };
3409 3751
3752 warn "emergency_perl_save: starting sync()\n";
3753 IO::AIO::aio_sync sub {
3754 warn "emergency_perl_save: finished sync()\n";
3755 };
3756
3410 warn "leave emergency perl save\n"; 3757 warn "emergency_perl_save: leave\n";
3411} 3758}
3412 3759
3413sub post_cleanup { 3760sub post_cleanup {
3414 my ($make_core) = @_; 3761 my ($make_core) = @_;
3415 3762
3416 warn Carp::longmess "post_cleanup backtrace" 3763 warn Carp::longmess "post_cleanup backtrace"
3417 if $make_core; 3764 if $make_core;
3765
3766 my $fh = pidfile;
3767 unlink $PIDFILE if <$fh> == $$;
3768}
3769
3770# a safer delete_package, copied from Symbol
3771sub clear_package($) {
3772 my $pkg = shift;
3773
3774 # expand to full symbol table name if needed
3775 unless ($pkg =~ /^main::.*::$/) {
3776 $pkg = "main$pkg" if $pkg =~ /^::/;
3777 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3778 $pkg .= '::' unless $pkg =~ /::$/;
3779 }
3780
3781 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3782 my $stem_symtab = *{$stem}{HASH};
3783
3784 defined $stem_symtab and exists $stem_symtab->{$leaf}
3785 or return;
3786
3787 # clear all symbols
3788 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3789 for my $name (keys %$leaf_symtab) {
3790 _gv_clear *{"$pkg$name"};
3791# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3792 }
3418} 3793}
3419 3794
3420sub do_reload_perl() { 3795sub do_reload_perl() {
3421 # can/must only be called in main 3796 # can/must only be called in main
3422 if ($Coro::current != $Coro::main) { 3797 if ($Coro::current != $Coro::main) {
3423 warn "can only reload from main coroutine"; 3798 warn "can only reload from main coroutine";
3424 return; 3799 return;
3425 } 3800 }
3426 3801
3802 return if $RELOAD++;
3803
3804 my $t1 = AE::time;
3805
3806 while ($RELOAD) {
3427 warn "reloading..."; 3807 warn "reloading...";
3428 3808
3429 warn "entering sync_job"; 3809 warn "entering sync_job";
3430 3810
3431 cf::sync_job { 3811 cf::sync_job {
3432 cf::write_runtime; # external watchdog should not bark 3812 cf::write_runtime_sync; # external watchdog should not bark
3433 cf::emergency_save; 3813 cf::emergency_save;
3434 cf::write_runtime; # external watchdog should not bark 3814 cf::write_runtime_sync; # external watchdog should not bark
3435 3815
3436 warn "syncing database to disk"; 3816 warn "syncing database to disk";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3817 BDB::db_env_txn_checkpoint $DB_ENV;
3438 3818
3439 # if anything goes wrong in here, we should simply crash as we already saved 3819 # if anything goes wrong in here, we should simply crash as we already saved
3440 3820
3441 warn "cancelling all WF_AUTOCANCEL watchers";
3442 for (Event::all_watchers) {
3443 $_->cancel if $_->data & WF_AUTOCANCEL;
3444 }
3445
3446 warn "flushing outstanding aio requests"; 3821 warn "flushing outstanding aio requests";
3447 for (;;) {
3448 BDB::flush;
3449 IO::AIO::flush;
3450 Coro::cede_notself;
3451 last unless IO::AIO::nreqs || BDB::nreqs; 3822 while (IO::AIO::nreqs || BDB::nreqs) {
3452 warn "iterate..."; 3823 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3453 }
3454
3455 ++$RELOAD;
3456
3457 warn "cancelling all extension coros";
3458 $_->cancel for values %EXT_CORO;
3459 %EXT_CORO = ();
3460
3461 warn "removing commands";
3462 %COMMAND = ();
3463
3464 warn "removing ext/exti commands";
3465 %EXTCMD = ();
3466 %EXTICMD = ();
3467
3468 warn "unloading/nuking all extensions";
3469 for my $pkg (@EXTS) {
3470 warn "... unloading $pkg";
3471
3472 if (my $cb = $pkg->can ("unload")) {
3473 eval {
3474 $cb->($pkg);
3475 1
3476 } or warn "$pkg unloaded, but with errors: $@";
3477 } 3824 }
3478 3825
3479 warn "... nuking $pkg"; 3826 warn "cancelling all extension coros";
3480 Symbol::delete_package $pkg; 3827 $_->cancel for values %EXT_CORO;
3481 } 3828 %EXT_CORO = ();
3482 3829
3483 warn "unloading all perl modules loaded from $LIBDIR"; 3830 warn "removing commands";
3484 while (my ($k, $v) = each %INC) { 3831 %COMMAND = ();
3485 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3486 3832
3833 warn "removing ext/exti commands";
3834 %EXTCMD = ();
3835 %EXTICMD = ();
3836
3837 warn "unloading/nuking all extensions";
3838 for my $pkg (@EXTS) {
3487 warn "... unloading $k"; 3839 warn "... unloading $pkg";
3488 delete $INC{$k};
3489 3840
3490 $k =~ s/\.pm$//;
3491 $k =~ s/\//::/g;
3492
3493 if (my $cb = $k->can ("unload_module")) { 3841 if (my $cb = $pkg->can ("unload")) {
3842 eval {
3494 $cb->(); 3843 $cb->($pkg);
3844 1
3845 } or warn "$pkg unloaded, but with errors: $@";
3846 }
3847
3848 warn "... clearing $pkg";
3849 clear_package $pkg;
3495 } 3850 }
3496 3851
3497 Symbol::delete_package $k; 3852 warn "unloading all perl modules loaded from $LIBDIR";
3853 while (my ($k, $v) = each %INC) {
3854 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3855
3856 warn "... unloading $k";
3857 delete $INC{$k};
3858
3859 $k =~ s/\.pm$//;
3860 $k =~ s/\//::/g;
3861
3862 if (my $cb = $k->can ("unload_module")) {
3863 $cb->();
3864 }
3865
3866 clear_package $k;
3498 } 3867 }
3499 3868
3500 warn "getting rid of safe::, as good as possible"; 3869 warn "getting rid of safe::, as good as possible";
3501 Symbol::delete_package "safe::$_" 3870 clear_package "safe::$_"
3502 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3871 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3503 3872
3504 warn "unloading cf.pm \"a bit\""; 3873 warn "unloading cf.pm \"a bit\"";
3505 delete $INC{"cf.pm"}; 3874 delete $INC{"cf.pm"};
3506 delete $INC{"cf/pod.pm"}; 3875 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3507 3876
3508 # don't, removes xs symbols, too, 3877 # don't, removes xs symbols, too,
3509 # and global variables created in xs 3878 # and global variables created in xs
3510 #Symbol::delete_package __PACKAGE__; 3879 #clear_package __PACKAGE__;
3511 3880
3512 warn "unload completed, starting to reload now"; 3881 warn "unload completed, starting to reload now";
3513 3882
3514 warn "reloading cf.pm"; 3883 warn "reloading cf.pm";
3515 require cf; 3884 require cf;
3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3885 cf::_connect_to_perl_1;
3517 3886
3518 warn "loading config and database again"; 3887 warn "loading config and database again";
3519 cf::reload_config; 3888 cf::reload_config;
3520 3889
3521 warn "loading extensions"; 3890 warn "loading extensions";
3522 cf::load_extensions; 3891 cf::load_extensions;
3523 3892
3893 if ($REATTACH_ON_RELOAD) {
3524 warn "reattaching attachments to objects/players"; 3894 warn "reattaching attachments to objects/players";
3525 _global_reattach; # objects, sockets 3895 _global_reattach; # objects, sockets
3526 warn "reattaching attachments to maps"; 3896 warn "reattaching attachments to maps";
3527 reattach $_ for values %MAP; 3897 reattach $_ for values %MAP;
3528 warn "reattaching attachments to players"; 3898 warn "reattaching attachments to players";
3529 reattach $_ for values %PLAYER; 3899 reattach $_ for values %PLAYER;
3900 }
3530 3901
3902 warn "running post_init jobs";
3903 (pop @POST_INIT)->(1) while @POST_INIT;
3904
3531 warn "leaving sync_job"; 3905 warn "leaving sync_job";
3532 3906
3533 1 3907 1
3534 } or do { 3908 } or do {
3535 warn $@; 3909 warn $@;
3536 warn "error while reloading, exiting."; 3910 cf::cleanup "error while reloading, exiting.";
3537 exit 1;
3538 }; 3911 };
3539 3912
3540 warn "reloaded"; 3913 warn "reloaded";
3914 --$RELOAD;
3915 }
3916
3917 $t1 = AE::time - $t1;
3918 warn "reload completed in ${t1}s\n";
3541}; 3919};
3542 3920
3543our $RELOAD_WATCHER; # used only during reload 3921our $RELOAD_WATCHER; # used only during reload
3544 3922
3545sub reload_perl() { 3923sub reload_perl() {
3546 # doing reload synchronously and two reloads happen back-to-back, 3924 # doing reload synchronously and two reloads happen back-to-back,
3547 # coro crashes during coro_state_free->destroy here. 3925 # coro crashes during coro_state_free->destroy here.
3548 3926
3549 $RELOAD_WATCHER ||= Event->timer ( 3927 $RELOAD_WATCHER ||= cf::async {
3550 reentrant => 0, 3928 Coro::AIO::aio_wait cache_extensions;
3551 after => 0, 3929
3552 data => WF_AUTOCANCEL, 3930 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3553 cb => sub {
3554 do_reload_perl; 3931 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3932 undef $RELOAD_WATCHER;
3556 }, 3933 };
3557 ); 3934 };
3558} 3935}
3559 3936
3560register_command "reload" => sub { 3937register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3938 my ($who, $arg) = @_;
3562 3939
3575 3952
3576our @WAIT_FOR_TICK; 3953our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3954our @WAIT_FOR_TICK_BEGIN;
3578 3955
3579sub wait_for_tick { 3956sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3957 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3582 3958
3583 my $signal = new Coro::Signal; 3959 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3960 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3961 $signal->wait;
3586} 3962}
3587 3963
3588sub wait_for_tick_begin { 3964sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3591 3966
3592 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3968 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3969 $signal->wait;
3595} 3970}
3596 3971
3597$TICK_WATCHER = Event->timer ( 3972sub tick {
3598 reentrant => 0,
3599 parked => 1,
3600 prio => 0,
3601 at => $NEXT_TICK || $TICK,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 if ($Coro::current != $Coro::main) { 3973 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3974 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 3975 unless ++$bug_warning > 10;
3607 return; 3976 return;
3608 } 3977 }
3609 3978
3610 $NOW = $tick_start = Event::time;
3611
3612 cf::server_tick; # one server iteration 3979 cf::server_tick; # one server iteration
3613 3980
3614 $RUNTIME += $TICK; 3981 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3615 $NEXT_TICK += $TICK;
3616 3982
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3983 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = $NOW + 10; 3984 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3985 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3986 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3987 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3988 or warn "ERROR: unable to write runtime file: $!";
3623 };
3624 } 3989 };
3990 }
3625 3991
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3992 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627 $sig->send; 3993 $sig->send;
3628 } 3994 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3995 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3996 $sig->send;
3631 } 3997 }
3632 3998
3633 $NOW = Event::time; 3999 $LOAD = ($NOW - $TICK_START) / $TICK;
3634
3635 # if we are delayed by four ticks or more, skip them all
3636 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3637
3638 $TICK_WATCHER->at ($NEXT_TICK);
3639 $TICK_WATCHER->start;
3640
3641 $LOAD = ($NOW - $tick_start) / $TICK;
3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4000 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643 4001
3644 _post_tick; 4002 if (0) {
4003 if ($NEXT_TICK) {
4004 my $jitter = $TICK_START - $NEXT_TICK;
4005 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4006 warn "jitter $JITTER\n";#d#
4007 }
3645 }, 4008 }
3646); 4009}
3647 4010
3648{ 4011{
4012 # configure BDB
4013
3649 BDB::min_parallel 8; 4014 BDB::min_parallel 16;
3650 BDB::max_poll_time $TICK * 0.1; 4015 BDB::max_poll_reqs $TICK * 0.1;
3651 $BDB_POLL_WATCHER = Event->io ( 4016 $AnyEvent::BDB::WATCHER->priority (1);
3652 reentrant => 0,
3653 fd => BDB::poll_fileno,
3654 poll => 'r',
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => \&BDB::poll_cb,
3658 );
3659
3660 BDB::set_sync_prepare {
3661 my $status;
3662 my $current = $Coro::current;
3663 (
3664 sub {
3665 $status = $!;
3666 $current->ready; undef $current;
3667 },
3668 sub {
3669 Coro::schedule while defined $current;
3670 $! = $status;
3671 },
3672 )
3673 };
3674 4017
3675 unless ($DB_ENV) { 4018 unless ($DB_ENV) {
3676 $DB_ENV = BDB::db_env_create; 4019 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4020 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3678 | BDB::LOG_AUTOREMOVE, 1); 4021 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4022 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4023 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4024 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3681 4025
3682 cf::sync_job { 4026 cf::sync_job {
3683 eval { 4027 eval {
3693 4037
3694 cf::cleanup "db_env_open(db): $@" if $@; 4038 cf::cleanup "db_env_open(db): $@" if $@;
3695 }; 4039 };
3696 } 4040 }
3697 4041
3698 $BDB_DEADLOCK_WATCHER = Event->timer ( 4042 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4043 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 ); 4044 };
3708 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4045 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4046 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 ); 4047 };
3718 $BDB_TRICKLE_WATCHER = Event->timer ( 4048 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4049 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 ); 4050 };
3728} 4051}
3729 4052
3730{ 4053{
4054 # configure IO::AIO
4055
3731 IO::AIO::min_parallel 8; 4056 IO::AIO::min_parallel 8;
3732
3733 undef $Coro::AIO::WATCHER;
3734 IO::AIO::max_poll_time $TICK * 0.1; 4057 IO::AIO::max_poll_time $TICK * 0.1;
3735 $AIO_POLL_WATCHER = Event->io ( 4058 undef $AnyEvent::AIO::WATCHER;
3736 reentrant => 0,
3737 data => WF_AUTOCANCEL,
3738 fd => IO::AIO::poll_fileno,
3739 poll => 'r',
3740 prio => 0,
3741 cb => \&IO::AIO::poll_cb,
3742 );
3743} 4059}
3744 4060
3745my $_log_backtrace; 4061my $_log_backtrace;
3746 4062
3747sub _log_backtrace { 4063sub _log_backtrace {
3750 $msg =~ s/\n//; 4066 $msg =~ s/\n//;
3751 4067
3752 # limit the # of concurrent backtraces 4068 # limit the # of concurrent backtraces
3753 if ($_log_backtrace < 2) { 4069 if ($_log_backtrace < 2) {
3754 ++$_log_backtrace; 4070 ++$_log_backtrace;
4071 my $perl_bt = Carp::longmess $msg;
3755 async { 4072 async {
3756 $Coro::current->{desc} = "abt $msg"; 4073 $Coro::current->{desc} = "abt $msg";
3757 4074
3758 my @bt = fork_call { 4075 my @bt = fork_call {
3759 @addr = map { sprintf "%x", $_ } @addr; 4076 @addr = map { sprintf "%x", $_ } @addr;
3770 } 4087 }
3771 4088
3772 @funcs 4089 @funcs
3773 }; 4090 };
3774 4091
3775 LOG llevInfo, "[ABT] $msg\n"; 4092 LOG llevInfo, "[ABT] $perl_bt\n";
4093 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3776 LOG llevInfo, "[ABT] $_\n" for @bt; 4094 LOG llevInfo, "[ABT] $_\n" for @bt;
3777 --$_log_backtrace; 4095 --$_log_backtrace;
3778 }; 4096 };
3779 } else { 4097 } else {
3780 LOG llevInfo, "[ABT] $msg\n"; 4098 LOG llevInfo, "[ABT] $msg\n";
3781 LOG llevInfo, "[ABT] [suppressed]\n"; 4099 LOG llevInfo, "[ABT] [suppressed]\n";
3782 } 4100 }
3783} 4101}
3784 4102
3785# load additional modules 4103# load additional modules
3786use cf::pod; 4104require "cf/$_.pm" for @EXTRA_MODULES;
4105cf::_connect_to_perl_2;
3787 4106
3788END { cf::emergency_save } 4107END { cf::emergency_save }
3789 4108
37901 41091
3791 4110

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines