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.377 by root, Thu Oct 4 11:36:38 2007 UTC vs.
Revision 1.513 by root, Mon Apr 12 05:22:38 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 Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 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.32 (); 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 timer.
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;
406 490
407BEGIN { *async = \&Coro::async_pool } 491BEGIN { *async = \&Coro::async_pool }
408 492
409=item cf::sync_job { BLOCK } 493=item cf::sync_job { BLOCK }
410 494
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 495The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 496is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 497partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 498acceptable.
415 499
416If it must be done, put the blocking parts into C<sync_job>. This will run 500If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 501the given BLOCK in another coroutine while waiting for the result. The
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 # TODO: use suspend/resume instead 516 LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 517
434 my $freeze_guard = freeze_mainloop; 518 my $freeze_guard = freeze_mainloop;
435 519
436 my $busy = 1; 520 my $busy = 1;
437 my @res; 521 my @res;
438 522
442 warn $@ if $@; 526 warn $@ if $@;
443 undef $busy; 527 undef $busy;
444 })->prio (Coro::PRIO_MAX); 528 })->prio (Coro::PRIO_MAX);
445 529
446 while ($busy) { 530 while ($busy) {
447 Coro::cede or Event::one_event; 531 if (Coro::nready) {
532 Coro::cede_notself;
533 } else {
534 EV::loop EV::LOOP_ONESHOT;
448 } 535 }
536 }
449 537
450 $time = Event::time - $time; 538 my $time = AE::time - $time;
451 539
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
456 541
457 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
458 } else { 543 } else {
459 # we are in another coroutine, how wonderful, everything just works 544 # we are in another coroutine, how wonderful, everything just works
460 545
485=item fork_call { }, $args 570=item fork_call { }, $args
486 571
487Executes the given code block with the given arguments in a seperate 572Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 573process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 574Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 575never block itself or use any form of event handling.
491 576
492=cut 577=cut
493 578
494sub fork_call(&@) { 579sub fork_call(&@) {
495 my ($cb, @args) = @_; 580 my ($cb, @args) = @_;
502 reset_signals; 587 reset_signals;
503 &$cb 588 &$cb
504 }, @args; 589 }, @args;
505 590
506 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594=item $coin = coin_from_name $name
595
596=cut
597
598our %coin_alias = (
599 "silver" => "silvercoin",
600 "silvercoin" => "silvercoin",
601 "silvercoins" => "silvercoin",
602 "gold" => "goldcoin",
603 "goldcoin" => "goldcoin",
604 "goldcoins" => "goldcoin",
605 "platinum" => "platinacoin",
606 "platinumcoin" => "platinacoin",
607 "platinumcoins" => "platinacoin",
608 "platina" => "platinacoin",
609 "platinacoin" => "platinacoin",
610 "platinacoins" => "platinacoin",
611 "royalty" => "royalty",
612 "royalties" => "royalty",
613);
614
615sub coin_from_name($) {
616 $coin_alias{$_[0]}
617 ? cf::arch::find $coin_alias{$_[0]}
618 : undef
507} 619}
508 620
509=item $value = cf::db_get $family => $key 621=item $value = cf::db_get $family => $key
510 622
511Returns a single value from the environment database. 623Returns a single value from the environment database.
650 762
651############################################################################# 763#############################################################################
652 764
653=head2 ATTACHABLE OBJECTS 765=head2 ATTACHABLE OBJECTS
654 766
655Many objects in crossfire are so-called attachable objects. That means you can 767Many objects in deliantra are so-called attachable objects. That means you can
656attach callbacks/event handlers (a collection of which is called an "attachment") 768attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 769to it. All such attachable objects support the following methods.
658 770
659In the following description, CLASS can be any of C<global>, C<object> 771In the following description, CLASS can be any of C<global>, C<object>
660C<player>, C<client> or C<map> (i.e. the attachable objects in 772C<player>, C<client> or C<map> (i.e. the attachable objects in
661Crossfire TRT). 773Deliantra).
662 774
663=over 4 775=over 4
664 776
665=item $attachable->attach ($attachment, key => $value...) 777=item $attachable->attach ($attachment, key => $value...)
666 778
710=item cf::CLASS::attachment $name, ... 822=item cf::CLASS::attachment $name, ...
711 823
712Register an attachment by C<$name> through which attachable objects of the 824Register an attachment by C<$name> through which attachable objects of the
713given CLASS can refer to this attachment. 825given CLASS can refer to this attachment.
714 826
715Some classes such as crossfire maps and objects can specify attachments 827Some classes such as deliantra maps and objects can specify attachments
716that are attached at load/instantiate time, thus the need for a name. 828that are attached at load/instantiate time, thus the need for a name.
717 829
718These calls expect any number of the following handler/hook descriptions: 830These calls expect any number of the following handler/hook descriptions:
719 831
720=over 4 832=over 4
948 } 1060 }
949 1061
950 0 1062 0
951} 1063}
952 1064
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1065=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1066
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1067=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1068
957Generate an object-specific event with the given arguments. 1069Generate an object-specific event with the given arguments.
958 1070
964 1076
965=cut 1077=cut
966 1078
967############################################################################# 1079#############################################################################
968# object support 1080# object support
969#
970 1081
1082sub _object_equal($$);
1083sub _object_equal($$) {
1084 my ($a, $b) = @_;
1085
1086 return 0 unless (ref $a) eq (ref $b);
1087
1088 if ("HASH" eq ref $a) {
1089 my @ka = keys %$a;
1090 my @kb = keys %$b;
1091
1092 return 0 if @ka != @kb;
1093
1094 for (0 .. $#ka) {
1095 return 0 unless $ka[$_] eq $kb[$_];
1096 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1097 }
1098
1099 } elsif ("ARRAY" eq ref $a) {
1100
1101 return 0 if @$a != @$b;
1102
1103 for (0 .. $#$a) {
1104 return 0 unless _object_equal $a->[$_], $b->[$_];
1105 }
1106
1107 } elsif ($a ne $b) {
1108 return 0;
1109 }
1110
1111 1
1112}
1113
1114our $SLOW_MERGES;#d#
971sub _can_merge { 1115sub _can_merge {
972 my ($ob1, $ob2) = @_; 1116 my ($ob1, $ob2) = @_;
973 1117
974 local $Storable::canonical = 1; 1118 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1119
978 $fob1 eq $fob2 1120 # we do the slow way here
1121 return _object_equal $ob1, $ob2
979} 1122}
980 1123
981sub reattach { 1124sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1125 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1126 my ($obj) = @_;
984 1127
1128 # no longer needed after getting rid of delete_package?
985 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1129 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
986 1130
987 my $registry = $obj->registry; 1131 my $registry = $obj->registry;
988 1132
989 @$registry = (); 1133 @$registry = ();
990 1134
1005cf::attachable->attach ( 1149cf::attachable->attach (
1006 prio => -1000000, 1150 prio => -1000000,
1007 on_instantiate => sub { 1151 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1152 my ($obj, $data) = @_;
1009 1153
1010 $data = from_json $data; 1154 $data = decode_json $data;
1011 1155
1012 for (@$data) { 1156 for (@$data) {
1013 my ($name, $args) = @$_; 1157 my ($name, $args) = @$_;
1014 1158
1015 $obj->attach ($name, %{$args || {} }); 1159 $obj->attach ($name, %{$args || {} });
1036 utf8::decode (my $decname = $filename); 1180 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1181 warn sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1182 $decname, length $$rdata, scalar @$objs;
1039 1183
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1189 aio_fsync $fh;
1190 }
1044 close $fh; 1191 aio_close $fh;
1045 1192
1046 if (@$objs) { 1193 if (@$objs) {
1047 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1194 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1195 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1196 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1197 aio_write $fh, 0, (length $data), $data, 0;
1051 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 }
1052 close $fh; 1202 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1203 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1204 }
1055 } else { 1205 } else {
1056 aio_unlink "$filename.pst"; 1206 aio_unlink "$filename.pst";
1057 } 1207 }
1058 1208
1059 aio_rename "$filename~", $filename; 1209 aio_rename "$filename~", $filename;
1210
1211 $filename =~ s%/[^/]+$%%;
1212 aio_pathsync $filename if $cf::USE_FSYNC;
1060 } else { 1213 } else {
1061 warn "FATAL: $filename~: $!\n"; 1214 warn "unable to save objects: $filename~: $!\n";
1062 } 1215 }
1063 } else { 1216 } else {
1064 aio_unlink $filename; 1217 aio_unlink $filename;
1065 aio_unlink "$filename.pst"; 1218 aio_unlink "$filename.pst";
1066 } 1219 }
1085 1238
1086 unless (aio_stat "$filename.pst") { 1239 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1240 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1241 or return;
1089 1242
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1243 my $st = eval { Coro::Storable::thaw $av };
1244 $av = $st->{objs};
1091 } 1245 }
1092 1246
1093 utf8::decode (my $decname = $filename); 1247 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1248 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1249 $decname, length $data, scalar @{$av || []};
1156 my ($name, $cb) = @_; 1310 my ($name, $cb) = @_;
1157 1311
1158 $EXTICMD{$name} = $cb; 1312 $EXTICMD{$name} = $cb;
1159} 1313}
1160 1314
1315use File::Glob ();
1316
1161cf::player->attach ( 1317cf::player->attach (
1162 on_command => sub { 1318 on_unknown_command => sub {
1163 my ($pl, $name, $params) = @_; 1319 my ($pl, $name, $params) = @_;
1164 1320
1165 my $cb = $COMMAND{$name} 1321 my $cb = $COMMAND{$name}
1166 or return; 1322 or return;
1167 1323
1197 1353
1198 cf::override; 1354 cf::override;
1199 }, 1355 },
1200); 1356);
1201 1357
1358# "readahead" all extensions
1359sub cache_extensions {
1360 my $grp = IO::AIO::aio_group;
1361
1362 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1363 for (grep /\.ext$/, @{$_[0]}) {
1364 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1365 }
1366 };
1367
1368 $grp
1369}
1370
1202sub load_extensions { 1371sub load_extensions {
1203 cf::sync_job { 1372 cf::sync_job {
1204 my %todo; 1373 my %todo;
1205 1374
1206 for my $path (<$LIBDIR/*.ext>) { 1375 for my $path (<$LIBDIR/*.ext>) {
1225 1394
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1395 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1396 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228 1397
1229 $ext{source} = 1398 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n" 1399 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1231 . "#line 1 \"$path\"\n{\n" 1400 . "#line 1 \"$path\"\n{\n"
1232 . $source 1401 . $source
1233 . "\n};\n1"; 1402 . "\n};\n1";
1234 1403
1235 $todo{$base} = \%ext; 1404 $todo{$base} = \%ext;
1236 } 1405 }
1237 1406
1407 my $pass = 0;
1238 my %done; 1408 my %done;
1239 while (%todo) { 1409 while (%todo) {
1240 my $progress; 1410 my $progress;
1241 1411
1412 ++$pass;
1413
1414 ext:
1242 while (my ($k, $v) = each %todo) { 1415 while (my ($k, $v) = each %todo) {
1243 for (split /,\s*/, $v->{meta}{depends}) { 1416 for (split /,\s*/, $v->{meta}{depends}) {
1244 goto skip 1417 next ext
1245 unless exists $done{$_}; 1418 unless exists $done{$_};
1246 } 1419 }
1247 1420
1248 warn "... loading '$k' into '$v->{pkg}'\n"; 1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1249 1422
1250 unless (eval $v->{source}) { 1423 my $active = eval $v->{source};
1424
1425 if (length $@) {
1251 my $msg = $@ ? "$v->{path}: $@\n" 1426 warn "$v->{path}: $@\n";
1252 : "$v->{base}: extension inactive.\n";
1253 1427
1428 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1254 if (exists $v->{meta}{mandatory}) { 1429 if exists $v->{meta}{mandatory};
1255 warn $msg; 1430 } else {
1256 warn "mandatory extension failed to load, exiting.\n"; 1431 $done{$k} = delete $todo{$k};
1257 exit 1; 1432 push @EXTS, $v->{pkg};
1258 } 1433 $progress = 1;
1259 1434
1260 warn $msg; 1435 warn "$v->{base}: extension inactive.\n"
1436 unless $active;
1261 } 1437 }
1262
1263 $done{$k} = delete $todo{$k};
1264 push @EXTS, $v->{pkg};
1265 $progress = 1;
1266 } 1438 }
1267 1439
1268 skip: 1440 unless ($progress) {
1269 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1441 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1270 unless $progress; 1442
1443 while (my ($k, $v) = each %todo) {
1444 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445 if exists $v->{meta}{mandatory};
1446 }
1447 }
1271 } 1448 }
1272 }; 1449 };
1273} 1450}
1274 1451
1275############################################################################# 1452#############################################################################
1276 1453
1277=back 1454=back
1278 1455
1279=head2 CORE EXTENSIONS 1456=head2 CORE EXTENSIONS
1280 1457
1281Functions and methods that extend core crossfire objects. 1458Functions and methods that extend core deliantra objects.
1282 1459
1283=cut 1460=cut
1284 1461
1285package cf::player; 1462package cf::player;
1286 1463
1329 1506
1330sub exists($) { 1507sub exists($) {
1331 my ($login) = @_; 1508 my ($login) = @_;
1332 1509
1333 $cf::PLAYER{$login} 1510 $cf::PLAYER{$login}
1334 or cf::sync_job { !aio_stat path $login } 1511 or !aio_stat path $login
1335} 1512}
1336 1513
1337sub find($) { 1514sub find($) {
1338 return $cf::PLAYER{$_[0]} || do { 1515 return $cf::PLAYER{$_[0]} || do {
1339 my $login = $_[0]; 1516 my $login = $_[0];
1351 my $f = new_from_file cf::object::thawer path $login 1528 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1529 or return;
1353 1530
1354 my $pl = cf::player::load_pl $f 1531 my $pl = cf::player::load_pl $f
1355 or return; 1532 or return;
1533
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1534 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1535 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1536 $cf::PLAYER{$login} = $pl
1359 } 1537 }
1360 } 1538 }
1361} 1539}
1362 1540
1541cf::player->attach (
1542 on_load => sub {
1543 my ($pl, $path) = @_;
1544
1545 # restore slots saved in save, below
1546 my $slots = delete $pl->{_slots};
1547
1548 $pl->ob->current_weapon ($slots->[0]);
1549 $pl->combat_ob ($slots->[1]);
1550 $pl->ranged_ob ($slots->[2]);
1551 },
1552);
1553
1363sub save($) { 1554sub save($) {
1364 my ($pl) = @_; 1555 my ($pl) = @_;
1365 1556
1366 return if $pl->{deny_save}; 1557 return if $pl->{deny_save};
1367 1558
1370 1561
1371 return if $pl->{deny_save}; 1562 return if $pl->{deny_save};
1372 1563
1373 aio_mkdir playerdir $pl, 0770; 1564 aio_mkdir playerdir $pl, 0770;
1374 $pl->{last_save} = $cf::RUNTIME; 1565 $pl->{last_save} = $cf::RUNTIME;
1566
1567 cf::get_slot 0.01;
1568
1569 # save slots, to be restored later
1570 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1375 1571
1376 $pl->save_pl ($path); 1572 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1573 cf::cede_to_tick;
1378} 1574}
1379 1575
1411 my ($pl) = @_; 1607 my ($pl) = @_;
1412 1608
1413 my $name = $pl->ob->name; 1609 my $name = $pl->ob->name;
1414 1610
1415 $pl->{deny_save} = 1; 1611 $pl->{deny_save} = 1;
1416 $pl->password ("*"); # this should lock out the player until we nuked the dir 1612 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1417 1613
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1614 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1419 $pl->deactivate; 1615 $pl->deactivate;
1616 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1617 $pl->ob->check_score;
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1618 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1421 $pl->ns->destroy if $pl->ns; 1619 $pl->ns->destroy if $pl->ns;
1422 1620
1423 my $path = playerdir $pl; 1621 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1622 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 1661
1464 for my $login (@$dirs) { 1662 for my $login (@$dirs) {
1465 my $path = path $login; 1663 my $path = path $login;
1466 1664
1467 # a .pst is a dead give-away for a valid player 1665 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1666 # if no pst file found, open and chekc for blocked users
1667 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1668 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1669 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1670 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1671 }
1473 1672
1504 } 1703 }
1505 1704
1506 \@paths 1705 \@paths
1507} 1706}
1508 1707
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1708=item $protocol_xml = $player->expand_cfpod ($cfpod)
1510 1709
1511Expand crossfire pod fragments into protocol xml. 1710Expand deliantra pod fragments into protocol xml.
1512
1513=cut
1514
1515sub expand_cfpod {
1516 ((my $self), (local $_)) = @_;
1517
1518 # escape & and <
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521
1522 # this is buggy, it needs to properly take care of nested <'s
1523
1524 1 while
1525 # replace B<>, I<>, U<> etc.
1526 s/B<([^\>]*)>/<b>$1<\/b>/
1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1530 # replace G<male|female> tags
1531 || s{G<([^>|]*)\|([^>]*)>}{
1532 $self->gender ? $2 : $1
1533 }ge
1534 # replace H<hint text>
1535 || s{H<([^\>]*)>}
1536 {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "")
1540 [$self->{hintmode}]
1541 }ge;
1542
1543 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553}
1554
1555sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode}
1558}
1559 1711
1560=item $player->ext_reply ($msgid, @msg) 1712=item $player->ext_reply ($msgid, @msg)
1561 1713
1562Sends an ext reply to the player. 1714Sends an ext reply to the player.
1563 1715
1630our $MAX_RESET = 3600; 1782our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 1783our $DEFAULT_RESET = 3000;
1632 1784
1633sub generate_random_map { 1785sub generate_random_map {
1634 my ($self, $rmp) = @_; 1786 my ($self, $rmp) = @_;
1787
1788 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1789
1635 # mit "rum" bekleckern, nicht 1790 # mit "rum" bekleckern, nicht
1636 $self->_create_random_map ( 1791 $self->_create_random_map (
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1640 $rmp->{exit_on_final_map}, 1795 $rmp->{exit_on_final_map},
1641 $rmp->{xsize}, $rmp->{ysize}, 1796 $rmp->{xsize}, $rmp->{ysize},
1642 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1643 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1761 1916
1762# the temporary/swap location 1917# the temporary/swap location
1763sub save_path { 1918sub save_path {
1764 my ($self) = @_; 1919 my ($self) = @_;
1765 1920
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1921 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 1922 "$TMPDIR/$path.map"
1768} 1923}
1769 1924
1770# the unique path, undef == no special unique path 1925# the unique path, undef == no special unique path
1771sub uniq_path { 1926sub uniq_path {
1772 my ($self) = @_; 1927 my ($self) = @_;
1773 1928
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1929 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 1930 "$UNIQUEDIR/$path"
1776}
1777
1778# and all this just because we cannot iterate over
1779# all maps in C++...
1780sub change_all_map_light {
1781 my ($change) = @_;
1782
1783 $_->change_map_light ($change)
1784 for grep $_->outdoor, values %cf::MAP;
1785} 1931}
1786 1932
1787sub decay_objects { 1933sub decay_objects {
1788 my ($self) = @_; 1934 my ($self) = @_;
1789 1935
1873sub find { 2019sub find {
1874 my ($path, $origin) = @_; 2020 my ($path, $origin) = @_;
1875 2021
1876 $path = normalise $path, $origin && $origin->path; 2022 $path = normalise $path, $origin && $origin->path;
1877 2023
1878 cf::lock_wait "map_data:$path";#d#remove 2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 2025 my $guard2 = cf::lock_acquire "map_find:$path";
1880 2026
1881 $cf::MAP{$path} || do { 2027 $cf::MAP{$path} || do {
1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1885 my $map = new_from_path cf::map $path 2028 my $map = new_from_path cf::map $path
1886 or return; 2029 or return;
1887 2030
1888 $map->{last_save} = $cf::RUNTIME; 2031 $map->{last_save} = $cf::RUNTIME;
1889 2032
1891 or return; 2034 or return;
1892 2035
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2036 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 2037 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 2038 #$cf::WAIT_FOR_TICK->wait;
2039 undef $guard2;
1896 undef $guard1; 2040 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 2041 $map->reset;
1899 return find $path; 2042 return find $path;
1900 } 2043 }
1901 2044
1902 $cf::MAP{$path} = $map 2045 $cf::MAP{$path} = $map
1903 } 2046 }
1904} 2047}
1905 2048
1906sub pre_load { } 2049sub pre_load { }
1907sub post_load { } 2050#sub post_load { } # XS
1908 2051
1909sub load { 2052sub load {
1910 my ($self) = @_; 2053 my ($self) = @_;
1911 2054
1912 local $self->{deny_reset} = 1; # loading can take a long time 2055 local $self->{deny_reset} = 1; # loading can take a long time
1929 my $f = new_from_file cf::object::thawer $self->{load_path}; 2072 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block; 2073 $f->skip_block;
1931 $self->_load_objects ($f) 2074 $self->_load_objects ($f)
1932 or return; 2075 or return;
1933 2076
1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2077 $self->post_load_original
1935 if delete $self->{load_original}; 2078 if delete $self->{load_original};
1936 2079
1937 if (my $uniq = $self->uniq_path) { 2080 if (my $uniq = $self->uniq_path) {
1938 utf8::encode $uniq; 2081 utf8::encode $uniq;
1939 unless (aio_stat $uniq) { 2082 unless (aio_stat $uniq) {
1957 unless ($self->{deny_activate}) { 2100 unless ($self->{deny_activate}) {
1958 $self->decay_objects; 2101 $self->decay_objects;
1959 $self->fix_auto_apply; 2102 $self->fix_auto_apply;
1960 $self->update_buttons; 2103 $self->update_buttons;
1961 cf::cede_to_tick; 2104 cf::cede_to_tick;
1962 $self->set_darkness_map;
1963 cf::cede_to_tick;
1964 $self->activate; 2105 $self->activate;
1965 } 2106 }
1966 2107
1967 $self->{last_save} = $cf::RUNTIME; 2108 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2109 $self->last_access ($cf::RUNTIME);
1969 2110
1970 $self->in_memory (cf::MAP_IN_MEMORY); 2111 $self->in_memory (cf::MAP_ACTIVE);
1971 } 2112 }
1972 2113
1973 $self->post_load; 2114 $self->post_load;
1974} 2115}
1975 2116
2117# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath
1976sub customise_for { 2120sub customise_for {
1977 my ($self, $ob) = @_; 2121 my ($self, $ob) = @_;
1978 2122
1979 return find "~" . $ob->name . "/" . $self->{path} 2123 return find "~" . $ob->name . "/" . $self->{path}
1980 if $self->per_player; 2124 if $self->per_player;
2033 my ($path, $origin, $load) = @_; 2177 my ($path, $origin, $load) = @_;
2034 2178
2035 $path = normalise $path, $origin && $origin->{path}; 2179 $path = normalise $path, $origin && $origin->{path};
2036 2180
2037 if (my $map = $cf::MAP{$path}) { 2181 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2182 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2039 } 2183 }
2040 2184
2041 $MAP_PREFETCH{$path} |= $load; 2185 $MAP_PREFETCH{$path} |= $load;
2042 2186
2043 $MAP_PREFETCHER ||= cf::async { 2187 $MAP_PREFETCHER ||= cf::async {
2080 cf::async { 2224 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2225 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2226 $_->contr->save for $self->players;
2083 }; 2227 };
2084 2228
2229 cf::get_slot 0.02;
2230
2085 if ($uniq) { 2231 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2233 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2234 } else {
2089 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2235 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2097 $self->save; 2243 $self->save;
2098 2244
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2246
2101 return if $self->players; 2247 return if $self->players;
2102 return if $self->in_memory != cf::MAP_IN_MEMORY; 2248 return if $self->in_memory != cf::MAP_ACTIVE;
2103 return if $self->{deny_save}; 2249 return if $self->{deny_save};
2104 2250
2105 $self->in_memory (cf::MAP_SWAPPED); 2251 $self->in_memory (cf::MAP_SWAPPED);
2106 2252
2107 $self->deactivate; 2253 $self->deactivate;
2132 2278
2133 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2134 2280
2135 return if $self->players; 2281 return if $self->players;
2136 2282
2137 warn "resetting map ", $self->path; 2283 warn "resetting map ", $self->path, "\n";
2138 2284
2139 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2140 2286
2141 # need to save uniques path 2287 # need to save uniques path
2142 unless ($self->{deny_save}) { 2288 unless ($self->{deny_save}) {
2225 2371
2226sub unique_maps() { 2372sub unique_maps() {
2227 [ 2373 [
2228 map { 2374 map {
2229 utf8::decode $_; 2375 utf8::decode $_;
2230 /\.map$/ 2376 s/\.map$//; # TODO future compatibility hack
2377 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2378 ? ()
2231 ? normalise $_ 2379 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2380 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2381 ]
2235} 2382}
2236 2383
2237package cf; 2384=item cf::map::static_maps
2385
2386Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2387file in the shared directory excluding F</styles> and F</editor>). May
2388block.
2389
2390=cut
2391
2392sub static_maps() {
2393 my @dirs = "";
2394 my @maps;
2395
2396 while (@dirs) {
2397 my $dir = shift @dirs;
2398
2399 next if $dir eq "/styles" || $dir eq "/editor";
2400
2401 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2402 or return;
2403
2404 for (@$files) {
2405 s/\.map$// or next;
2406 utf8::decode $_;
2407 push @maps, "$dir/$_";
2408 }
2409
2410 push @dirs, map "$dir/$_", @$dirs;
2411 }
2412
2413 \@maps
2414}
2238 2415
2239=back 2416=back
2240 2417
2241=head3 cf::object 2418=head3 cf::object
2242 2419
2246 2423
2247=over 4 2424=over 4
2248 2425
2249=item $ob->inv_recursive 2426=item $ob->inv_recursive
2250 2427
2251Returns the inventory of the object _and_ their inventories, recursively. 2428Returns the inventory of the object I<and> their inventories, recursively,
2429but I<not> the object itself.
2252 2430
2253=cut 2431=cut
2254 2432
2255sub inv_recursive_; 2433sub inv_recursive_;
2256sub inv_recursive_ { 2434sub inv_recursive_ {
2261 inv_recursive_ inv $_[0] 2439 inv_recursive_ inv $_[0]
2262} 2440}
2263 2441
2264=item $ref = $ob->ref 2442=item $ref = $ob->ref
2265 2443
2266creates and returns a persistent reference to an objetc that can be stored as a string. 2444Creates and returns a persistent reference to an object that can be stored as a string.
2267 2445
2268=item $ob = cf::object::deref ($refstring) 2446=item $ob = cf::object::deref ($refstring)
2269 2447
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2448returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block. 2449even if the object actually exists. May block.
2272 2450
2273=cut 2451=cut
2274 2452
2275sub deref { 2453sub deref {
2276 my ($ref) = @_; 2454 my ($ref) = @_;
2277
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280 2455
2281 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) { 2456 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2457 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2458 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2459 or return;
2306can be C<undef>. Does the right thing when the player is currently in a 2481can be C<undef>. Does the right thing when the player is currently in a
2307dialogue with the given NPC character. 2482dialogue with the given NPC character.
2308 2483
2309=cut 2484=cut
2310 2485
2486our $SAY_CHANNEL = {
2487 id => "say",
2488 title => "Map",
2489 reply => "say ",
2490 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2491};
2492
2493our $CHAT_CHANNEL = {
2494 id => "chat",
2495 title => "Chat",
2496 reply => "chat ",
2497 tooltip => "Player chat and shouts, global to the server.",
2498};
2499
2311# rough implementation of a future "reply" method that works 2500# rough implementation of a future "reply" method that works
2312# with dialog boxes. 2501# with dialog boxes.
2313#TODO: the first argument must go, split into a $npc->reply_to ( method 2502#TODO: the first argument must go, split into a $npc->reply_to ( method
2314sub cf::object::player::reply($$$;$) { 2503sub cf::object::player::reply($$$;$) {
2315 my ($self, $npc, $msg, $flags) = @_; 2504 my ($self, $npc, $msg, $flags) = @_;
2326 my $dialog = $pl->{npc_dialog}; 2515 my $dialog = $pl->{npc_dialog};
2327 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2516 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2328 2517
2329 } else { 2518 } else {
2330 $msg = $npc->name . " says: $msg" if $npc; 2519 $msg = $npc->name . " says: $msg" if $npc;
2331 $self->message ($msg, $flags); 2520 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2332 } 2521 }
2333 } 2522 }
2334} 2523}
2335 2524
2336=item $object->send_msg ($channel, $msg, $color, [extra...]) 2525=item $object->send_msg ($channel, $msg, $color, [extra...])
2361 2550
2362=item $player_object->enter_link 2551=item $player_object->enter_link
2363 2552
2364Freezes the player and moves him/her to a special map (C<{link}>). 2553Freezes the player and moves him/her to a special map (C<{link}>).
2365 2554
2366The player should be reasonably safe there for short amounts of time. You 2555The player should be reasonably safe there for short amounts of time (e.g.
2367I<MUST> call C<leave_link> as soon as possible, though. 2556for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2557though, as the palyer cannot control the character while it is on the link
2558map.
2368 2559
2369Will never block. 2560Will never block.
2370 2561
2371=item $player_object->leave_link ($map, $x, $y) 2562=item $player_object->leave_link ($map, $x, $y)
2372 2563
2424 ($x, $y) = (-1, -1) 2615 ($x, $y) = (-1, -1)
2425 unless (defined $x) && (defined $y); 2616 unless (defined $x) && (defined $y);
2426 2617
2427 # use -1 or undef as default coordinates, not 0, 0 2618 # use -1 or undef as default coordinates, not 0, 0
2428 ($x, $y) = ($map->enter_x, $map->enter_y) 2619 ($x, $y) = ($map->enter_x, $map->enter_y)
2429 if $x <=0 && $y <= 0; 2620 if $x <= 0 && $y <= 0;
2430 2621
2431 $map->load; 2622 $map->load;
2432 $map->load_neighbours; 2623 $map->load_neighbours;
2433 2624
2434 return unless $self->contr->active; 2625 return unless $self->contr->active;
2435 $self->activate_recursive;
2436 2626
2437 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2438 $self->enter_map ($map, $x, $y); 2628 $self->enter_map ($map, $x, $y);
2629
2630 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive;
2439} 2632}
2440 2633
2441=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2634=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2442 2635
2443Moves the player to the given map-path and coordinates by first freezing 2636Moves the player to the given map-path and coordinates by first freezing
2444her, loading and preparing them map, calling the provided $check callback 2637her, loading and preparing them map, calling the provided $check callback
2445that has to return the map if sucecssful, and then unfreezes the player on 2638that has to return the map if sucecssful, and then unfreezes the player on
2446the new (success) or old (failed) map position. In either case, $done will 2639the new (success) or old (failed) map position. In either case, $done will
2447be called at the end of this process. 2640be called at the end of this process.
2641
2642Note that $check will be called with a potentially non-loaded map, so if
2643it needs a loaded map it has to call C<< ->load >>.
2448 2644
2449=cut 2645=cut
2450 2646
2451our $GOTOGEN; 2647our $GOTOGEN;
2452 2648
2531} 2727}
2532 2728
2533sub prepare_random_map { 2729sub prepare_random_map {
2534 my ($exit) = @_; 2730 my ($exit) = @_;
2535 2731
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2732 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2733 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2734 # that depends on the exit object
2541 2735
2542 my $rmp = parse_random_map_params $exit->msg; 2736 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2738 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2739 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2740 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2741 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2742 $rmp->{origin_y} = $exit->y;
2743
2744 $exit->map->touch;
2549 } 2745 }
2550 2746
2551 $rmp->{random_seed} ||= $exit->random_seed; 2747 $rmp->{random_seed} ||= $exit->random_seed;
2552 2748
2553 my $data = cf::to_json $rmp; 2749 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2750 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2751 my $meta = "$RANDOMDIR/$md5.meta";
2556 2752
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2753 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2754 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2755 undef $fh;
2560 aio_rename "$meta~", $meta; 2756 aio_rename "$meta~", $meta;
2561 2757
2758 my $slaying = "?random/$md5";
2759
2760 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2761 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2762 $exit->msg (undef);
2763 }
2564 } 2764 }
2565} 2765}
2566 2766
2567sub cf::object::player::enter_exit { 2767sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2768 my ($self, $exit) = @_;
2569 2769
2570 return unless $self->type == cf::PLAYER; 2770 return unless $self->type == cf::PLAYER;
2571 2771
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2772 $self->enter_link;
2584 2773
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2774 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2775 $Coro::current->{desc} = "enter_exit";
2591 2776
2592 $self->deactivate_recursive; # just to be sure
2593 unless (eval { 2777 unless (eval {
2778 $self->deactivate_recursive; # just to be sure
2779
2780 # random map handling
2781 {
2782 my $guard = cf::lock_acquire "exit_prepare:$exit";
2783
2784 prepare_random_map $exit
2785 if $exit->slaying eq "/!";
2786 }
2787
2788 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2789 my $x = $exit->stats->hp;
2790 my $y = $exit->stats->sp;
2791
2594 $self->goto ($slaying, $hp, $sp); 2792 $self->goto ($map, $x, $y);
2595 2793
2794 # if exit is damned, update players death & WoR home-position
2795 $self->contr->savebed ($map, $x, $y)
2796 if $exit->flag (cf::FLAG_DAMNED);
2797
2596 1; 2798 1
2597 }) { 2799 }) {
2598 $self->message ("Something went wrong deep within the crossfire server. " 2800 $self->message ("Something went wrong deep within the deliantra server. "
2599 . "I'll try to bring you back to the map you were before. " 2801 . "I'll try to bring you back to the map you were before. "
2600 . "Please report this to the dungeon master!", 2802 . "Please report this to the dungeon master!",
2601 cf::NDI_UNIQUE | cf::NDI_RED); 2803 cf::NDI_UNIQUE | cf::NDI_RED);
2602 2804
2603 warn "ERROR in enter_exit: $@"; 2805 warn "ERROR in enter_exit: $@";
2620sub cf::client::send_drawinfo { 2822sub cf::client::send_drawinfo {
2621 my ($self, $text, $flags) = @_; 2823 my ($self, $text, $flags) = @_;
2622 2824
2623 utf8::encode $text; 2825 utf8::encode $text;
2624 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2826 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2827}
2828
2829=item $client->send_big_packet ($pkt)
2830
2831Like C<send_packet>, but tries to compress large packets, and fragments
2832them as required.
2833
2834=cut
2835
2836our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2837
2838sub cf::client::send_big_packet {
2839 my ($self, $pkt) = @_;
2840
2841 # try lzf for large packets
2842 $pkt = "lzf " . Compress::LZF::compress $pkt
2843 if 1024 <= length $pkt and $self->{can_lzf};
2844
2845 # split very large packets
2846 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2847 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2848 $pkt = "frag";
2849 }
2850
2851 $self->send_packet ($pkt);
2625} 2852}
2626 2853
2627=item $client->send_msg ($channel, $msg, $color, [extra...]) 2854=item $client->send_msg ($channel, $msg, $color, [extra...])
2628 2855
2629Send a drawinfo or msg packet to the client, formatting the msg for the 2856Send a drawinfo or msg packet to the client, formatting the msg for the
2631the message, with C<log> being the default. If C<$color> is negative, suppress 2858the message, with C<log> being the default. If C<$color> is negative, suppress
2632the message unless the client supports the msg packet. 2859the message unless the client supports the msg packet.
2633 2860
2634=cut 2861=cut
2635 2862
2863# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 2864our %CHANNEL = (
2865 "c/motd" => {
2866 id => "infobox",
2867 title => "MOTD",
2868 reply => undef,
2869 tooltip => "The message of the day",
2870 },
2637 "c/identify" => { 2871 "c/identify" => {
2638 id => "infobox", 2872 id => "infobox",
2639 title => "Identify", 2873 title => "Identify",
2640 reply => undef, 2874 reply => undef,
2641 tooltip => "Items recently identified", 2875 tooltip => "Items recently identified",
2644 id => "infobox", 2878 id => "infobox",
2645 title => "Examine", 2879 title => "Examine",
2646 reply => undef, 2880 reply => undef,
2647 tooltip => "Signs and other items you examined", 2881 tooltip => "Signs and other items you examined",
2648 }, 2882 },
2883 "c/shopinfo" => {
2884 id => "infobox",
2885 title => "Shop Info",
2886 reply => undef,
2887 tooltip => "What your bargaining skill tells you about the shop",
2888 },
2889 "c/book" => {
2890 id => "infobox",
2891 title => "Book",
2892 reply => undef,
2893 tooltip => "The contents of a note or book",
2894 },
2649 "c/lookat" => { 2895 "c/lookat" => {
2650 id => "infobox", 2896 id => "infobox",
2651 title => "Look", 2897 title => "Look",
2652 reply => undef, 2898 reply => undef,
2653 tooltip => "What you saw there", 2899 tooltip => "What you saw there",
2654 }, 2900 },
2901 "c/who" => {
2902 id => "infobox",
2903 title => "Players",
2904 reply => undef,
2905 tooltip => "Shows players who are currently online",
2906 },
2907 "c/body" => {
2908 id => "infobox",
2909 title => "Body Parts",
2910 reply => undef,
2911 tooltip => "Shows which body parts you posess and are available",
2912 },
2913 "c/statistics" => {
2914 id => "infobox",
2915 title => "Statistics",
2916 reply => undef,
2917 tooltip => "Shows your primary statistics",
2918 },
2919 "c/skills" => {
2920 id => "infobox",
2921 title => "Skills",
2922 reply => undef,
2923 tooltip => "Shows your experience per skill and item power",
2924 },
2925 "c/shopitems" => {
2926 id => "infobox",
2927 title => "Shop Items",
2928 reply => undef,
2929 tooltip => "Shows the items currently for sale in this shop",
2930 },
2931 "c/resistances" => {
2932 id => "infobox",
2933 title => "Resistances",
2934 reply => undef,
2935 tooltip => "Shows your resistances",
2936 },
2937 "c/pets" => {
2938 id => "infobox",
2939 title => "Pets",
2940 reply => undef,
2941 tooltip => "Shows information abotu your pets/a specific pet",
2942 },
2943 "c/perceiveself" => {
2944 id => "infobox",
2945 title => "Perceive Self",
2946 reply => undef,
2947 tooltip => "You gained detailed knowledge about yourself",
2948 },
2949 "c/uptime" => {
2950 id => "infobox",
2951 title => "Uptime",
2952 reply => undef,
2953 tooltip => "How long the server has been running since last restart",
2954 },
2955 "c/mapinfo" => {
2956 id => "infobox",
2957 title => "Map Info",
2958 reply => undef,
2959 tooltip => "Information related to the maps",
2960 },
2961 "c/party" => {
2962 id => "party",
2963 title => "Party",
2964 reply => "gsay ",
2965 tooltip => "Messages and chat related to your party",
2966 },
2967 "c/death" => {
2968 id => "death",
2969 title => "Death",
2970 reply => undef,
2971 tooltip => "Reason for and more info about your most recent death",
2972 },
2973 "c/say" => $SAY_CHANNEL,
2974 "c/chat" => $CHAT_CHANNEL,
2655); 2975);
2656 2976
2657sub cf::client::send_msg { 2977sub cf::client::send_msg {
2658 my ($self, $channel, $msg, $color, @extra) = @_; 2978 my ($self, $channel, $msg, $color, @extra) = @_;
2659 2979
2660 $msg = $self->pl->expand_cfpod ($msg); 2980 $msg = $self->pl->expand_cfpod ($msg)
2981 unless $color & cf::NDI_VERBATIM;
2661 2982
2662 $color &= cf::NDI_CLIENT_MASK; # just in case... 2983 $color &= cf::NDI_CLIENT_MASK; # just in case...
2663 2984
2664 # check predefined channels, for the benefit of C 2985 # check predefined channels, for the benefit of C
2665 if ($CHANNEL{$channel}) { 2986 if ($CHANNEL{$channel}) {
2666 $channel = $CHANNEL{$channel}; 2987 $channel = $CHANNEL{$channel};
2667 2988
2668 $self->ext_msg (channel_info => $channel) 2989 $self->ext_msg (channel_info => $channel);
2669 if $self->can_msg;
2670
2671 $channel = $channel->{id}; 2990 $channel = $channel->{id};
2672 2991
2673 } elsif (ref $channel) { 2992 } elsif (ref $channel) {
2674 # send meta info to client, if not yet sent 2993 # send meta info to client, if not yet sent
2675 unless (exists $self->{channel}{$channel->{id}}) { 2994 unless (exists $self->{channel}{$channel->{id}}) {
2676 $self->{channel}{$channel->{id}} = $channel; 2995 $self->{channel}{$channel->{id}} = $channel;
2677 $self->ext_msg (channel_info => $channel) 2996 $self->ext_msg (channel_info => $channel);
2678 if $self->can_msg;
2679 } 2997 }
2680 2998
2681 $channel = $channel->{id}; 2999 $channel = $channel->{id};
2682 } 3000 }
2683 3001
2684 return unless @extra || length $msg; 3002 return unless @extra || length $msg;
2685 3003
2686 if ($self->can_msg) {
2687 # default colour, mask it out 3004 # default colour, mask it out
2688 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3005 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2689 if $color & cf::NDI_DEF; 3006 if $color & cf::NDI_DEF;
2690 3007
2691 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3008 my $pkt = "msg "
3009 . $self->{json_coder}->encode (
2692 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3010 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2693 } else { 3011 );
2694 if ($color >= 0) {
2695 # replace some tags by gcfclient-compatible ones
2696 for ($msg) {
2697 1 while
2698 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2699 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2700 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2701 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2702 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2703 }
2704 3012
2705 $color &= cf::NDI_COLOR_MASK; 3013 $self->send_big_packet ($pkt);
2706
2707 utf8::encode $msg;
2708
2709 if (0 && $msg =~ /\[/) {
2710 # COMMAND/INFO
2711 $self->send_packet ("drawextinfo $color 10 8 $msg")
2712 } else {
2713 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2714 $self->send_packet ("drawinfo $color $msg")
2715 }
2716 }
2717 }
2718} 3014}
2719 3015
2720=item $client->ext_msg ($type, @msg) 3016=item $client->ext_msg ($type, @msg)
2721 3017
2722Sends an ext event to the client. 3018Sends an ext event to the client.
2725 3021
2726sub cf::client::ext_msg($$@) { 3022sub cf::client::ext_msg($$@) {
2727 my ($self, $type, @msg) = @_; 3023 my ($self, $type, @msg) = @_;
2728 3024
2729 if ($self->extcmd == 2) { 3025 if ($self->extcmd == 2) {
2730 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2731 } elsif ($self->extcmd == 1) { # TODO: remove 3027 } elsif ($self->extcmd == 1) { # TODO: remove
2732 push @msg, msgtype => "event_$type"; 3028 push @msg, msgtype => "event_$type";
2733 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3029 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2734 } 3030 }
2735} 3031}
2736 3032
2737=item $client->ext_reply ($msgid, @msg) 3033=item $client->ext_reply ($msgid, @msg)
2738 3034
2742 3038
2743sub cf::client::ext_reply($$@) { 3039sub cf::client::ext_reply($$@) {
2744 my ($self, $id, @msg) = @_; 3040 my ($self, $id, @msg) = @_;
2745 3041
2746 if ($self->extcmd == 2) { 3042 if ($self->extcmd == 2) {
2747 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3043 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2748 } elsif ($self->extcmd == 1) { 3044 } elsif ($self->extcmd == 1) {
2749 #TODO: version 1, remove 3045 #TODO: version 1, remove
2750 unshift @msg, msgtype => "reply", msgid => $id; 3046 unshift @msg, msgtype => "reply", msgid => $id;
2751 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3047 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2752 } 3048 }
2753} 3049}
2754 3050
2755=item $success = $client->query ($flags, "text", \&cb) 3051=item $success = $client->query ($flags, "text", \&cb)
2756 3052
2857 3153
2858 $coro 3154 $coro
2859} 3155}
2860 3156
2861cf::client->attach ( 3157cf::client->attach (
2862 on_destroy => sub { 3158 on_client_destroy => sub {
2863 my ($ns) = @_; 3159 my ($ns) = @_;
2864 3160
2865 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3161 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2866 }, 3162 },
2867); 3163);
2883our $safe_hole = new Safe::Hole; 3179our $safe_hole = new Safe::Hole;
2884 3180
2885$SIG{FPE} = 'IGNORE'; 3181$SIG{FPE} = 'IGNORE';
2886 3182
2887$safe->permit_only (Opcode::opset qw( 3183$safe->permit_only (Opcode::opset qw(
2888 :base_core :base_mem :base_orig :base_math 3184 :base_core :base_mem :base_orig :base_math :base_loop
2889 grepstart grepwhile mapstart mapwhile 3185 grepstart grepwhile mapstart mapwhile
2890 sort time 3186 sort time
2891)); 3187));
2892 3188
2893# here we export the classes and methods available to script code 3189# here we export the classes and methods available to script code
2895=pod 3191=pod
2896 3192
2897The following functions and methods are available within a safe environment: 3193The following functions and methods are available within a safe environment:
2898 3194
2899 cf::object 3195 cf::object
2900 contr pay_amount pay_player map x y force_find force_add 3196 contr pay_amount pay_player map x y force_find force_add destroy
2901 insert remove name archname title slaying race decrease_ob_nr 3197 insert remove name archname title slaying race decrease split
3198 value
2902 3199
2903 cf::object::player 3200 cf::object::player
2904 player 3201 player
2905 3202
2906 cf::player 3203 cf::player
2911 3208
2912=cut 3209=cut
2913 3210
2914for ( 3211for (
2915 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3212 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2916 insert remove inv name archname title slaying race 3213 insert remove inv nrof name archname title slaying race
2917 decrease_ob_nr)], 3214 decrease split destroy change_exp value msg lore send_msg)],
2918 ["cf::object::player" => qw(player)], 3215 ["cf::object::player" => qw(player)],
2919 ["cf::player" => qw(peaceful)], 3216 ["cf::player" => qw(peaceful send_msg)],
2920 ["cf::map" => qw(trigger)], 3217 ["cf::map" => qw(trigger)],
2921) { 3218) {
2922 no strict 'refs'; 3219 no strict 'refs';
2923 my ($pkg, @funs) = @$_; 3220 my ($pkg, @funs) = @$_;
2924 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2942 3239
2943 my $qcode = $code; 3240 my $qcode = $code;
2944 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3241 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2945 $qcode =~ s/\n/\\n/g; 3242 $qcode =~ s/\n/\\n/g;
2946 3243
3244 %vars = (_dummy => 0) unless %vars;
3245
3246 my @res;
2947 local $_; 3247 local $_;
2948 local @safe::cf::_safe_eval_args = values %vars;
2949 3248
2950 my $eval = 3249 my $eval =
2951 "do {\n" 3250 "do {\n"
2952 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3251 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2953 . "#line 0 \"{$qcode}\"\n" 3252 . "#line 0 \"{$qcode}\"\n"
2954 . $code 3253 . $code
2955 . "\n}" 3254 . "\n}"
2956 ; 3255 ;
2957 3256
3257 if ($CFG{safe_eval}) {
2958 sub_generation_inc; 3258 sub_generation_inc;
3259 local @safe::cf::_safe_eval_args = values %vars;
2959 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3260 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2960 sub_generation_inc; 3261 sub_generation_inc;
3262 } else {
3263 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval;
3265 }
2961 3266
2962 if ($@) { 3267 if ($@) {
2963 warn "$@"; 3268 warn "$@";
2964 warn "while executing safe code '$code'\n"; 3269 warn "while executing safe code '$code'\n";
2965 warn "with arguments " . (join " ", %vars) . "\n"; 3270 warn "with arguments " . (join " ", %vars) . "\n";
2984=cut 3289=cut
2985 3290
2986sub register_script_function { 3291sub register_script_function {
2987 my ($fun, $cb) = @_; 3292 my ($fun, $cb) = @_;
2988 3293
2989 no strict 'refs'; 3294 $fun = "safe::$fun" if $CFG{safe_eval};
2990 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3295 *$fun = $safe_hole->wrap ($cb);
2991} 3296}
2992 3297
2993=back 3298=back
2994 3299
2995=cut 3300=cut
3016 3321
3017 $facedata->{version} == 2 3322 $facedata->{version} == 2
3018 or cf::cleanup "$path: version mismatch, cannot proceed."; 3323 or cf::cleanup "$path: version mismatch, cannot proceed.";
3019 3324
3020 # patch in the exptable 3325 # patch in the exptable
3326 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3021 $facedata->{resource}{"res/exp_table"} = { 3327 $facedata->{resource}{"res/exp_table"} = {
3022 type => FT_RSRC, 3328 type => FT_RSRC,
3023 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3329 data => $exp_table,
3330 hash => (Digest::MD5::md5 $exp_table),
3024 }; 3331 };
3025 cf::cede_to_tick; 3332 cf::cede_to_tick;
3026 3333
3027 { 3334 {
3028 my $faces = $facedata->{faceinfo}; 3335 my $faces = $facedata->{faceinfo};
3029 3336
3030 while (my ($face, $info) = each %$faces) { 3337 while (my ($face, $info) = each %$faces) {
3031 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3338 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3339
3032 cf::face::set_visibility $idx, $info->{visibility}; 3340 cf::face::set_visibility $idx, $info->{visibility};
3033 cf::face::set_magicmap $idx, $info->{magicmap}; 3341 cf::face::set_magicmap $idx, $info->{magicmap};
3034 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3035 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3343 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3036 3344
3037 cf::cede_to_tick; 3345 cf::cede_to_tick;
3038 } 3346 }
3039 3347
3040 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3041 next unless $info->{smooth}; 3349 next unless $info->{smooth};
3350
3042 my $idx = cf::face::find $face 3351 my $idx = cf::face::find $face
3043 or next; 3352 or next;
3353
3044 if (my $smooth = cf::face::find $info->{smooth}) { 3354 if (my $smooth = cf::face::find $info->{smooth}) {
3045 cf::face::set_smooth $idx, $smooth; 3355 cf::face::set_smooth $idx, $smooth;
3046 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3356 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3047 } else { 3357 } else {
3048 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3358 warn "smooth face '$info->{smooth}' not found for face '$face'";
3062 3372
3063 cf::anim::invalidate_all; # d'oh 3373 cf::anim::invalidate_all; # d'oh
3064 } 3374 }
3065 3375
3066 { 3376 {
3067 # TODO: for gcfclient pleasure, we should give resources
3068 # that gcfclient doesn't grok a >10000 face index.
3069 my $res = $facedata->{resource}; 3377 my $res = $facedata->{resource};
3070 3378
3071 my $soundconf = delete $res->{"res/sound.conf"};
3072
3073 while (my ($name, $info) = each %$res) { 3379 while (my ($name, $info) = each %$res) {
3380 if (defined $info->{type}) {
3074 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3381 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3075 my $data;
3076 3382
3077 if ($info->{type} & 1) { 3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3078 # prepend meta info 3384 cf::face::set_type $idx, $info->{type};
3079
3080 my $meta = $enc->encode ({
3081 name => $name,
3082 %{ $info->{meta} || {} },
3083 });
3084
3085 $data = pack "(w/a*)*", $meta, $info->{data};
3086 } else { 3385 } else {
3087 $data = $info->{data}; 3386 $RESOURCE{$name} = $info;
3088 } 3387 }
3089 3388
3090 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3091 cf::face::set_type $idx, $info->{type};
3092
3093 cf::cede_to_tick; 3389 cf::cede_to_tick;
3094 } 3390 }
3095
3096 if ($soundconf) {
3097 $soundconf = $enc->decode (delete $soundconf->{data});
3098
3099 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3100 my $sound = $soundconf->{compat}[$_]
3101 or next;
3102
3103 my $face = cf::face::find "sound/$sound->[1]";
3104 cf::sound::set $sound->[0] => $face;
3105 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3106 }
3107
3108 while (my ($k, $v) = each %{$soundconf->{event}}) {
3109 my $face = cf::face::find "sound/$v";
3110 cf::sound::set $k => $face;
3111 }
3112 }
3113 } 3391 }
3392
3393 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3114 3394
3115 1 3395 1
3116} 3396}
3397
3398cf::global->attach (on_resource_update => sub {
3399 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3400 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3401
3402 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3403 my $sound = $soundconf->{compat}[$_]
3404 or next;
3405
3406 my $face = cf::face::find "sound/$sound->[1]";
3407 cf::sound::set $sound->[0] => $face;
3408 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3409 }
3410
3411 while (my ($k, $v) = each %{$soundconf->{event}}) {
3412 my $face = cf::face::find "sound/$v";
3413 cf::sound::set $k => $face;
3414 }
3415 }
3416});
3117 3417
3118register_exticmd fx_want => sub { 3418register_exticmd fx_want => sub {
3119 my ($ns, $want) = @_; 3419 my ($ns, $want) = @_;
3120 3420
3121 while (my ($k, $v) = each %$want) { 3421 while (my ($k, $v) = each %$want) {
3122 $ns->fx_want ($k, $v); 3422 $ns->fx_want ($k, $v);
3123 } 3423 }
3124}; 3424};
3425
3426sub load_resource_file($) {
3427 my $guard = lock_acquire "load_resource_file";
3428
3429 my $status = load_resource_file_ $_[0];
3430 get_slot 0.1, 100;
3431 cf::arch::commit_load;
3432
3433 $status
3434}
3125 3435
3126sub reload_regions { 3436sub reload_regions {
3127 # HACK to clear player env face cache, we need some signal framework 3437 # HACK to clear player env face cache, we need some signal framework
3128 # for this (global event?) 3438 # for this (global event?)
3129 %ext::player_env::MUSIC_FACE_CACHE = (); 3439 %ext::player_env::MUSIC_FACE_CACHE = ();
3143} 3453}
3144 3454
3145sub reload_archetypes { 3455sub reload_archetypes {
3146 load_resource_file "$DATADIR/archetypes" 3456 load_resource_file "$DATADIR/archetypes"
3147 or die "unable to load archetypes\n"; 3457 or die "unable to load archetypes\n";
3148 #d# NEED to laod twice to resolve forward references
3149 # this really needs to be done in an extra post-pass
3150 # (which needs to be synchronous, so solve it differently)
3151 load_resource_file "$DATADIR/archetypes"
3152 or die "unable to load archetypes\n";
3153} 3458}
3154 3459
3155sub reload_treasures { 3460sub reload_treasures {
3156 load_resource_file "$DATADIR/treasures" 3461 load_resource_file "$DATADIR/treasures"
3157 or die "unable to load treasurelists\n"; 3462 or die "unable to load treasurelists\n";
3158} 3463}
3159 3464
3160sub reload_resources { 3465sub reload_resources {
3161 warn "reloading resource files...\n"; 3466 warn "reloading resource files...\n";
3162 3467
3468 reload_facedata;
3469 reload_archetypes;
3163 reload_regions; 3470 reload_regions;
3164 reload_facedata;
3165 #reload_archetypes;#d#
3166 reload_archetypes;
3167 reload_treasures; 3471 reload_treasures;
3168 3472
3169 warn "finished reloading resource files\n"; 3473 warn "finished reloading resource files\n";
3170} 3474}
3171 3475
3172sub init {
3173 reload_resources;
3174}
3175
3176sub reload_config { 3476sub reload_config {
3477 warn "reloading config file...\n";
3478
3177 open my $fh, "<:utf8", "$CONFDIR/config" 3479 open my $fh, "<:utf8", "$CONFDIR/config"
3178 or return; 3480 or return;
3179 3481
3180 local $/; 3482 local $/;
3181 *CFG = YAML::Syck::Load <$fh>; 3483 *CFG = YAML::XS::Load scalar <$fh>;
3182 3484
3183 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3184 3486
3185 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3487 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3186 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3488 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3190 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3191 and die "WARNING: m(un)lockall failed: $!\n"; 3493 and die "WARNING: m(un)lockall failed: $!\n";
3192 }; 3494 };
3193 warn $@ if $@; 3495 warn $@ if $@;
3194 } 3496 }
3497
3498 warn "finished reloading resource files\n";
3499}
3500
3501sub pidfile() {
3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503 or die "$PIDFILE: $!";
3504 flock $fh, &Fcntl::LOCK_EX
3505 or die "$PIDFILE: flock: $!";
3506 $fh
3507}
3508
3509# make sure only one server instance is running at any one time
3510sub atomic {
3511 my $fh = pidfile;
3512
3513 my $pid = <$fh>;
3514 kill 9, $pid if $pid > 0;
3515
3516 seek $fh, 0, 0;
3517 print $fh $$;
3518}
3519
3520sub main_loop {
3521 warn "EV::loop starting\n";
3522 if (1) {
3523 EV::loop;
3524 }
3525 warn "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP;
3195} 3527}
3196 3528
3197sub main { 3529sub main {
3530 cf::init_globals; # initialise logging
3531
3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3534 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3536
3537 cf::init_experience;
3538 cf::init_anim;
3539 cf::init_attackmess;
3540 cf::init_dynamic;
3541
3542 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3543
3198 # we must not ever block the main coroutine 3544 # we must not ever block the main coroutine
3199 local $Coro::idle = sub { 3545 local $Coro::idle = sub {
3200 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3546 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3201 (async { 3547 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3548 $Coro::current->{desc} = "IDLE BUG HANDLER";
3203 Event::one_event; 3549 EV::loop EV::LOOP_ONESHOT;
3204 })->prio (Coro::PRIO_MAX); 3550 })->prio (Coro::PRIO_MAX);
3205 }; 3551 };
3206 3552
3553 evthread_start IO::AIO::poll_fileno;
3554
3555 cf::sync_job {
3556 cf::load_settings;
3557 cf::load_materials;
3558
3559 reload_resources;
3207 reload_config; 3560 reload_config;
3208 db_init; 3561 db_init;
3562
3563 cf::init_uuid;
3564 cf::init_signals;
3565 cf::init_skills;
3566
3567 cf::init_beforeplay;
3568
3569 atomic;
3570
3209 load_extensions; 3571 load_extensions;
3210 3572
3211 $TICK_WATCHER->start; 3573 utime time, time, $RUNTIMEFILE;
3212 Event::loop; 3574
3575 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX ();
3577 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3578
3579 (pop @POST_INIT)->(0) while @POST_INIT;
3580 };
3581
3582 main_loop;
3213} 3583}
3214 3584
3215############################################################################# 3585#############################################################################
3216# initialisation and cleanup 3586# initialisation and cleanup
3217 3587
3218# install some emergency cleanup handlers 3588# install some emergency cleanup handlers
3219BEGIN { 3589BEGIN {
3590 our %SIGWATCHER = ();
3220 for my $signal (qw(INT HUP TERM)) { 3591 for my $signal (qw(INT HUP TERM)) {
3221 Event->signal ( 3592 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3222 reentrant => 0,
3223 data => WF_AUTOCANCEL,
3224 signal => $signal,
3225 prio => 0,
3226 cb => sub {
3227 cf::cleanup "SIG$signal"; 3593 cf::cleanup "SIG$signal";
3228 },
3229 ); 3594 };
3230 } 3595 }
3231} 3596}
3232 3597
3233sub write_runtime { 3598sub write_runtime_sync {
3234 my $runtime = "$LOCALDIR/runtime"; 3599 my $t0 = AE::time;
3235 3600
3236 # first touch the runtime file to show we are still running: 3601 # first touch the runtime file to show we are still running:
3237 # the fsync below can take a very very long time. 3602 # the fsync below can take a very very long time.
3238 3603
3239 IO::AIO::aio_utime $runtime, undef, undef; 3604 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3240 3605
3241 my $guard = cf::lock_acquire "write_runtime"; 3606 my $guard = cf::lock_acquire "write_runtime";
3242 3607
3243 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3608 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3244 or return; 3609 or return;
3245 3610
3246 my $value = $cf::RUNTIME + 90 + 10; 3611 my $value = $cf::RUNTIME + 90 + 10;
3247 # 10 is the runtime save interval, for a monotonic clock 3612 # 10 is the runtime save interval, for a monotonic clock
3248 # 60 allows for the watchdog to kill the server. 3613 # 60 allows for the watchdog to kill the server.
3258 aio_utime $fh, undef, undef; 3623 aio_utime $fh, undef, undef;
3259 3624
3260 close $fh 3625 close $fh
3261 or return; 3626 or return;
3262 3627
3263 aio_rename "$runtime~", $runtime 3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3264 and return; 3629 and return;
3265 3630
3266 warn "runtime file written.\n"; 3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3267 3632
3268 1 3633 1
3634}
3635
3636our $uuid_lock;
3637our $uuid_skip;
3638
3639sub write_uuid_sync($) {
3640 $uuid_skip ||= $_[0];
3641
3642 return if $uuid_lock;
3643 local $uuid_lock = 1;
3644
3645 my $uuid = "$LOCALDIR/uuid";
3646
3647 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3648 or return;
3649
3650 my $value = uuid_seq uuid_cur;
3651
3652 unless ($value) {
3653 warn "cowardly refusing to write zero uuid value!\n";
3654 return;
3655 }
3656
3657 my $value = uuid_str $value + $uuid_skip;
3658 $uuid_skip = 0;
3659
3660 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3661 and return;
3662
3663 # always fsync - this file is important
3664 aio_fsync $fh
3665 and return;
3666
3667 close $fh
3668 or return;
3669
3670 aio_rename "$uuid~", $uuid
3671 and return;
3672
3673 warn "uuid file written ($value).\n";
3674
3675 1
3676
3677}
3678
3679sub write_uuid($$) {
3680 my ($skip, $sync) = @_;
3681
3682 $sync ? write_uuid_sync $skip
3683 : async { write_uuid_sync $skip };
3269} 3684}
3270 3685
3271sub emergency_save() { 3686sub emergency_save() {
3272 my $freeze_guard = cf::freeze_mainloop; 3687 my $freeze_guard = cf::freeze_mainloop;
3273 3688
3274 warn "enter emergency perl save\n"; 3689 warn "emergency_perl_save: enter\n";
3275 3690
3276 cf::sync_job { 3691 cf::sync_job {
3692 # this is a trade-off: we want to be very quick here, so
3693 # save all maps without fsync, and later call a global sync
3694 # (which in turn might be very very slow)
3695 local $USE_FSYNC = 0;
3696
3277 # use a peculiar iteration method to avoid tripping on perl 3697 # use a peculiar iteration method to avoid tripping on perl
3278 # refcount bugs in for. also avoids problems with players 3698 # refcount bugs in for. also avoids problems with players
3279 # and maps saved/destroyed asynchronously. 3699 # and maps saved/destroyed asynchronously.
3280 warn "begin emergency player save\n"; 3700 warn "emergency_perl_save: begin player save\n";
3281 for my $login (keys %cf::PLAYER) { 3701 for my $login (keys %cf::PLAYER) {
3282 my $pl = $cf::PLAYER{$login} or next; 3702 my $pl = $cf::PLAYER{$login} or next;
3283 $pl->valid or next; 3703 $pl->valid or next;
3704 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3284 $pl->save; 3705 $pl->save;
3285 } 3706 }
3286 warn "end emergency player save\n"; 3707 warn "emergency_perl_save: end player save\n";
3287 3708
3288 warn "begin emergency map save\n"; 3709 warn "emergency_perl_save: begin map save\n";
3289 for my $path (keys %cf::MAP) { 3710 for my $path (keys %cf::MAP) {
3290 my $map = $cf::MAP{$path} or next; 3711 my $map = $cf::MAP{$path} or next;
3291 $map->valid or next; 3712 $map->valid or next;
3292 $map->save; 3713 $map->save;
3293 } 3714 }
3294 warn "end emergency map save\n"; 3715 warn "emergency_perl_save: end map save\n";
3295 3716
3296 warn "begin emergency database checkpoint\n"; 3717 warn "emergency_perl_save: begin database checkpoint\n";
3297 BDB::db_env_txn_checkpoint $DB_ENV; 3718 BDB::db_env_txn_checkpoint $DB_ENV;
3298 warn "end emergency database checkpoint\n"; 3719 warn "emergency_perl_save: end database checkpoint\n";
3720
3721 warn "emergency_perl_save: begin write uuid\n";
3722 write_uuid_sync 1;
3723 warn "emergency_perl_save: end write uuid\n";
3299 }; 3724 };
3300 3725
3726 warn "emergency_perl_save: starting sync()\n";
3727 IO::AIO::aio_sync sub {
3728 warn "emergency_perl_save: finished sync()\n";
3729 };
3730
3301 warn "leave emergency perl save\n"; 3731 warn "emergency_perl_save: leave\n";
3302} 3732}
3303 3733
3304sub post_cleanup { 3734sub post_cleanup {
3305 my ($make_core) = @_; 3735 my ($make_core) = @_;
3306 3736
3307 warn Carp::longmess "post_cleanup backtrace" 3737 warn Carp::longmess "post_cleanup backtrace"
3308 if $make_core; 3738 if $make_core;
3739
3740 my $fh = pidfile;
3741 unlink $PIDFILE if <$fh> == $$;
3742}
3743
3744# a safer delete_package, copied from Symbol
3745sub clear_package($) {
3746 my $pkg = shift;
3747
3748 # expand to full symbol table name if needed
3749 unless ($pkg =~ /^main::.*::$/) {
3750 $pkg = "main$pkg" if $pkg =~ /^::/;
3751 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3752 $pkg .= '::' unless $pkg =~ /::$/;
3753 }
3754
3755 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3756 my $stem_symtab = *{$stem}{HASH};
3757
3758 defined $stem_symtab and exists $stem_symtab->{$leaf}
3759 or return;
3760
3761 # clear all symbols
3762 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763 for my $name (keys %$leaf_symtab) {
3764 _gv_clear *{"$pkg$name"};
3765# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766 }
3767 warn "cleared package $pkg\n";#d#
3309} 3768}
3310 3769
3311sub do_reload_perl() { 3770sub do_reload_perl() {
3312 # can/must only be called in main 3771 # can/must only be called in main
3313 if ($Coro::current != $Coro::main) { 3772 if ($Coro::current != $Coro::main) {
3314 warn "can only reload from main coroutine"; 3773 warn "can only reload from main coroutine";
3315 return; 3774 return;
3316 } 3775 }
3317 3776
3777 return if $RELOAD++;
3778
3779 my $t1 = AE::time;
3780
3781 while ($RELOAD) {
3318 warn "reloading..."; 3782 warn "reloading...";
3319 3783
3320 warn "entering sync_job"; 3784 warn "entering sync_job";
3321 3785
3322 cf::sync_job { 3786 cf::sync_job {
3323 cf::write_runtime; # external watchdog should not bark 3787 cf::write_runtime_sync; # external watchdog should not bark
3324 cf::emergency_save; 3788 cf::emergency_save;
3325 cf::write_runtime; # external watchdog should not bark 3789 cf::write_runtime_sync; # external watchdog should not bark
3326 3790
3327 warn "syncing database to disk"; 3791 warn "syncing database to disk";
3328 BDB::db_env_txn_checkpoint $DB_ENV; 3792 BDB::db_env_txn_checkpoint $DB_ENV;
3329 3793
3330 # if anything goes wrong in here, we should simply crash as we already saved 3794 # if anything goes wrong in here, we should simply crash as we already saved
3331 3795
3332 warn "cancelling all WF_AUTOCANCEL watchers";
3333 for (Event::all_watchers) {
3334 $_->cancel if $_->data & WF_AUTOCANCEL;
3335 }
3336
3337 warn "flushing outstanding aio requests"; 3796 warn "flushing outstanding aio requests";
3338 for (;;) {
3339 BDB::flush;
3340 IO::AIO::flush;
3341 Coro::cede;
3342 last unless IO::AIO::nreqs || BDB::nreqs; 3797 while (IO::AIO::nreqs || BDB::nreqs) {
3343 warn "iterate..."; 3798 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3344 }
3345
3346 ++$RELOAD;
3347
3348 warn "cancelling all extension coros";
3349 $_->cancel for values %EXT_CORO;
3350 %EXT_CORO = ();
3351
3352 warn "removing commands";
3353 %COMMAND = ();
3354
3355 warn "removing ext/exti commands";
3356 %EXTCMD = ();
3357 %EXTICMD = ();
3358
3359 warn "unloading/nuking all extensions";
3360 for my $pkg (@EXTS) {
3361 warn "... unloading $pkg";
3362
3363 if (my $cb = $pkg->can ("unload")) {
3364 eval {
3365 $cb->($pkg);
3366 1
3367 } or warn "$pkg unloaded, but with errors: $@";
3368 } 3799 }
3369 3800
3370 warn "... nuking $pkg"; 3801 warn "cancelling all extension coros";
3371 Symbol::delete_package $pkg; 3802 $_->cancel for values %EXT_CORO;
3372 } 3803 %EXT_CORO = ();
3373 3804
3374 warn "unloading all perl modules loaded from $LIBDIR"; 3805 warn "removing commands";
3375 while (my ($k, $v) = each %INC) { 3806 %COMMAND = ();
3376 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3377 3807
3808 warn "removing ext/exti commands";
3809 %EXTCMD = ();
3810 %EXTICMD = ();
3811
3812 warn "unloading/nuking all extensions";
3813 for my $pkg (@EXTS) {
3378 warn "... unloading $k"; 3814 warn "... unloading $pkg";
3379 delete $INC{$k};
3380 3815
3381 $k =~ s/\.pm$//;
3382 $k =~ s/\//::/g;
3383
3384 if (my $cb = $k->can ("unload_module")) { 3816 if (my $cb = $pkg->can ("unload")) {
3817 eval {
3385 $cb->(); 3818 $cb->($pkg);
3819 1
3820 } or warn "$pkg unloaded, but with errors: $@";
3821 }
3822
3823 warn "... clearing $pkg";
3824 clear_package $pkg;
3386 } 3825 }
3387 3826
3388 Symbol::delete_package $k; 3827 warn "unloading all perl modules loaded from $LIBDIR";
3828 while (my ($k, $v) = each %INC) {
3829 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830
3831 warn "... unloading $k";
3832 delete $INC{$k};
3833
3834 $k =~ s/\.pm$//;
3835 $k =~ s/\//::/g;
3836
3837 if (my $cb = $k->can ("unload_module")) {
3838 $cb->();
3839 }
3840
3841 clear_package $k;
3389 } 3842 }
3390 3843
3391 warn "getting rid of safe::, as good as possible"; 3844 warn "getting rid of safe::, as good as possible";
3392 Symbol::delete_package "safe::$_" 3845 clear_package "safe::$_"
3393 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3846 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3394 3847
3395 warn "unloading cf.pm \"a bit\""; 3848 warn "unloading cf.pm \"a bit\"";
3396 delete $INC{"cf.pm"}; 3849 delete $INC{"cf.pm"};
3397 delete $INC{"cf/pod.pm"}; 3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3398 3851
3399 # don't, removes xs symbols, too, 3852 # don't, removes xs symbols, too,
3400 # and global variables created in xs 3853 # and global variables created in xs
3401 #Symbol::delete_package __PACKAGE__; 3854 #clear_package __PACKAGE__;
3402 3855
3403 warn "unload completed, starting to reload now"; 3856 warn "unload completed, starting to reload now";
3404 3857
3405 warn "reloading cf.pm"; 3858 warn "reloading cf.pm";
3406 require cf; 3859 require cf;
3407 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3860 cf::_connect_to_perl_1;
3408 3861
3409 warn "loading config and database again"; 3862 warn "loading config and database again";
3410 cf::reload_config; 3863 cf::reload_config;
3411 3864
3412 warn "loading extensions"; 3865 warn "loading extensions";
3413 cf::load_extensions; 3866 cf::load_extensions;
3414 3867
3868 if ($REATTACH_ON_RELOAD) {
3415 warn "reattaching attachments to objects/players"; 3869 warn "reattaching attachments to objects/players";
3416 _global_reattach; # objects, sockets 3870 _global_reattach; # objects, sockets
3417 warn "reattaching attachments to maps"; 3871 warn "reattaching attachments to maps";
3418 reattach $_ for values %MAP; 3872 reattach $_ for values %MAP;
3419 warn "reattaching attachments to players"; 3873 warn "reattaching attachments to players";
3420 reattach $_ for values %PLAYER; 3874 reattach $_ for values %PLAYER;
3875 }
3421 3876
3877 warn "running post_init jobs";
3878 (pop @POST_INIT)->(1) while @POST_INIT;
3879
3422 warn "leaving sync_job"; 3880 warn "leaving sync_job";
3423 3881
3424 1 3882 1
3425 } or do { 3883 } or do {
3426 warn $@; 3884 warn $@;
3427 warn "error while reloading, exiting."; 3885 cf::cleanup "error while reloading, exiting.";
3428 exit 1;
3429 }; 3886 };
3430 3887
3431 warn "reloaded"; 3888 warn "reloaded";
3889 --$RELOAD;
3890 }
3891
3892 $t1 = AE::time - $t1;
3893 warn "reload completed in ${t1}s\n";
3432}; 3894};
3433 3895
3434our $RELOAD_WATCHER; # used only during reload 3896our $RELOAD_WATCHER; # used only during reload
3435 3897
3436sub reload_perl() { 3898sub reload_perl() {
3437 # doing reload synchronously and two reloads happen back-to-back, 3899 # doing reload synchronously and two reloads happen back-to-back,
3438 # coro crashes during coro_state_free->destroy here. 3900 # coro crashes during coro_state_free->destroy here.
3439 3901
3440 $RELOAD_WATCHER ||= Event->timer ( 3902 $RELOAD_WATCHER ||= cf::async {
3441 reentrant => 0, 3903 Coro::AIO::aio_wait cache_extensions;
3442 after => 0, 3904
3443 data => WF_AUTOCANCEL, 3905 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3444 cb => sub {
3445 do_reload_perl; 3906 do_reload_perl;
3446 undef $RELOAD_WATCHER; 3907 undef $RELOAD_WATCHER;
3447 }, 3908 };
3448 ); 3909 };
3449} 3910}
3450 3911
3451register_command "reload" => sub { 3912register_command "reload" => sub {
3452 my ($who, $arg) = @_; 3913 my ($who, $arg) = @_;
3453 3914
3466 3927
3467our @WAIT_FOR_TICK; 3928our @WAIT_FOR_TICK;
3468our @WAIT_FOR_TICK_BEGIN; 3929our @WAIT_FOR_TICK_BEGIN;
3469 3930
3470sub wait_for_tick { 3931sub wait_for_tick {
3471 return unless $TICK_WATCHER->is_active;
3472 return if $Coro::current == $Coro::main; 3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3473 3933
3474 my $signal = new Coro::Signal; 3934 my $signal = new Coro::Signal;
3475 push @WAIT_FOR_TICK, $signal; 3935 push @WAIT_FOR_TICK, $signal;
3476 $signal->wait; 3936 $signal->wait;
3477} 3937}
3478 3938
3479sub wait_for_tick_begin { 3939sub wait_for_tick_begin {
3480 return unless $TICK_WATCHER->is_active;
3481 return if $Coro::current == $Coro::main; 3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3482 3941
3483 my $signal = new Coro::Signal; 3942 my $signal = new Coro::Signal;
3484 push @WAIT_FOR_TICK_BEGIN, $signal; 3943 push @WAIT_FOR_TICK_BEGIN, $signal;
3485 $signal->wait; 3944 $signal->wait;
3486} 3945}
3487 3946
3488$TICK_WATCHER = Event->timer ( 3947sub tick {
3489 reentrant => 0,
3490 parked => 1,
3491 prio => 0,
3492 at => $NEXT_TICK || $TICK,
3493 data => WF_AUTOCANCEL,
3494 cb => sub {
3495 if ($Coro::current != $Coro::main) { 3948 if ($Coro::current != $Coro::main) {
3496 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3949 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3497 unless ++$bug_warning > 10; 3950 unless ++$bug_warning > 10;
3498 return; 3951 return;
3499 } 3952 }
3500 3953
3501 $NOW = $tick_start = Event::time;
3502
3503 cf::server_tick; # one server iteration 3954 cf::server_tick; # one server iteration
3504 3955
3505 $RUNTIME += $TICK; 3956 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3506 $NEXT_TICK += $TICK;
3507 3957
3508 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3509 $NEXT_RUNTIME_WRITE = $NOW + 10; 3959 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3510 Coro::async_pool { 3960 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver"; 3961 $Coro::current->{desc} = "runtime saver";
3512 write_runtime 3962 write_runtime_sync
3513 or warn "ERROR: unable to write runtime file: $!"; 3963 or warn "ERROR: unable to write runtime file: $!";
3514 };
3515 } 3964 };
3965 }
3516 3966
3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3967 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3518 $sig->send; 3968 $sig->send;
3519 } 3969 }
3520 while (my $sig = shift @WAIT_FOR_TICK) { 3970 while (my $sig = shift @WAIT_FOR_TICK) {
3521 $sig->send; 3971 $sig->send;
3522 } 3972 }
3523 3973
3524 $NOW = Event::time; 3974 $LOAD = ($NOW - $TICK_START) / $TICK;
3525
3526 # if we are delayed by four ticks or more, skip them all
3527 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3528
3529 $TICK_WATCHER->at ($NEXT_TICK);
3530 $TICK_WATCHER->start;
3531
3532 $LOAD = ($NOW - $tick_start) / $TICK;
3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3975 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3534 3976
3535 _post_tick; 3977 if (0) {
3978 if ($NEXT_TICK) {
3979 my $jitter = $TICK_START - $NEXT_TICK;
3980 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3981 warn "jitter $JITTER\n";#d#
3982 }
3536 }, 3983 }
3537); 3984}
3538 3985
3539{ 3986{
3987 # configure BDB
3988
3540 BDB::min_parallel 8; 3989 BDB::min_parallel 16;
3541 BDB::max_poll_time $TICK * 0.1; 3990 BDB::max_poll_reqs $TICK * 0.1;
3542 $BDB_POLL_WATCHER = Event->io ( 3991 $AnyEvent::BDB::WATCHER->priority (1);
3543 reentrant => 0,
3544 fd => BDB::poll_fileno,
3545 poll => 'r',
3546 prio => 0,
3547 data => WF_AUTOCANCEL,
3548 cb => \&BDB::poll_cb,
3549 );
3550
3551 BDB::set_sync_prepare {
3552 my $status;
3553 my $current = $Coro::current;
3554 (
3555 sub {
3556 $status = $!;
3557 $current->ready; undef $current;
3558 },
3559 sub {
3560 Coro::schedule while defined $current;
3561 $! = $status;
3562 },
3563 )
3564 };
3565 3992
3566 unless ($DB_ENV) { 3993 unless ($DB_ENV) {
3567 $DB_ENV = BDB::db_env_create; 3994 $DB_ENV = BDB::db_env_create;
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3995 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3569 | BDB::LOG_AUTOREMOVE, 1); 3996 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3997 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3570 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3998 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3571 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3999 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3572 4000
3573 cf::sync_job { 4001 cf::sync_job {
3574 eval { 4002 eval {
3584 4012
3585 cf::cleanup "db_env_open(db): $@" if $@; 4013 cf::cleanup "db_env_open(db): $@" if $@;
3586 }; 4014 };
3587 } 4015 }
3588 4016
3589 $BDB_DEADLOCK_WATCHER = Event->timer ( 4017 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3590 after => 3,
3591 interval => 1,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4018 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3597 },
3598 ); 4019 };
3599 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4020 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3600 after => 11,
3601 interval => 60,
3602 hard => 1,
3603 prio => 0,
3604 data => WF_AUTOCANCEL,
3605 cb => sub {
3606 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4021 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3607 },
3608 ); 4022 };
3609 $BDB_TRICKLE_WATCHER = Event->timer ( 4023 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3610 after => 5,
3611 interval => 10,
3612 hard => 1,
3613 prio => 0,
3614 data => WF_AUTOCANCEL,
3615 cb => sub {
3616 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4024 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3617 },
3618 ); 4025 };
3619} 4026}
3620 4027
3621{ 4028{
4029 # configure IO::AIO
4030
3622 IO::AIO::min_parallel 8; 4031 IO::AIO::min_parallel 8;
3623
3624 undef $Coro::AIO::WATCHER;
3625 IO::AIO::max_poll_time $TICK * 0.1; 4032 IO::AIO::max_poll_time $TICK * 0.1;
3626 $AIO_POLL_WATCHER = Event->io ( 4033 undef $AnyEvent::AIO::WATCHER;
3627 reentrant => 0,
3628 data => WF_AUTOCANCEL,
3629 fd => IO::AIO::poll_fileno,
3630 poll => 'r',
3631 prio => 0,
3632 cb => \&IO::AIO::poll_cb,
3633 );
3634} 4034}
3635 4035
3636my $_log_backtrace; 4036my $_log_backtrace;
3637 4037
3638sub _log_backtrace { 4038sub _log_backtrace {
3641 $msg =~ s/\n//; 4041 $msg =~ s/\n//;
3642 4042
3643 # limit the # of concurrent backtraces 4043 # limit the # of concurrent backtraces
3644 if ($_log_backtrace < 2) { 4044 if ($_log_backtrace < 2) {
3645 ++$_log_backtrace; 4045 ++$_log_backtrace;
4046 my $perl_bt = Carp::longmess $msg;
3646 async { 4047 async {
3647 $Coro::current->{desc} = "abt $msg"; 4048 $Coro::current->{desc} = "abt $msg";
3648 4049
3649 my @bt = fork_call { 4050 my @bt = fork_call {
3650 @addr = map { sprintf "%x", $_ } @addr; 4051 @addr = map { sprintf "%x", $_ } @addr;
3661 } 4062 }
3662 4063
3663 @funcs 4064 @funcs
3664 }; 4065 };
3665 4066
3666 LOG llevInfo, "[ABT] $msg\n"; 4067 LOG llevInfo, "[ABT] $perl_bt\n";
4068 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3667 LOG llevInfo, "[ABT] $_\n" for @bt; 4069 LOG llevInfo, "[ABT] $_\n" for @bt;
3668 --$_log_backtrace; 4070 --$_log_backtrace;
3669 }; 4071 };
3670 } else { 4072 } else {
3671 LOG llevInfo, "[ABT] $msg\n"; 4073 LOG llevInfo, "[ABT] $msg\n";
3672 LOG llevInfo, "[ABT] [suppressed]\n"; 4074 LOG llevInfo, "[ABT] [suppressed]\n";
3673 } 4075 }
3674} 4076}
3675 4077
3676# load additional modules 4078# load additional modules
3677use cf::pod; 4079require "cf/$_.pm" for @EXTRA_MODULES;
4080cf::_connect_to_perl_2;
3678 4081
3679END { cf::emergency_save } 4082END { cf::emergency_save }
3680 4083
36811 40841
3682 4085

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines