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.389 by root, Sat Oct 20 04:39:57 2007 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 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
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Event; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.1 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.51 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$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 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
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; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
75 118
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $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 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 121our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
83 123
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 127our $DB_ENV;
89 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
90our %CFG; 131our %CFG;
91 132
92our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 134our $RUNTIME;
135our $NOW;
94 136
95our (%PLAYER, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 138our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
98 140
99# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 143
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
105 153
106binmode STDOUT; 154binmode STDOUT;
107binmode STDERR; 155binmode STDERR;
108 156
109# read virtual server time, if available 157# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
114} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
115 165
116mkdir $_ 166mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 168
119our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
120 170
121sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 187
123############################################################################# 188#############################################################################
124 189
125=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
126 191
162 227
163The raw value load value from the last tick. 228The raw value load value from the last tick.
164 229
165=item %cf::CFG 230=item %cf::CFG
166 231
167Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 233from wherever your confdir points to.
169 234
170=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
171 236
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These 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 238returns directly I<after> the tick processing (and consequently, can only wake one thread
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
176=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
177 247
178This array contains the results of the last C<invoke ()> call. When 248This 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 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 250that call.
181 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
182=back 258=back
183 259
184=cut 260=cut
185 261
186BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
187 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
188 my $msg = join "", @_; 269 my $msg = join "", @_;
189 270
190 $msg .= "\n" 271 $msg .= "\n"
191 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
192 273
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 275
195 LOG llevError, $msg; 276 LOG llevWarn, $msg;
196 }; 277};
197} 278
279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
290 Coro::terminate
291};
198 292
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 303for my $pkg (qw(
210 cf::global cf::attachable 304 cf::global cf::attachable
211 cf::object cf::object::player 305 cf::object cf::object::player
212 cf::client cf::player 306 cf::client cf::player
213 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
214 cf::map cf::party cf::region 309 cf::party cf::region
215)) { 310)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 312}
219 313
220$Event::DIED = sub { 314$EV::DIED = sub {
221 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
222}; 316};
223 317
224############################################################################# 318#############################################################################
225 319
226=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 343 $d
250 } || "[unable to dump $_[0]: '$@']"; 344 } || "[unable to dump $_[0]: '$@']";
251} 345}
252 346
253=item $ref = cf::from_json $json 347=item $ref = cf::decode_json $json
254 348
255Converts a JSON string into the corresponding perl data structure. 349Converts a JSON string into the corresponding perl data structure.
256 350
257=item $json = cf::to_json $ref 351=item $json = cf::encode_json $ref
258 352
259Converts a perl data structure into its JSON representation. 353Converts a perl data structure into its JSON representation.
260 354
261=cut 355=cut
262 356
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 358
265sub to_json ($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
361
362=item cf::post_init { BLOCK }
363
364Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again.
366
367The cdoeblock will have a single boolean argument to indicate whether this
368is a reload or not.
369
370=cut
371
372sub post_init(&) {
373 push @POST_INIT, shift;
374}
267 375
268=item cf::lock_wait $string 376=item cf::lock_wait $string
269 377
270Wait until the given lock is available. See cf::lock_acquire. 378Wait until the given lock is available. See cf::lock_acquire.
271 379
272=item my $lock = cf::lock_acquire $string 380=item my $lock = cf::lock_acquire $string
273 381
274Wait until the given lock is available and then acquires it and returns 382Wait 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, 383a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 384for example when the coroutine gets canceled), the lock is automatically
277returned. 385returned.
278 386
279Locks are *not* recursive, locking from the same coro twice results in a 387Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 388deadlocked coro.
286 394
287Return true if the lock is currently active, i.e. somebody has locked it. 395Return true if the lock is currently active, i.e. somebody has locked it.
288 396
289=cut 397=cut
290 398
291our %LOCK; 399our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 400
294sub lock_wait($) { 401sub lock_wait($) {
295 my ($key) = @_; 402 $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} 403}
308 404
309sub lock_acquire($) { 405sub lock_acquire($) {
310 my ($key) = @_; 406 $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} 407}
324 408
325sub lock_active($) { 409sub lock_active($) {
326 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 411}
330 412
331sub freeze_mainloop { 413sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 414 tick_inhibit_inc;
333 415
334 my $guard = Coro::guard { 416 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 417}
336 }; 418
337 $TICK_WATCHER->stop; 419=item cf::periodic $interval, $cb
338 $guard 420
421Like EV::periodic, but randomly selects a starting point so that the actions
422get spread over time.
423
424=cut
425
426sub periodic($$) {
427 my ($interval, $cb) = @_;
428
429 my $start = rand List::Util::min 180, $interval;
430
431 EV::periodic $start, $interval, 0, $cb
339} 432}
340 433
341=item cf::get_slot $time[, $priority[, $name]] 434=item cf::get_slot $time[, $priority[, $name]]
342 435
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 436Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 444
352=cut 445=cut
353 446
354our @SLOT_QUEUE; 447our @SLOT_QUEUE;
355our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
356 450
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
360 454
361 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
362 457
363 while () { 458 while () {
364 next_job: 459 next_job:
460
365 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 462
367 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 467 $job->[2]->send;
371 Coro::cede; 468 Coro::cede;
372 goto next_job; 469 goto next_job;
373 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 472 }
375 } 473 }
376 474
377 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 478 $signal->wait;
381 } else { 479 } else {
480 $busy = 0;
382 Coro::schedule; 481 Coro::schedule;
383 } 482 }
384 } 483 }
385}; 484};
386 485
387sub get_slot($;$$) { 486sub get_slot($;$$) {
487 return if tick_inhibit || $Coro::current == $Coro::main;
488
388 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
389 490
390 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
391 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
392 494
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
406 508
407BEGIN { *async = \&Coro::async_pool } 509BEGIN { *async = \&Coro::async_pool }
408 510
409=item cf::sync_job { BLOCK } 511=item cf::sync_job { BLOCK }
410 512
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 513The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 514is 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 515partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 516acceptable.
415 517
416If it must be done, put the blocking parts into C<sync_job>. This will run 518If 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 519the given BLOCK in another coroutine while waiting for the result. The
421=cut 523=cut
422 524
423sub sync_job(&) { 525sub sync_job(&) {
424 my ($job) = @_; 526 my ($job) = @_;
425 527
426 if ($Coro::current == $Coro::main) { 528 if (in_main) {
427 my $time = Event::time; 529 my $time = AE::time;
428 530
429 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
431 533
432 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
433 535
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
437 537
438 my $busy = 1; 538 my $busy = 1;
439 my @res; 539 my @res;
440 540
441 (async { 541 (async {
442 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
443 @res = eval { $job->() }; 543 @res = eval { $job->() };
444 warn $@ if $@; 544 error $@ if $@;
445 undef $busy; 545 undef $busy;
446 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
447 547
448 while ($busy) { 548 while ($busy) {
449 if (Coro::nready) { 549 if (Coro::nready) {
450 Coro::cede_notself; 550 Coro::cede_notself;
451 } else { 551 } else {
452 Event::one_event; 552 EV::loop EV::LOOP_ONESHOT;
453 } 553 }
454 } 554 }
455 555
456 $time = Event::time - $time; 556 my $time = AE::time - $time;
457 557
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
462 559
463 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
464 } else { 561 } else {
465 # we are in another coroutine, how wonderful, everything just works 562 # we are in another coroutine, how wonderful, everything just works
466 563
491=item fork_call { }, $args 588=item fork_call { }, $args
492 589
493Executes the given code block with the given arguments in a seperate 590Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 591process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 593never block itself or use any form of event handling.
497 594
498=cut 595=cut
596
597sub post_fork {
598 reset_signals;
599}
499 600
500sub fork_call(&@) { 601sub fork_call(&@) {
501 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
502 603
503 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
504 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
505 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
506 607
507 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
508 reset_signals; 609 cf::post_fork;
509 &$cb 610 &$cb
510 }, @args; 611 }, @args;
511 612
512 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
513} 614}
514 615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
625}
626
627=item $coin = coin_from_name $name
628
629=cut
630
631our %coin_alias = (
632 "silver" => "silvercoin",
633 "silvercoin" => "silvercoin",
634 "silvercoins" => "silvercoin",
635 "gold" => "goldcoin",
636 "goldcoin" => "goldcoin",
637 "goldcoins" => "goldcoin",
638 "platinum" => "platinacoin",
639 "platinumcoin" => "platinacoin",
640 "platinumcoins" => "platinacoin",
641 "platina" => "platinacoin",
642 "platinacoin" => "platinacoin",
643 "platinacoins" => "platinacoin",
644 "royalty" => "royalty",
645 "royalties" => "royalty",
646);
647
648sub coin_from_name($) {
649 $coin_alias{$_[0]}
650 ? cf::arch::find $coin_alias{$_[0]}
651 : undef
652}
653
515=item $value = cf::db_get $family => $key 654=item $value = cf::db_get $family => $key
516 655
517Returns a single value from the environment database. 656Returns a single value from the environment database.
518 657
519=item cf::db_put $family => $key => $value 658=item cf::db_put $family => $key => $value
527within each server. 666within each server.
528 667
529=cut 668=cut
530 669
531sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
532 my ($name) = @_; 674 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
534 676
535 eval { 677 eval {
536 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
546} 688}
547 689
548our $DB; 690our $DB;
549 691
550sub db_init { 692sub db_init {
551 cf::sync_job {
552 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
553 };
554} 694}
555 695
556sub db_get($$) { 696sub db_get($$) {
557 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
558 698
559 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
560 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
561 703
562 $! ? () 704 $! ? ()
563 : $data 705 : $data
564 }
565} 706}
566 707
567sub db_put($$$) { 708sub db_put($$$) {
568 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
625 766
626 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data); 768 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
629 770
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
631 772
632 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
635 776
645 786
646=cut 787=cut
647 788
648sub datalog($@) { 789sub datalog($@) {
649 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
650 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
651} 792}
652 793
653=back 794=back
654 795
655=cut 796=cut
656 797
657############################################################################# 798#############################################################################
658 799
659=head2 ATTACHABLE OBJECTS 800=head2 ATTACHABLE OBJECTS
660 801
661Many objects in crossfire are so-called attachable objects. That means you can 802Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 803attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 804to it. All such attachable objects support the following methods.
664 805
665In the following description, CLASS can be any of C<global>, C<object> 806In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 807C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 808Deliantra).
668 809
669=over 4 810=over 4
670 811
671=item $attachable->attach ($attachment, key => $value...) 812=item $attachable->attach ($attachment, key => $value...)
672 813
716=item cf::CLASS::attachment $name, ... 857=item cf::CLASS::attachment $name, ...
717 858
718Register an attachment by C<$name> through which attachable objects of the 859Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 860given CLASS can refer to this attachment.
720 861
721Some classes such as crossfire maps and objects can specify attachments 862Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 863that are attached at load/instantiate time, thus the need for a name.
723 864
724These calls expect any number of the following handler/hook descriptions: 865These calls expect any number of the following handler/hook descriptions:
725 866
726=over 4 867=over 4
850 991
851 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
852 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
853 994
854 } elsif (ref $type) { 995 } elsif (ref $type) {
855 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
856 997
857 } else { 998 } else {
858 shift @arg; 999 shift @arg;
859 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
860 } 1001 }
861 } 1002 }
862} 1003}
863 1004
864sub _object_attach { 1005sub _object_attach {
874 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
875 } 1016 }
876 1017
877 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
878 } else { 1019 } else {
879 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
880 } 1021 }
881 1022
882 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
883} 1024}
884 1025
943 1084
944 for (@$callbacks) { 1085 for (@$callbacks) {
945 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
946 1087
947 if ($@) { 1088 if ($@) {
948 warn "$@";
949 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
950 override; 1090 override;
951 } 1091 }
952 1092
953 return 1 if $override; 1093 return 1 if $override;
954 } 1094 }
955 1095
956 0 1096 0
957} 1097}
958 1098
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1099=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1100
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1101=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1102
963Generate an object-specific event with the given arguments. 1103Generate an object-specific event with the given arguments.
964 1104
1017 1157
1018sub reattach { 1158sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1159 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1160 my ($obj) = @_;
1021 1161
1162 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1163 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1164
1024 my $registry = $obj->registry; 1165 my $registry = $obj->registry;
1025 1166
1026 @$registry = (); 1167 @$registry = ();
1027 1168
1032 for (@$attach) { 1173 for (@$attach) {
1033 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1034 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1035 } 1176 }
1036 } else { 1177 } else {
1037 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1038 } 1179 }
1039 } 1180 }
1040} 1181}
1041 1182
1042cf::attachable->attach ( 1183cf::attachable->attach (
1043 prio => -1000000, 1184 prio => -1000000,
1044 on_instantiate => sub { 1185 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1186 my ($obj, $data) = @_;
1046 1187
1047 $data = from_json $data; 1188 $data = decode_json $data;
1048 1189
1049 for (@$data) { 1190 for (@$data) {
1050 my ($name, $args) = @$_; 1191 my ($name, $args) = @$_;
1051 1192
1052 $obj->attach ($name, %{$args || {} }); 1193 $obj->attach ($name, %{$args || {} });
1069 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1070 1211
1071 sync_job { 1212 sync_job {
1072 if (length $$rdata) { 1213 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1076 1218
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1220 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
1081 close $fh; 1226 aio_close $fh;
1082 1227
1083 if (@$objs) { 1228 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1229 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1230 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1233 if ($cf::USE_FSYNC) {
1234 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;
1235 aio_fsync $fh;
1236 }
1089 close $fh; 1237 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1239 }
1092 } else { 1240 } else {
1093 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
1094 } 1242 }
1095 1243
1096 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1248 } else {
1098 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1099 } 1250 }
1100 } else { 1251 } else {
1101 aio_unlink $filename; 1252 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1103 } 1254 }
1127 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs}; 1279 $av = $st->{objs};
1129 } 1280 }
1130 1281
1131 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1132 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1133 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1134 1286
1135 ($data, $av) 1287 ($data, $av)
1136} 1288}
1137 1289
1138=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
1194 my ($name, $cb) = @_; 1346 my ($name, $cb) = @_;
1195 1347
1196 $EXTICMD{$name} = $cb; 1348 $EXTICMD{$name} = $cb;
1197} 1349}
1198 1350
1351use File::Glob ();
1352
1199cf::player->attach ( 1353cf::player->attach (
1200 on_command => sub { 1354 on_unknown_command => sub {
1201 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1202 1356
1203 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1204 or return; 1358 or return;
1205 1359
1228 1382
1229 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1230 if $reply; 1384 if $reply;
1231 1385
1232 } else { 1386 } else {
1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1234 } 1388 }
1235 1389
1236 cf::override; 1390 cf::override;
1237 }, 1391 },
1238); 1392);
1239 1393
1394# "readahead" all extensions
1395sub cache_extensions {
1396 my $grp = IO::AIO::aio_group;
1397
1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1399 for (grep /\.ext$/, @{$_[0]}) {
1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1401 }
1402 };
1403
1404 $grp
1405}
1406
1240sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1241 cf::sync_job { 1410 cf::sync_job {
1242 my %todo; 1411 my %todo;
1243 1412
1244 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1245 next unless -r $path; 1414 next unless -r $path;
1263 1432
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1435
1267 $ext{source} = 1436 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1269 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1270 . $source 1439 . $source
1271 . "\n};\n1"; 1440 . "\n};\n1";
1272 1441
1273 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1274 } 1443 }
1275 1444
1445 my $pass = 0;
1276 my %done; 1446 my %done;
1277 while (%todo) { 1447 while (%todo) {
1278 my $progress; 1448 my $progress;
1279 1449
1450 ++$pass;
1451
1452 ext:
1280 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip 1455 next ext
1283 unless exists $done{$_}; 1456 unless exists $done{$_};
1284 } 1457 }
1285 1458
1286 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1287 1460
1288 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1289 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1290 : "$v->{base}: extension inactive.\n";
1291 1465
1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1467 if exists $v->{meta}{mandatory};
1293 warn $msg; 1468
1294 warn "mandatory extension failed to load, exiting.\n"; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1295 exit 1; 1470 delete $todo{$k};
1296 } 1471 } else {
1297 1472 $done{$k} = delete $todo{$k};
1298 warn $msg; 1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1299 } 1478 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1479 }
1305 1480
1306 skip: 1481 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1309 } 1489 }
1310 }; 1490 };
1311} 1491}
1312 1492
1313############################################################################# 1493#############################################################################
1314 1494
1315=back 1495=back
1316 1496
1317=head2 CORE EXTENSIONS 1497=head2 CORE EXTENSIONS
1318 1498
1319Functions and methods that extend core crossfire objects. 1499Functions and methods that extend core deliantra objects.
1320 1500
1321=cut 1501=cut
1322 1502
1323package cf::player; 1503package cf::player;
1324 1504
1367 1547
1368sub exists($) { 1548sub exists($) {
1369 my ($login) = @_; 1549 my ($login) = @_;
1370 1550
1371 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1373} 1553}
1374 1554
1375sub find($) { 1555sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1557 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1569 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1570 or return;
1391 1571
1392 my $pl = cf::player::load_pl $f 1572 my $pl = cf::player::load_pl $f
1393 or return; 1573 or return;
1574
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1575 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1576 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1397 } 1578 }
1398 } 1579 }
1399} 1580}
1400 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1401sub save($) { 1595sub save($) {
1402 my ($pl) = @_; 1596 my ($pl) = @_;
1403 1597
1404 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1405 1599
1408 1602
1409 return if $pl->{deny_save}; 1603 return if $pl->{deny_save};
1410 1604
1411 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1607
1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1413 1612
1414 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1614 cf::cede_to_tick;
1416} 1615}
1417 1616
1449 my ($pl) = @_; 1648 my ($pl) = @_;
1450 1649
1451 my $name = $pl->ob->name; 1650 my $name = $pl->ob->name;
1452 1651
1453 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1654
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1656 $pl->deactivate;
1657
1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1659 ext::highscore::check ($pl->ob);
1660
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1460 1663
1461 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1704
1502 for my $login (@$dirs) { 1705 for my $login (@$dirs) {
1503 my $path = path $login; 1706 my $path = path $login;
1504 1707
1505 # a .pst is a dead give-away for a valid player 1708 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1709 # if no pst file found, open and chekc for blocked users
1710 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1711 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1712 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1713 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1714 }
1511 1715
1515 1719
1516 \@logins 1720 \@logins
1517} 1721}
1518 1722
1519=item $player->maps 1723=item $player->maps
1724
1725=item cf::player::maps $login
1520 1726
1521Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1522player. May block. 1728player. May block.
1523 1729
1524=cut 1730=cut
1542 } 1748 }
1543 1749
1544 \@paths 1750 \@paths
1545} 1751}
1546 1752
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1753=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1754
1549Expand crossfire pod fragments into protocol xml. 1755Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553sub expand_cfpod {
1554 ((my $self), (local $_)) = @_;
1555
1556 # escape & and <
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559
1560 # this is buggy, it needs to properly take care of nested <'s
1561
1562 1 while
1563 # replace B<>, I<>, U<> etc.
1564 s/B<([^\>]*)>/<b>$1<\/b>/
1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1568 # replace G<male|female> tags
1569 || s{G<([^>|]*)\|([^>]*)>}{
1570 $self->gender ? $2 : $1
1571 }ge
1572 # replace H<hint text>
1573 || s{H<([^\>]*)>}
1574 {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "")
1578 [$self->{hintmode}]
1579 }ge;
1580
1581 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g;
1583
1584 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1589
1590 $_
1591}
1592
1593sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode}
1596}
1597 1756
1598=item $player->ext_reply ($msgid, @msg) 1757=item $player->ext_reply ($msgid, @msg)
1599 1758
1600Sends an ext reply to the player. 1759Sends an ext reply to the player.
1601 1760
1633 1792
1634=cut 1793=cut
1635 1794
1636sub find_by_path($) { 1795sub find_by_path($) {
1637 my ($path) = @_; 1796 my ($path) = @_;
1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1638 1799
1639 my ($match, $specificity); 1800 my ($match, $specificity);
1640 1801
1641 for my $region (list) { 1802 for my $region (list) {
1642 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1668our $MAX_RESET = 3600; 1829our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1830our $DEFAULT_RESET = 3000;
1670 1831
1671sub generate_random_map { 1832sub generate_random_map {
1672 my ($self, $rmp) = @_; 1833 my ($self, $rmp) = @_;
1834
1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1836
1673 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1674 $self->_create_random_map ( 1838 $self->_create_random_map (
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1678 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1679 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1680 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1681 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1696 1860
1697sub register { 1861sub register {
1698 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1699 my $pkg = caller; 1863 my $pkg = caller;
1700 1864
1701 no strict;
1702 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1703 1866
1704 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1705} 1868}
1706 1869
1707# also paths starting with '/' 1870# also paths starting with '/'
1708$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1709 1872
1710sub thawer_merge { 1873sub thawer_merge {
1711 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1712 1875
1713 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1718} 1881}
1719 1882
1720sub normalise { 1883sub normalise {
1721 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1722 1885
1723 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1724 1887
1725 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1726 1889
1727 # map plan: 1890 # map plan:
1728 # 1891 #
1767 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1768 return $self; 1931 return $self;
1769 } 1932 }
1770 } 1933 }
1771 1934
1772 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1773 () 1936 ()
1774} 1937}
1775 1938
1776sub init { 1939sub init {
1777 my ($self) = @_; 1940 my ($self) = @_;
1799 1962
1800# the temporary/swap location 1963# the temporary/swap location
1801sub save_path { 1964sub save_path {
1802 my ($self) = @_; 1965 my ($self) = @_;
1803 1966
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1967 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 1968 "$TMPDIR/$path.map"
1806} 1969}
1807 1970
1808# the unique path, undef == no special unique path 1971# the unique path, undef == no special unique path
1809sub uniq_path { 1972sub uniq_path {
1810 my ($self) = @_; 1973 my ($self) = @_;
1811 1974
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 1976 "$UNIQUEDIR/$path"
1814}
1815
1816# and all this just because we cannot iterate over
1817# all maps in C++...
1818sub change_all_map_light {
1819 my ($change) = @_;
1820
1821 $_->change_map_light ($change)
1822 for grep $_->outdoor, values %cf::MAP;
1823} 1977}
1824 1978
1825sub decay_objects { 1979sub decay_objects {
1826 my ($self) = @_; 1980 my ($self) = @_;
1827 1981
1909 2063
1910sub find; 2064sub find;
1911sub find { 2065sub find {
1912 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
1913 2067
2068 cf::cede_to_tick;
2069
1914 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1915 2071
1916 cf::lock_wait "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
1918 2074
1919 $cf::MAP{$path} || do { 2075 $cf::MAP{$path} || do {
1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1923 my $map = new_from_path cf::map $path 2076 my $map = new_from_path cf::map $path
1924 or return; 2077 or return;
1925 2078
1926 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
1927 2080
1929 or return; 2082 or return;
1930 2083
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2084 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 2085 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 2086 #$cf::WAIT_FOR_TICK->wait;
2087 undef $guard2;
1934 undef $guard1; 2088 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 2089 $map->reset;
1937 return find $path; 2090 return find $path;
1938 } 2091 }
1939 2092
1940 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
1941 } 2094 }
1942} 2095}
1943 2096
1944sub pre_load { } 2097sub pre_load { }
1945sub post_load { } 2098#sub post_load { } # XS
1946 2099
1947sub load { 2100sub load {
1948 my ($self) = @_; 2101 my ($self) = @_;
1949 2102
1950 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
1967 my $f = new_from_file cf::object::thawer $self->{load_path}; 2120 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block; 2121 $f->skip_block;
1969 $self->_load_objects ($f) 2122 $self->_load_objects ($f)
1970 or return; 2123 or return;
1971 2124
1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2125 $self->post_load_original
1973 if delete $self->{load_original}; 2126 if delete $self->{load_original};
1974 2127
1975 if (my $uniq = $self->uniq_path) { 2128 if (my $uniq = $self->uniq_path) {
1976 utf8::encode $uniq; 2129 utf8::encode $uniq;
1977 unless (aio_stat $uniq) { 2130 unless (aio_stat $uniq) {
1995 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
1996 $self->decay_objects; 2149 $self->decay_objects;
1997 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
1998 $self->update_buttons; 2151 $self->update_buttons;
1999 cf::cede_to_tick; 2152 cf::cede_to_tick;
2000 $self->set_darkness_map;
2001 cf::cede_to_tick;
2002 $self->activate; 2153 $self->activate;
2003 } 2154 }
2004 2155
2005 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2157 $self->last_access ($cf::RUNTIME);
2007 2158
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2159 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2160 }
2010 2161
2011 $self->post_load; 2162 $self->post_load;
2012} 2163}
2013 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2014sub customise_for { 2168sub customise_for {
2015 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2016 2170
2017 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2018 if $self->per_player; 2172 if $self->per_player;
2034 or next; 2188 or next;
2035 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2036 or next; 2190 or next;
2037 $neigh->load; 2191 $neigh->load;
2038 2192
2193 # now find the diagonal neighbours
2039 push @neigh, 2194 push @neigh,
2040 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2041 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2042 } 2197 }
2043 2198
2050} 2205}
2051 2206
2052sub find_sync { 2207sub find_sync {
2053 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2054 2209
2055 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2056} 2214}
2057 2215
2058sub do_load_sync { 2216sub do_load_sync {
2059 my ($map) = @_; 2217 my ($map) = @_;
2060 2218
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2063 2221
2064 cf::sync_job { $map->load }; 2222 $map->load;
2065} 2223}
2066 2224
2067our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2068our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2069 2227
2071 my ($path, $origin, $load) = @_; 2229 my ($path, $origin, $load) = @_;
2072 2230
2073 $path = normalise $path, $origin && $origin->{path}; 2231 $path = normalise $path, $origin && $origin->{path};
2074 2232
2075 if (my $map = $cf::MAP{$path}) { 2233 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2234 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2235 }
2078 2236
2079 $MAP_PREFETCH{$path} |= $load; 2237 $MAP_PREFETCH{$path} |= $load;
2080 2238
2081 $MAP_PREFETCHER ||= cf::async { 2239 $MAP_PREFETCHER ||= cf::async {
2095 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2096 2254
2097 () 2255 ()
2098} 2256}
2099 2257
2258# common code, used by both ->save and ->swapout
2100sub save { 2259sub _save {
2101 my ($self) = @_; 2260 my ($self) = @_;
2102
2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2261
2105 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2106 2263
2107 return unless $self->dirty; 2264 return unless $self->dirty;
2108 2265
2117 2274
2118 cf::async { 2275 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2276 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2277 $_->contr->save for $self->players;
2121 }; 2278 };
2279
2280 cf::get_slot 0.02;
2122 2281
2123 if ($uniq) { 2282 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2283 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2284 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2285 } else {
2127 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2128 } 2287 }
2129} 2288}
2130 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2131sub swap_out { 2298sub swap_out {
2132 my ($self) = @_; 2299 my ($self) = @_;
2133 2300
2134 # save first because save cedes
2135 $self->save;
2136
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2302
2303 return if $self->in_memory != cf::MAP_ACTIVE;
2304 return if $self->{deny_save};
2139 return if $self->players; 2305 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
2141 return if $self->{deny_save};
2142 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2143 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2144 2357
2145 $self->deactivate; 2358 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2147 $self->clear; 2360 $self->clear;
2148}
2149
2150sub reset_at {
2151 my ($self) = @_;
2152
2153 # TODO: safety, remove and allow resettable per-player maps
2154 return 1e99 if $self->{deny_reset};
2155
2156 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2157 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2158
2159 $time + $to
2160}
2161
2162sub should_reset {
2163 my ($self) = @_;
2164
2165 $self->reset_at <= $cf::RUNTIME
2166}
2167
2168sub reset {
2169 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172
2173 return if $self->players;
2174
2175 warn "resetting map ", $self->path;
2176
2177 $self->in_memory (cf::MAP_SWAPPED);
2178
2179 # need to save uniques path
2180 unless ($self->{deny_save}) {
2181 my $uniq = $self->uniq_path; utf8::encode $uniq;
2182
2183 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2184 if $uniq;
2185 }
2186
2187 delete $cf::MAP{$self->path};
2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2191 $self->clear;
2192 2361
2193 $self->unlink_save; 2362 $self->unlink_save;
2194 $self->destroy; 2363 $self->destroy;
2195} 2364}
2196 2365
2204 2373
2205 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2206 2375
2207 $self->unlink_save; 2376 $self->unlink_save;
2208 2377
2209 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2210 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2211 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2212 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2214 2383
2263 2432
2264sub unique_maps() { 2433sub unique_maps() {
2265 [ 2434 [
2266 map { 2435 map {
2267 utf8::decode $_; 2436 utf8::decode $_;
2268 /\.map$/ 2437 s/\.map$//; # TODO future compatibility hack
2438 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2439 ? ()
2269 ? normalise $_ 2440 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2441 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2442 ]
2273} 2443}
2274 2444
2275package cf; 2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
2276 2476
2277=back 2477=back
2278 2478
2279=head3 cf::object 2479=head3 cf::object
2280 2480
2284 2484
2285=over 4 2485=over 4
2286 2486
2287=item $ob->inv_recursive 2487=item $ob->inv_recursive
2288 2488
2289Returns the inventory of the object _and_ their inventories, recursively. 2489Returns the inventory of the object I<and> their inventories, recursively,
2490but I<not> the object itself.
2290 2491
2291=cut 2492=cut
2292 2493
2293sub inv_recursive_; 2494sub inv_recursive_;
2294sub inv_recursive_ { 2495sub inv_recursive_ {
2299 inv_recursive_ inv $_[0] 2500 inv_recursive_ inv $_[0]
2300} 2501}
2301 2502
2302=item $ref = $ob->ref 2503=item $ref = $ob->ref
2303 2504
2304creates and returns a persistent reference to an objetc that can be stored as a string. 2505Creates and returns a persistent reference to an object that can be stored as a string.
2305 2506
2306=item $ob = cf::object::deref ($refstring) 2507=item $ob = cf::object::deref ($refstring)
2307 2508
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2509returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block. 2510even if the object actually exists. May block.
2341can be C<undef>. Does the right thing when the player is currently in a 2542can be C<undef>. Does the right thing when the player is currently in a
2342dialogue with the given NPC character. 2543dialogue with the given NPC character.
2343 2544
2344=cut 2545=cut
2345 2546
2547our $SAY_CHANNEL = {
2548 id => "say",
2549 title => "Map",
2550 reply => "say ",
2551 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2552};
2553
2554our $CHAT_CHANNEL = {
2555 id => "chat",
2556 title => "Chat",
2557 reply => "chat ",
2558 tooltip => "Player chat and shouts, global to the server.",
2559};
2560
2346# rough implementation of a future "reply" method that works 2561# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2562# with dialog boxes.
2348#TODO: the first argument must go, split into a $npc->reply_to ( method 2563#TODO: the first argument must go, split into a $npc->reply_to ( method
2349sub cf::object::player::reply($$$;$) { 2564sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2565 my ($self, $npc, $msg, $flags) = @_;
2361 my $dialog = $pl->{npc_dialog}; 2576 my $dialog = $pl->{npc_dialog};
2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2577 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363 2578
2364 } else { 2579 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2580 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2581 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2582 }
2368 } 2583 }
2369} 2584}
2370 2585
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2586=item $object->send_msg ($channel, $msg, $color, [extra...])
2396 2611
2397=item $player_object->enter_link 2612=item $player_object->enter_link
2398 2613
2399Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2400 2615
2401The player should be reasonably safe there for short amounts of time. You 2616The player should be reasonably safe there for short amounts of time (e.g.
2402I<MUST> call C<leave_link> as soon as possible, though. 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2618though, as the player cannot control the character while it is on the link
2619map.
2403 2620
2404Will never block. 2621Will never block.
2405 2622
2406=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2407 2624
2427sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2428 my ($self) = @_; 2645 my ($self) = @_;
2429 2646
2430 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2431 2648
2649 ++$self->{_link_recursion};
2650
2432 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2433 2652
2434 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2435 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2436 2655
2437 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2438} 2657}
2439 2658
2440sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2441 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2442 2661
2459 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
2460 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
2461 2680
2462 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
2463 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
2464 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
2465 2684
2466 $map->load; 2685 $map->load;
2467 $map->load_neighbours; 2686 $map->load_neighbours;
2468 2687
2469 return unless $self->contr->active; 2688 return unless $self->contr->active;
2470 $self->activate_recursive;
2471 2689
2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2474} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
2475 2697
2698}
2699
2476=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2477 2701
2478Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2479her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2480that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2481the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
2482be called at the end of this process. 2706be called at the end of this process.
2483 2707
2708Note that $check will be called with a potentially non-loaded map, so if
2709it needs a loaded map it has to call C<< ->load >>.
2710
2484=cut 2711=cut
2485 2712
2486our $GOTOGEN; 2713our $GOTOGEN;
2487 2714
2488sub cf::object::player::goto { 2715sub cf::object::player::goto {
2489 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2490 2723
2491 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2493 2726
2494 $self->enter_link; 2727 $self->enter_link;
2518 my $map = eval { 2751 my $map = eval {
2519 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2520 2753
2521 if ($map) { 2754 if ($map) {
2522 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2523 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2524 } else { 2757 } else {
2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2526 } 2759 }
2527 2760
2528 $map 2761 $map
2536 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2537 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2538 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2539 } 2772 }
2540 2773
2541 $done->() if $done; 2774 $done->($self) if $done;
2542 })->prio (1); 2775 })->prio (1);
2543} 2776}
2544 2777
2545=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2546 2779
2566} 2799}
2567 2800
2568sub prepare_random_map { 2801sub prepare_random_map {
2569 my ($exit) = @_; 2802 my ($exit) = @_;
2570 2803
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2804 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2805 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2806 # that depends on the exit object
2576 2807
2577 my $rmp = parse_random_map_params $exit->msg; 2808 my $rmp = parse_random_map_params $exit->msg;
2579 if ($exit->map) { 2810 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2811 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2812 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2813 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2814 $rmp->{origin_y} = $exit->y;
2815
2816 $exit->map->touch;
2584 } 2817 }
2585 2818
2586 $rmp->{random_seed} ||= $exit->random_seed; 2819 $rmp->{random_seed} ||= $exit->random_seed;
2587 2820
2588 my $data = cf::to_json $rmp; 2821 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2822 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2823 my $meta = "$RANDOMDIR/$md5.meta";
2591 2824
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2825 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2826 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2827 undef $fh;
2595 aio_rename "$meta~", $meta; 2828 aio_rename "$meta~", $meta;
2596 2829
2830 my $slaying = "?random/$md5";
2831
2832 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2833 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2834 $exit->msg (undef);
2835 }
2599 } 2836 }
2600} 2837}
2601 2838
2602sub cf::object::player::enter_exit { 2839sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2840 my ($self, $exit) = @_;
2604 2841
2605 return unless $self->type == cf::PLAYER; 2842 return unless $self->type == cf::PLAYER;
2606 2843
2607 if ($exit->slaying eq "/!") {
2608 #TODO: this should de-fi-ni-te-ly not be a sync-job
2609 # the problem is that $exit might not survive long enough
2610 # so it needs to be done right now, right here
2611 cf::sync_job { prepare_random_map $exit };
2612 }
2613
2614 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615 my $hp = $exit->stats->hp;
2616 my $sp = $exit->stats->sp;
2617
2618 $self->enter_link; 2844 $self->enter_link;
2619 2845
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2624 (async { 2846 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2847 $Coro::current->{desc} = "enter_exit";
2626 2848
2627 $self->deactivate_recursive; # just to be sure
2628 unless (eval { 2849 unless (eval {
2850 $self->deactivate_recursive; # just to be sure
2851
2852 # random map handling
2853 {
2854 my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856 prepare_random_map $exit
2857 if $exit->slaying eq "/!";
2858 }
2859
2860 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2861 my $x = $exit->stats->hp;
2862 my $y = $exit->stats->sp;
2863
2629 $self->goto ($slaying, $hp, $sp); 2864 $self->goto ($map, $x, $y);
2630 2865
2866 # if exit is damned, update players death & WoR home-position
2867 $self->contr->savebed ($map, $x, $y)
2868 if $exit->flag (cf::FLAG_DAMNED);
2869
2631 1; 2870 1
2632 }) { 2871 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2634 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2635 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2637 2876
2638 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2639 $self->leave_link; 2878 $self->leave_link;
2640 } 2879 }
2641 })->prio (1); 2880 })->prio (1);
2642} 2881}
2643 2882
2655sub cf::client::send_drawinfo { 2894sub cf::client::send_drawinfo {
2656 my ($self, $text, $flags) = @_; 2895 my ($self, $text, $flags) = @_;
2657 2896
2658 utf8::encode $text; 2897 utf8::encode $text;
2659 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899}
2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2660} 2924}
2661 2925
2662=item $client->send_msg ($channel, $msg, $color, [extra...]) 2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2663 2927
2664Send a drawinfo or msg packet to the client, formatting the msg for the 2928Send a drawinfo or msg packet to the client, formatting the msg for the
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2930the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2931the message unless the client supports the msg packet.
2668 2932
2669=cut 2933=cut
2670 2934
2935# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2672 "c/identify" => { 2943 "c/identify" => {
2673 id => "infobox", 2944 id => "infobox",
2674 title => "Identify", 2945 title => "Identify",
2675 reply => undef, 2946 reply => undef,
2676 tooltip => "Items recently identified", 2947 tooltip => "Items recently identified",
2678 "c/examine" => { 2949 "c/examine" => {
2679 id => "infobox", 2950 id => "infobox",
2680 title => "Examine", 2951 title => "Examine",
2681 reply => undef, 2952 reply => undef,
2682 tooltip => "Signs and other items you examined", 2953 tooltip => "Signs and other items you examined",
2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2683 }, 2960 },
2684 "c/book" => { 2961 "c/book" => {
2685 id => "infobox", 2962 id => "infobox",
2686 title => "Book", 2963 title => "Book",
2687 reply => undef, 2964 reply => undef,
2691 id => "infobox", 2968 id => "infobox",
2692 title => "Look", 2969 title => "Look",
2693 reply => undef, 2970 reply => undef,
2694 tooltip => "What you saw there", 2971 tooltip => "What you saw there",
2695 }, 2972 },
2973 "c/who" => {
2974 id => "infobox",
2975 title => "Players",
2976 reply => undef,
2977 tooltip => "Shows players who are currently online",
2978 },
2979 "c/body" => {
2980 id => "infobox",
2981 title => "Body Parts",
2982 reply => undef,
2983 tooltip => "Shows which body parts you posess and are available",
2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2991 "c/skills" => {
2992 id => "infobox",
2993 title => "Skills",
2994 reply => undef,
2995 tooltip => "Shows your experience per skill and item power",
2996 },
2997 "c/shopitems" => {
2998 id => "infobox",
2999 title => "Shop Items",
3000 reply => undef,
3001 tooltip => "Shows the items currently for sale in this shop",
3002 },
3003 "c/resistances" => {
3004 id => "infobox",
3005 title => "Resistances",
3006 reply => undef,
3007 tooltip => "Shows your resistances",
3008 },
3009 "c/pets" => {
3010 id => "infobox",
3011 title => "Pets",
3012 reply => undef,
3013 tooltip => "Shows information abotu your pets/a specific pet",
3014 },
3015 "c/perceiveself" => {
3016 id => "infobox",
3017 title => "Perceive Self",
3018 reply => undef,
3019 tooltip => "You gained detailed knowledge about yourself",
3020 },
3021 "c/uptime" => {
3022 id => "infobox",
3023 title => "Uptime",
3024 reply => undef,
3025 tooltip => "How long the server has been running since last restart",
3026 },
3027 "c/mapinfo" => {
3028 id => "infobox",
3029 title => "Map Info",
3030 reply => undef,
3031 tooltip => "Information related to the maps",
3032 },
3033 "c/party" => {
3034 id => "party",
3035 title => "Party",
3036 reply => "gsay ",
3037 tooltip => "Messages and chat related to your party",
3038 },
3039 "c/death" => {
3040 id => "death",
3041 title => "Death",
3042 reply => undef,
3043 tooltip => "Reason for and more info about your most recent death",
3044 },
3045 "c/say" => $SAY_CHANNEL,
3046 "c/chat" => $CHAT_CHANNEL,
2696); 3047);
2697 3048
2698sub cf::client::send_msg { 3049sub cf::client::send_msg {
2699 my ($self, $channel, $msg, $color, @extra) = @_; 3050 my ($self, $channel, $msg, $color, @extra) = @_;
2700 3051
2701 $msg = $self->pl->expand_cfpod ($msg); 3052 $msg = $self->pl->expand_cfpod ($msg)
3053 unless $color & cf::NDI_VERBATIM;
2702 3054
2703 $color &= cf::NDI_CLIENT_MASK; # just in case... 3055 $color &= cf::NDI_CLIENT_MASK; # just in case...
2704 3056
2705 # check predefined channels, for the benefit of C 3057 # check predefined channels, for the benefit of C
2706 if ($CHANNEL{$channel}) { 3058 if ($CHANNEL{$channel}) {
2707 $channel = $CHANNEL{$channel}; 3059 $channel = $CHANNEL{$channel};
2708 3060
2709 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2710 if $self->can_msg;
2711
2712 $channel = $channel->{id}; 3062 $channel = $channel->{id};
2713 3063
2714 } elsif (ref $channel) { 3064 } elsif (ref $channel) {
2715 # send meta info to client, if not yet sent 3065 # send meta info to client, if not yet sent
2716 unless (exists $self->{channel}{$channel->{id}}) { 3066 unless (exists $self->{channel}{$channel->{id}}) {
2717 $self->{channel}{$channel->{id}} = $channel; 3067 $self->{channel}{$channel->{id}} = $channel;
2718 $self->ext_msg (channel_info => $channel) 3068 $self->ext_msg (channel_info => $channel);
2719 if $self->can_msg;
2720 } 3069 }
2721 3070
2722 $channel = $channel->{id}; 3071 $channel = $channel->{id};
2723 } 3072 }
2724 3073
2725 return unless @extra || length $msg; 3074 return unless @extra || length $msg;
2726 3075
2727 if ($self->can_msg) {
2728 # default colour, mask it out 3076 # default colour, mask it out
2729 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2730 if $color & cf::NDI_DEF; 3078 if $color & cf::NDI_DEF;
2731 3079
2732 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3080 my $pkt = "msg "
3081 . $self->{json_coder}->encode (
2733 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2734 } else { 3083 );
2735 if ($color >= 0) {
2736 # replace some tags by gcfclient-compatible ones
2737 for ($msg) {
2738 1 while
2739 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2740 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2741 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2742 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2743 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2744 }
2745 3084
2746 $color &= cf::NDI_COLOR_MASK; 3085 $self->send_big_packet ($pkt);
2747
2748 utf8::encode $msg;
2749
2750 if (0 && $msg =~ /\[/) {
2751 # COMMAND/INFO
2752 $self->send_packet ("drawextinfo $color 10 8 $msg")
2753 } else {
2754 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2755 $self->send_packet ("drawinfo $color $msg")
2756 }
2757 }
2758 }
2759} 3086}
2760 3087
2761=item $client->ext_msg ($type, @msg) 3088=item $client->ext_msg ($type, @msg)
2762 3089
2763Sends an ext event to the client. 3090Sends an ext event to the client.
2766 3093
2767sub cf::client::ext_msg($$@) { 3094sub cf::client::ext_msg($$@) {
2768 my ($self, $type, @msg) = @_; 3095 my ($self, $type, @msg) = @_;
2769 3096
2770 if ($self->extcmd == 2) { 3097 if ($self->extcmd == 2) {
2771 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2772 } elsif ($self->extcmd == 1) { # TODO: remove 3099 } elsif ($self->extcmd == 1) { # TODO: remove
2773 push @msg, msgtype => "event_$type"; 3100 push @msg, msgtype => "event_$type";
2774 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2775 } 3102 }
2776} 3103}
2777 3104
2778=item $client->ext_reply ($msgid, @msg) 3105=item $client->ext_reply ($msgid, @msg)
2779 3106
2783 3110
2784sub cf::client::ext_reply($$@) { 3111sub cf::client::ext_reply($$@) {
2785 my ($self, $id, @msg) = @_; 3112 my ($self, $id, @msg) = @_;
2786 3113
2787 if ($self->extcmd == 2) { 3114 if ($self->extcmd == 2) {
2788 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2789 } elsif ($self->extcmd == 1) { 3116 } elsif ($self->extcmd == 1) {
2790 #TODO: version 1, remove 3117 #TODO: version 1, remove
2791 unshift @msg, msgtype => "reply", msgid => $id; 3118 unshift @msg, msgtype => "reply", msgid => $id;
2792 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2793 } 3120 }
2794} 3121}
2795 3122
2796=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2797 3124
2868 3195
2869 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
2870 if $reply; 3197 if $reply;
2871 3198
2872 } else { 3199 } else {
2873 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2874 } 3201 }
2875 3202
2876 cf::override; 3203 cf::override;
2877 }, 3204 },
2878); 3205);
2898 3225
2899 $coro 3226 $coro
2900} 3227}
2901 3228
2902cf::client->attach ( 3229cf::client->attach (
2903 on_destroy => sub { 3230 on_client_destroy => sub {
2904 my ($ns) = @_; 3231 my ($ns) = @_;
2905 3232
2906 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2907 }, 3234 },
2908); 3235);
2924our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
2925 3252
2926$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
2927 3254
2928$safe->permit_only (Opcode::opset qw( 3255$safe->permit_only (Opcode::opset qw(
2929 :base_core :base_mem :base_orig :base_math 3256 :base_core :base_mem :base_orig :base_math :base_loop
2930 grepstart grepwhile mapstart mapwhile 3257 grepstart grepwhile mapstart mapwhile
2931 sort time 3258 sort time
2932)); 3259));
2933 3260
2934# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
2937 3264
2938The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
2939 3266
2940 cf::object 3267 cf::object
2941 contr pay_amount pay_player map x y force_find force_add destroy 3268 contr pay_amount pay_player map x y force_find force_add destroy
2942 insert remove name archname title slaying race decrease_ob_nr 3269 insert remove name archname title slaying race decrease split
3270 value
2943 3271
2944 cf::object::player 3272 cf::object::player
2945 player 3273 player
2946 3274
2947 cf::player 3275 cf::player
2952 3280
2953=cut 3281=cut
2954 3282
2955for ( 3283for (
2956 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3284 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2957 insert remove inv name archname title slaying race 3285 insert remove inv nrof name archname title slaying race
2958 decrease_ob_nr destroy)], 3286 decrease split destroy change_exp value msg lore send_msg)],
2959 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
2960 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
2961 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
2962) { 3290) {
2963 no strict 'refs';
2964 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
2965 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2966 for @funs; 3293 for @funs;
2967} 3294}
2968 3295
2983 3310
2984 my $qcode = $code; 3311 my $qcode = $code;
2985 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2986 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
2987 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
2988 local $_; 3318 local $_;
2989 local @safe::cf::_safe_eval_args = values %vars;
2990 3319
2991 my $eval = 3320 my $eval =
2992 "do {\n" 3321 "do {\n"
2993 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2994 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
2995 . $code 3324 . $code
2996 . "\n}" 3325 . "\n}"
2997 ; 3326 ;
2998 3327
3328 if ($CFG{safe_eval}) {
2999 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
3000 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3001 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
3002 3337
3003 if ($@) { 3338 if ($@) {
3004 warn "$@"; 3339 warn "$@",
3005 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3006 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3007 } 3342 }
3008 3343
3009 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3010} 3345}
3011 3346
3025=cut 3360=cut
3026 3361
3027sub register_script_function { 3362sub register_script_function {
3028 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3029 3364
3030 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3031 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3032} 3367}
3033 3368
3034=back 3369=back
3035 3370
3036=cut 3371=cut
3045 # for this (global event?) 3380 # for this (global event?)
3046 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3047 3382
3048 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3049 3384
3050 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3051 3386
3052 my $facedata;
3053 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3054 or die "$path: $!"; 3388 or die "$path: $!";
3055 3389
3056 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3057 3391
3058 $facedata->{version} == 2 3392 $facedata->{version} == 2
3059 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
3060 3394
3061 # patch in the exptable 3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3062 $facedata->{resource}{"res/exp_table"} = { 3397 $facedata->{resource}{"res/exp_table"} = {
3063 type => FT_RSRC, 3398 type => FT_RSRC,
3064 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3065 }; 3401 };
3066 cf::cede_to_tick; 3402 cf::cede_to_tick;
3067 3403
3068 { 3404 {
3069 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
3070 3406
3071 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3072 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3409
3073 cf::face::set_visibility $idx, $info->{visibility}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3074 cf::face::set_magicmap $idx, $info->{magicmap}; 3411 cf::face::set_magicmap $idx, $info->{magicmap};
3075 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3076 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3077 3414
3078 cf::cede_to_tick; 3415 cf::cede_to_tick;
3079 } 3416 }
3080 3417
3081 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
3082 next unless $info->{smooth}; 3419 next unless $info->{smooth};
3420
3083 my $idx = cf::face::find $face 3421 my $idx = cf::face::find $face
3084 or next; 3422 or next;
3423
3085 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3086 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3087 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3088 } else { 3427 } else {
3089 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3090 } 3429 }
3091 3430
3092 cf::cede_to_tick; 3431 cf::cede_to_tick;
3093 } 3432 }
3094 } 3433 }
3103 3442
3104 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
3105 } 3444 }
3106 3445
3107 { 3446 {
3108 # TODO: for gcfclient pleasure, we should give resources
3109 # that gcfclient doesn't grok a >10000 face index.
3110 my $res = $facedata->{resource}; 3447 my $res = $facedata->{resource};
3111 3448
3112 my $soundconf = delete $res->{"res/sound.conf"};
3113
3114 while (my ($name, $info) = each %$res) { 3449 while (my ($name, $info) = each %$res) {
3450 if (defined $info->{type}) {
3115 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116 my $data;
3117 3452
3118 if ($info->{type} & 1) { 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3119 # prepend meta info 3454 cf::face::set_type $idx, $info->{type};
3120
3121 my $meta = $enc->encode ({
3122 name => $name,
3123 %{ $info->{meta} || {} },
3124 });
3125
3126 $data = pack "(w/a*)*", $meta, $info->{data};
3127 } else { 3455 } else {
3128 $data = $info->{data}; 3456 $RESOURCE{$name} = $info; # unused
3129 } 3457 }
3130 3458
3131 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3132 cf::face::set_type $idx, $info->{type};
3133
3134 cf::cede_to_tick; 3459 cf::cede_to_tick;
3135 } 3460 }
3136
3137 if ($soundconf) {
3138 $soundconf = $enc->decode (delete $soundconf->{data});
3139
3140 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3141 my $sound = $soundconf->{compat}[$_]
3142 or next;
3143
3144 my $face = cf::face::find "sound/$sound->[1]";
3145 cf::sound::set $sound->[0] => $face;
3146 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3147 }
3148
3149 while (my ($k, $v) = each %{$soundconf->{event}}) {
3150 my $face = cf::face::find "sound/$v";
3151 cf::sound::set $k => $face;
3152 }
3153 }
3154 } 3461 }
3462
3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3155 3464
3156 1 3465 1
3157} 3466}
3158 3467
3159register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3161 3470
3162 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3163 $ns->fx_want ($k, $v); 3472 $ns->fx_want ($k, $v);
3164 } 3473 }
3165}; 3474};
3475
3476sub load_resource_file($) {
3477 my $guard = lock_acquire "load_resource_file";
3478
3479 my $status = load_resource_file_ $_[0];
3480 get_slot 0.1, 100;
3481 cf::arch::commit_load;
3482
3483 $status
3484}
3166 3485
3167sub reload_regions { 3486sub reload_regions {
3168 # HACK to clear player env face cache, we need some signal framework 3487 # HACK to clear player env face cache, we need some signal framework
3169 # for this (global event?) 3488 # for this (global event?)
3170 %ext::player_env::MUSIC_FACE_CACHE = (); 3489 %ext::player_env::MUSIC_FACE_CACHE = ();
3184} 3503}
3185 3504
3186sub reload_archetypes { 3505sub reload_archetypes {
3187 load_resource_file "$DATADIR/archetypes" 3506 load_resource_file "$DATADIR/archetypes"
3188 or die "unable to load archetypes\n"; 3507 or die "unable to load archetypes\n";
3189 #d# NEED to laod twice to resolve forward references
3190 # this really needs to be done in an extra post-pass
3191 # (which needs to be synchronous, so solve it differently)
3192 load_resource_file "$DATADIR/archetypes"
3193 or die "unable to load archetypes\n";
3194} 3508}
3195 3509
3196sub reload_treasures { 3510sub reload_treasures {
3197 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3198 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3199} 3513}
3200 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3201sub reload_resources { 3538sub reload_resources {
3202 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3203 3540
3541 reload_exp_table;
3542 reload_materials;
3543 reload_facedata;
3544 reload_sound;
3545 reload_archetypes;
3204 reload_regions; 3546 reload_regions;
3205 reload_facedata;
3206 #reload_archetypes;#d#
3207 reload_archetypes;
3208 reload_treasures; 3547 reload_treasures;
3209 3548
3210 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3211}
3212
3213sub init {
3214 reload_resources;
3215} 3550}
3216 3551
3217sub reload_config { 3552sub reload_config {
3218 open my $fh, "<:utf8", "$CONFDIR/config" 3553 trace "reloading config file...\n";
3219 or return;
3220 3554
3221 local $/; 3555 0 < aio_load "$CONFDIR/config", my $config
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3222 *CFG = YAML::Syck::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
3223 3562
3224 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3225 3564
3226 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3227 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3228 3567
3229 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
3233 }; 3572 };
3234 warn $@ if $@; 3573 warn $@ if $@;
3235 } 3574 }
3236} 3575}
3237 3576
3577sub pidfile() {
3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3579 or die "$PIDFILE: $!";
3580 flock $fh, &Fcntl::LOCK_EX
3581 or die "$PIDFILE: flock: $!";
3582 $fh
3583}
3584
3585# make sure only one server instance is running at any one time
3586sub atomic {
3587 my $fh = pidfile;
3588
3589 my $pid = <$fh>;
3590 kill 9, $pid if $pid > 0;
3591
3592 seek $fh, 0, 0;
3593 print $fh $$;
3594}
3595
3596sub main_loop {
3597 trace "EV::loop starting\n";
3598 if (1) {
3599 EV::loop;
3600 }
3601 trace "EV::loop returned\n";
3602 goto &main_loop unless $REALLY_UNLOOP;
3603}
3604
3238sub main { 3605sub main {
3606 cf::init_globals; # initialise logging
3607
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614
3239 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3240 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3617 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3242 (async { 3618 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3244 Event::one_event; 3620 EV::loop EV::LOOP_ONESHOT;
3245 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
3246 }; 3622 };
3247 3623
3624 evthread_start IO::AIO::poll_fileno;
3625
3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3635 reload_resources;
3248 reload_config; 3636 reload_config;
3249 db_init; 3637 db_init;
3638
3639 cf::init_uuid;
3640 cf::init_signals;
3641 cf::init_skills;
3642
3643 cf::init_beforeplay;
3644
3645 atomic;
3646
3250 load_extensions; 3647 load_extensions;
3251 3648
3252 $TICK_WATCHER->start; 3649 utime time, time, $RUNTIMEFILE;
3253 Event::loop; 3650
3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654
3655 (pop @POST_INIT)->(0) while @POST_INIT;
3656 };
3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3666 goto &main_loop;
3254} 3667}
3255 3668
3256############################################################################# 3669#############################################################################
3257# initialisation and cleanup 3670# initialisation and cleanup
3258 3671
3259# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3260BEGIN { 3673BEGIN {
3674 our %SIGWATCHER = ();
3261 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3262 Event->signal ( 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3263 reentrant => 0,
3264 data => WF_AUTOCANCEL,
3265 signal => $signal,
3266 prio => 0,
3267 cb => sub {
3268 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3269 },
3270 ); 3678 };
3271 } 3679 }
3272} 3680}
3273 3681
3274sub write_runtime { 3682sub write_runtime_sync {
3275 my $runtime = "$LOCALDIR/runtime"; 3683 my $t0 = AE::time;
3276 3684
3277 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3278 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3279 3687
3280 IO::AIO::aio_utime $runtime, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3281 3689
3282 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3283 3691
3284 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3285 or return; 3693 or return;
3286 3694
3287 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3288 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3289 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
3299 aio_utime $fh, undef, undef; 3707 aio_utime $fh, undef, undef;
3300 3708
3301 close $fh 3709 close $fh
3302 or return; 3710 or return;
3303 3711
3304 aio_rename "$runtime~", $runtime 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3305 and return; 3713 and return;
3306 3714
3307 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3308 3716
3309 1 3717 1
3718}
3719
3720our $uuid_lock;
3721our $uuid_skip;
3722
3723sub write_uuid_sync($) {
3724 $uuid_skip ||= $_[0];
3725
3726 return if $uuid_lock;
3727 local $uuid_lock = 1;
3728
3729 my $uuid = "$LOCALDIR/uuid";
3730
3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3732 or return;
3733
3734 my $value = uuid_seq uuid_cur;
3735
3736 unless ($value) {
3737 info "cowardly refusing to write zero uuid value!\n";
3738 return;
3739 }
3740
3741 my $value = uuid_str $value + $uuid_skip;
3742 $uuid_skip = 0;
3743
3744 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3745 and return;
3746
3747 # always fsync - this file is important
3748 aio_fsync $fh
3749 and return;
3750
3751 close $fh
3752 or return;
3753
3754 aio_rename "$uuid~", $uuid
3755 and return;
3756
3757 trace "uuid file written ($value).\n";
3758
3759 1
3760
3761}
3762
3763sub write_uuid($$) {
3764 my ($skip, $sync) = @_;
3765
3766 $sync ? write_uuid_sync $skip
3767 : async { write_uuid_sync $skip };
3310} 3768}
3311 3769
3312sub emergency_save() { 3770sub emergency_save() {
3313 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3314 3772
3315 warn "enter emergency perl save\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3316 3779
3317 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
3318 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3319 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3320 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3321 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3322 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3323 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3324 $pl->valid or next; 3789 $pl->valid or next;
3325 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3326 $pl->save; 3791 $pl->save;
3327 } 3792 }
3328 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
3329 3794
3330 warn "begin emergency map save\n"; 3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3797 info "emergency_perl_save: begin map save\n";
3331 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3332 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3333 $map->valid or next; 3800 $map->valid or next;
3334 $map->save; 3801 $map->save;
3335 } 3802 }
3336 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
3337 3804
3338 warn "begin emergency database checkpoint\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin database checkpoint\n";
3339 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3340 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3810
3811 info "emergency_perl_save: begin write uuid\n";
3812 write_uuid_sync 1;
3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3341 }; 3833 };
3342 3834
3343 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
3344} 3836}
3345 3837
3346sub post_cleanup { 3838sub post_cleanup {
3347 my ($make_core) = @_; 3839 my ($make_core) = @_;
3348 3840
3841 IO::AIO::flush;
3842
3349 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3350 if $make_core; 3844 if $make_core;
3845
3846 my $fh = pidfile;
3847 unlink $PIDFILE if <$fh> == $$;
3848}
3849
3850# a safer delete_package, copied from Symbol
3851sub clear_package($) {
3852 my $pkg = shift;
3853
3854 # expand to full symbol table name if needed
3855 unless ($pkg =~ /^main::.*::$/) {
3856 $pkg = "main$pkg" if $pkg =~ /^::/;
3857 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3858 $pkg .= '::' unless $pkg =~ /::$/;
3859 }
3860
3861 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3862 my $stem_symtab = *{$stem}{HASH};
3863
3864 defined $stem_symtab and exists $stem_symtab->{$leaf}
3865 or return;
3866
3867 # clear all symbols
3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3869 for my $name (keys %$leaf_symtab) {
3870 _gv_clear *{"$pkg$name"};
3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3872 }
3351} 3873}
3352 3874
3353sub do_reload_perl() { 3875sub do_reload_perl() {
3354 # can/must only be called in main 3876 # can/must only be called in main
3355 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3356 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3357 return; 3879 return;
3358 } 3880 }
3359 3881
3882 return if $RELOAD++;
3883
3884 my $t1 = AE::time;
3885
3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3360 warn "reloading..."; 3888 info "reloading...";
3361 3889
3362 warn "entering sync_job"; 3890 trace "entering sync_job";
3363 3891
3364 cf::sync_job { 3892 cf::sync_job {
3365 cf::write_runtime; # external watchdog should not bark
3366 cf::emergency_save; 3893 #cf::emergency_save;
3367 cf::write_runtime; # external watchdog should not bark
3368 3894
3369 warn "syncing database to disk";
3370 BDB::db_env_txn_checkpoint $DB_ENV;
3371
3372 # if anything goes wrong in here, we should simply crash as we already saved
3373
3374 warn "cancelling all WF_AUTOCANCEL watchers";
3375 for (Event::all_watchers) {
3376 $_->cancel if $_->data & WF_AUTOCANCEL;
3377 }
3378
3379 warn "flushing outstanding aio requests";
3380 for (;;) {
3381 BDB::flush;
3382 IO::AIO::flush;
3383 Coro::cede_notself;
3384 last unless IO::AIO::nreqs || BDB::nreqs;
3385 warn "iterate...";
3386 }
3387
3388 ++$RELOAD;
3389
3390 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3391 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3392 %EXT_CORO = (); 3897 %EXT_CORO = ();
3393 3898
3394 warn "removing commands"; 3899 trace "removing commands";
3395 %COMMAND = (); 3900 %COMMAND = ();
3396 3901
3397 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3398 %EXTCMD = (); 3903 %EXTCMD = ();
3399 %EXTICMD = (); 3904 %EXTICMD = ();
3400 3905
3401 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3402 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3403 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3404 3909
3405 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3406 eval { 3911 eval {
3407 $cb->($pkg); 3912 $cb->($pkg);
3408 1 3913 1
3409 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3915 }
3916
3917 trace "... clearing $pkg";
3918 clear_package $pkg;
3410 } 3919 }
3411 3920
3412 warn "... nuking $pkg";
3413 Symbol::delete_package $pkg;
3414 }
3415
3416 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3417 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3418 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3419 3924
3420 warn "... unloading $k"; 3925 trace "... unloading $k";
3421 delete $INC{$k}; 3926 delete $INC{$k};
3422 3927
3423 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3424 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3425 3930
3426 if (my $cb = $k->can ("unload_module")) { 3931 if (my $cb = $k->can ("unload_module")) {
3427 $cb->(); 3932 $cb->();
3933 }
3934
3935 clear_package $k;
3428 } 3936 }
3429 3937
3430 Symbol::delete_package $k;
3431 }
3432
3433 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3434 Symbol::delete_package "safe::$_" 3939 clear_package "safe::$_"
3435 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3436 3941
3437 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3438 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3439 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3440 3945
3441 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3442 # and global variables created in xs 3947 # and global variables created in xs
3443 #Symbol::delete_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3444 3949
3445 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3446 3951
3447 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3448 require cf; 3953 require cf;
3449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
3450 3955
3451 warn "loading config and database again"; 3956 trace "loading config and database again";
3452 cf::reload_config; 3957 cf::reload_config;
3453 3958
3454 warn "loading extensions"; 3959 trace "loading extensions";
3455 cf::load_extensions; 3960 cf::load_extensions;
3456 3961
3962 if ($REATTACH_ON_RELOAD) {
3457 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3458 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3459 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3460 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3461 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3462 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
3463 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
3464 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3465 3975
3466 1 3976 1
3467 } or do { 3977 } or do {
3468 warn $@; 3978 error $@;
3469 warn "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3470 exit 1; 3980 };
3981
3982 info "reloaded";
3983 --$RELOAD;
3471 }; 3984 }
3472 3985
3473 warn "reloaded"; 3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
3474}; 3988};
3475 3989
3476our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3477 3991
3478sub reload_perl() { 3992sub reload_perl() {
3479 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
3480 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3481 3995
3482 $RELOAD_WATCHER ||= Event->timer ( 3996 $RELOAD_WATCHER ||= cf::async {
3483 reentrant => 0, 3997 Coro::AIO::aio_wait cache_extensions;
3484 after => 0, 3998
3485 data => WF_AUTOCANCEL, 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3486 cb => sub {
3487 do_reload_perl; 4000 do_reload_perl;
3488 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
3489 }, 4002 };
3490 ); 4003 };
3491} 4004}
3492 4005
3493register_command "reload" => sub { 4006register_command "reload" => sub {
3494 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
3495 4008
3500 reload_perl; 4013 reload_perl;
3501 }; 4014 };
3502 } 4015 }
3503}; 4016};
3504 4017
3505unshift @INC, $LIBDIR; 4018#############################################################################
3506 4019
3507my $bug_warning = 0; 4020my $bug_warning = 0;
3508 4021
3509our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3510our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3511 4024
3512sub wait_for_tick { 4025sub wait_for_tick() {
3513 return unless $TICK_WATCHER->is_active;
3514 return if $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3515 4027
3516 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3518 $signal->wait; 4030 $signal->wait;
3519} 4031}
3520 4032
3521sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3522 return unless $TICK_WATCHER->is_active;
3523 return if $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3524 4035
3525 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3526 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3527 $signal->wait; 4038 $signal->wait;
3528} 4039}
3529 4040
3530$TICK_WATCHER = Event->timer ( 4041sub tick {
3531 reentrant => 0,
3532 parked => 1,
3533 prio => 0,
3534 at => $NEXT_TICK || $TICK,
3535 data => WF_AUTOCANCEL,
3536 cb => sub {
3537 if ($Coro::current != $Coro::main) { 4042 if ($Coro::current != $Coro::main) {
3538 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4043 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3539 unless ++$bug_warning > 10; 4044 unless ++$bug_warning > 10;
3540 return; 4045 return;
3541 } 4046 }
3542 4047
3543 $NOW = $tick_start = Event::time;
3544
3545 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3546 4049
3547 $RUNTIME += $TICK; 4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3548 $NEXT_TICK += $TICK;
3549 4051
3550 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3551 $NEXT_RUNTIME_WRITE = $NOW + 10; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3552 Coro::async_pool { 4054 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3554 write_runtime 4056 write_runtime_sync
3555 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3556 };
3557 } 4058 };
4059 }
3558 4060
3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3560 $sig->send; 4062 $sig->send;
3561 } 4063 }
3562 while (my $sig = shift @WAIT_FOR_TICK) { 4064 while (my $sig = shift @WAIT_FOR_TICK) {
3563 $sig->send; 4065 $sig->send;
3564 } 4066 }
3565 4067
3566 $NOW = Event::time; 4068 $LOAD = ($NOW - $TICK_START) / $TICK;
3567
3568 # if we are delayed by four ticks or more, skip them all
3569 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3570
3571 $TICK_WATCHER->at ($NEXT_TICK);
3572 $TICK_WATCHER->start;
3573
3574 $LOAD = ($NOW - $tick_start) / $TICK;
3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3576 4070
3577 _post_tick; 4071 if (0) {
4072 if ($NEXT_TICK) {
4073 my $jitter = $TICK_START - $NEXT_TICK;
4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4075 debug "jitter $JITTER\n";#d#
4076 }
3578 }, 4077 }
3579); 4078}
3580 4079
3581{ 4080{
4081 # configure BDB
4082
3582 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3583 BDB::max_poll_time $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3584 $BDB_POLL_WATCHER = Event->io ( 4085 $AnyEvent::BDB::WATCHER->priority (1);
3585 reentrant => 0,
3586 fd => BDB::poll_fileno,
3587 poll => 'r',
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => \&BDB::poll_cb,
3591 );
3592
3593 BDB::set_sync_prepare {
3594 my $status;
3595 my $current = $Coro::current;
3596 (
3597 sub {
3598 $status = $!;
3599 $current->ready; undef $current;
3600 },
3601 sub {
3602 Coro::schedule while defined $current;
3603 $! = $status;
3604 },
3605 )
3606 };
3607 4086
3608 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3609 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4089 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3611 | BDB::LOG_AUTOREMOVE, 1); 4090 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4091 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3612 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4092 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4093 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3614 4094
3615 cf::sync_job { 4095 cf::sync_job {
3616 eval { 4096 eval {
3626 4106
3627 cf::cleanup "db_env_open(db): $@" if $@; 4107 cf::cleanup "db_env_open(db): $@" if $@;
3628 }; 4108 };
3629 } 4109 }
3630 4110
3631 $BDB_DEADLOCK_WATCHER = Event->timer ( 4111 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4112 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 ); 4113 };
3641 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4114 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3642 after => 11,
3643 interval => 60,
3644 hard => 1,
3645 prio => 0,
3646 data => WF_AUTOCANCEL,
3647 cb => sub {
3648 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4115 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 ); 4116 };
3651 $BDB_TRICKLE_WATCHER = Event->timer ( 4117 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3652 after => 5,
3653 interval => 10,
3654 hard => 1,
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => sub {
3658 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4118 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 ); 4119 };
3661} 4120}
3662 4121
3663{ 4122{
4123 # configure IO::AIO
4124
3664 IO::AIO::min_parallel 8; 4125 IO::AIO::min_parallel 8;
3665
3666 undef $Coro::AIO::WATCHER;
3667 IO::AIO::max_poll_time $TICK * 0.1; 4126 IO::AIO::max_poll_time $TICK * 0.1;
3668 $AIO_POLL_WATCHER = Event->io ( 4127 undef $AnyEvent::AIO::WATCHER;
3669 reentrant => 0,
3670 data => WF_AUTOCANCEL,
3671 fd => IO::AIO::poll_fileno,
3672 poll => 'r',
3673 prio => 0,
3674 cb => \&IO::AIO::poll_cb,
3675 );
3676} 4128}
3677 4129
3678my $_log_backtrace; 4130my $_log_backtrace;
3679 4131
3680sub _log_backtrace { 4132sub _log_backtrace {
3683 $msg =~ s/\n//; 4135 $msg =~ s/\n//;
3684 4136
3685 # limit the # of concurrent backtraces 4137 # limit the # of concurrent backtraces
3686 if ($_log_backtrace < 2) { 4138 if ($_log_backtrace < 2) {
3687 ++$_log_backtrace; 4139 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg;
3688 async { 4141 async {
3689 $Coro::current->{desc} = "abt $msg"; 4142 $Coro::current->{desc} = "abt $msg";
3690 4143
3691 my @bt = fork_call { 4144 my @bt = fork_call {
3692 @addr = map { sprintf "%x", $_ } @addr; 4145 @addr = map { sprintf "%x", $_ } @addr;
3703 } 4156 }
3704 4157
3705 @funcs 4158 @funcs
3706 }; 4159 };
3707 4160
3708 LOG llevInfo, "[ABT] $msg\n"; 4161 LOG llevInfo, "[ABT] $perl_bt\n";
4162 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3709 LOG llevInfo, "[ABT] $_\n" for @bt; 4163 LOG llevInfo, "[ABT] $_\n" for @bt;
3710 --$_log_backtrace; 4164 --$_log_backtrace;
3711 }; 4165 };
3712 } else { 4166 } else {
3713 LOG llevInfo, "[ABT] $msg\n"; 4167 LOG llevInfo, "[ABT] $msg\n";
3714 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3715 } 4169 }
3716} 4170}
3717 4171
3718# load additional modules 4172# load additional modules
3719use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3720 4175
3721END { cf::emergency_save } 4176END { cf::emergency_save }
3722 4177
37231 41781
3724 4179

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines