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.392 by root, Fri Oct 26 04:44:54 2007 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 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
499 596
500sub fork_call(&@) { 597sub fork_call(&@) {
501 my ($cb, @args) = @_; 598 my ($cb, @args) = @_;
510 }, @args; 607 }, @args;
511 608
512 wantarray ? @res : $res[-1] 609 wantarray ? @res : $res[-1]
513} 610}
514 611
612sub objinfo {
613 (
614 "counter value" => cf::object::object_count,
615 "objects created" => cf::object::create_count,
616 "objects destroyed" => cf::object::destroy_count,
617 "freelist size" => cf::object::free_count,
618 "allocated objects" => cf::object::objects_size,
619 "active objects" => cf::object::actives_size,
620 )
621}
622
623=item $coin = coin_from_name $name
624
625=cut
626
627our %coin_alias = (
628 "silver" => "silvercoin",
629 "silvercoin" => "silvercoin",
630 "silvercoins" => "silvercoin",
631 "gold" => "goldcoin",
632 "goldcoin" => "goldcoin",
633 "goldcoins" => "goldcoin",
634 "platinum" => "platinacoin",
635 "platinumcoin" => "platinacoin",
636 "platinumcoins" => "platinacoin",
637 "platina" => "platinacoin",
638 "platinacoin" => "platinacoin",
639 "platinacoins" => "platinacoin",
640 "royalty" => "royalty",
641 "royalties" => "royalty",
642);
643
644sub coin_from_name($) {
645 $coin_alias{$_[0]}
646 ? cf::arch::find $coin_alias{$_[0]}
647 : undef
648}
649
515=item $value = cf::db_get $family => $key 650=item $value = cf::db_get $family => $key
516 651
517Returns a single value from the environment database. 652Returns a single value from the environment database.
518 653
519=item cf::db_put $family => $key => $value 654=item cf::db_put $family => $key => $value
527within each server. 662within each server.
528 663
529=cut 664=cut
530 665
531sub db_table($) { 666sub db_table($) {
667 cf::error "db_get called from main context"
668 if $Coro::current == $Coro::main;
669
532 my ($name) = @_; 670 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV; 671 my $db = BDB::db_create $DB_ENV;
534 672
535 eval { 673 eval {
536 $db->set_flags (BDB::CHKSUM); 674 $db->set_flags (BDB::CHKSUM);
546} 684}
547 685
548our $DB; 686our $DB;
549 687
550sub db_init { 688sub db_init {
551 cf::sync_job {
552 $DB ||= db_table "db"; 689 $DB ||= db_table "db";
553 };
554} 690}
555 691
556sub db_get($$) { 692sub db_get($$) {
557 my $key = "$_[0]/$_[1]"; 693 my $key = "$_[0]/$_[1]";
558 694
559 cf::sync_job { 695 cf::error "db_get called from main context"
696 if $Coro::current == $Coro::main;
697
560 BDB::db_get $DB, undef, $key, my $data; 698 BDB::db_get $DB, undef, $key, my $data;
561 699
562 $! ? () 700 $! ? ()
563 : $data 701 : $data
564 }
565} 702}
566 703
567sub db_put($$$) { 704sub db_put($$$) {
568 BDB::dbreq_pri 4; 705 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 706 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
625 762
626 my $t1 = Time::HiRes::time; 763 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data); 764 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time; 765 my $t2 = Time::HiRes::time;
629 766
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 767 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
631 768
632 db_put cache => "$id/data", $data; 769 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5; 770 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta; 771 db_put cache => "$id/meta", $meta;
635 772
645 782
646=cut 783=cut
647 784
648sub datalog($@) { 785sub datalog($@) {
649 my ($type, %kv) = @_; 786 my ($type, %kv) = @_;
650 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 787 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
651} 788}
652 789
653=back 790=back
654 791
655=cut 792=cut
656 793
657############################################################################# 794#############################################################################
658 795
659=head2 ATTACHABLE OBJECTS 796=head2 ATTACHABLE OBJECTS
660 797
661Many objects in crossfire are so-called attachable objects. That means you can 798Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 799attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 800to it. All such attachable objects support the following methods.
664 801
665In the following description, CLASS can be any of C<global>, C<object> 802In 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 803C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 804Deliantra).
668 805
669=over 4 806=over 4
670 807
671=item $attachable->attach ($attachment, key => $value...) 808=item $attachable->attach ($attachment, key => $value...)
672 809
716=item cf::CLASS::attachment $name, ... 853=item cf::CLASS::attachment $name, ...
717 854
718Register an attachment by C<$name> through which attachable objects of the 855Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 856given CLASS can refer to this attachment.
720 857
721Some classes such as crossfire maps and objects can specify attachments 858Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 859that are attached at load/instantiate time, thus the need for a name.
723 860
724These calls expect any number of the following handler/hook descriptions: 861These calls expect any number of the following handler/hook descriptions:
725 862
726=over 4 863=over 4
850 987
851 } elsif (exists $cb_id{$type}) { 988 } elsif (exists $cb_id{$type}) {
852 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 989 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
853 990
854 } elsif (ref $type) { 991 } elsif (ref $type) {
855 warn "attaching objects not supported, ignoring.\n"; 992 error "attaching objects not supported, ignoring.\n";
856 993
857 } else { 994 } else {
858 shift @arg; 995 shift @arg;
859 warn "attach argument '$type' not supported, ignoring.\n"; 996 error "attach argument '$type' not supported, ignoring.\n";
860 } 997 }
861 } 998 }
862} 999}
863 1000
864sub _object_attach { 1001sub _object_attach {
874 _attach $registry, $klass, @attach; 1011 _attach $registry, $klass, @attach;
875 } 1012 }
876 1013
877 $obj->{$name} = \%arg; 1014 $obj->{$name} = \%arg;
878 } else { 1015 } else {
879 warn "object uses attachment '$name' which is not available, postponing.\n"; 1016 info "object uses attachment '$name' which is not available, postponing.\n";
880 } 1017 }
881 1018
882 $obj->{_attachment}{$name} = undef; 1019 $obj->{_attachment}{$name} = undef;
883} 1020}
884 1021
943 1080
944 for (@$callbacks) { 1081 for (@$callbacks) {
945 eval { &{$_->[1]} }; 1082 eval { &{$_->[1]} };
946 1083
947 if ($@) { 1084 if ($@) {
948 warn "$@";
949 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1085 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
950 override; 1086 override;
951 } 1087 }
952 1088
953 return 1 if $override; 1089 return 1 if $override;
954 } 1090 }
955 1091
956 0 1092 0
957} 1093}
958 1094
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1095=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1096
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1097=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1098
963Generate an object-specific event with the given arguments. 1099Generate an object-specific event with the given arguments.
964 1100
1017 1153
1018sub reattach { 1154sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1155 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1156 my ($obj) = @_;
1021 1157
1158 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1159 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1160
1024 my $registry = $obj->registry; 1161 my $registry = $obj->registry;
1025 1162
1026 @$registry = (); 1163 @$registry = ();
1027 1164
1032 for (@$attach) { 1169 for (@$attach) {
1033 my ($klass, @attach) = @$_; 1170 my ($klass, @attach) = @$_;
1034 _attach $registry, $klass, @attach; 1171 _attach $registry, $klass, @attach;
1035 } 1172 }
1036 } else { 1173 } else {
1037 warn "object uses attachment '$name' that is not available, postponing.\n"; 1174 info "object uses attachment '$name' that is not available, postponing.\n";
1038 } 1175 }
1039 } 1176 }
1040} 1177}
1041 1178
1042cf::attachable->attach ( 1179cf::attachable->attach (
1043 prio => -1000000, 1180 prio => -1000000,
1044 on_instantiate => sub { 1181 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1182 my ($obj, $data) = @_;
1046 1183
1047 $data = from_json $data; 1184 $data = decode_json $data;
1048 1185
1049 for (@$data) { 1186 for (@$data) {
1050 my ($name, $args) = @$_; 1187 my ($name, $args) = @$_;
1051 1188
1052 $obj->attach ($name, %{$args || {} }); 1189 $obj->attach ($name, %{$args || {} });
1069 my ($filename, $rdata, $objs) = @_; 1206 my ($filename, $rdata, $objs) = @_;
1070 1207
1071 sync_job { 1208 sync_job {
1072 if (length $$rdata) { 1209 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1211 trace sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1212 $decname, length $$rdata, scalar @$objs
1213 if $VERBOSE_IO;
1076 1214
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1215 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1216 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1217 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1218 if ($cf::USE_FSYNC) {
1219 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;
1220 aio_fsync $fh;
1221 }
1081 close $fh; 1222 aio_close $fh;
1082 1223
1083 if (@$objs) { 1224 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1225 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1226 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1227 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1228 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1229 if ($cf::USE_FSYNC) {
1230 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;
1231 aio_fsync $fh;
1232 }
1089 close $fh; 1233 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1234 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1235 }
1092 } else { 1236 } else {
1093 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1094 } 1238 }
1095 1239
1096 aio_rename "$filename~", $filename; 1240 aio_rename "$filename~", $filename;
1241
1242 $filename =~ s%/[^/]+$%%;
1243 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1244 } else {
1098 warn "FATAL: $filename~: $!\n"; 1245 error "unable to save objects: $filename~: $!\n";
1099 } 1246 }
1100 } else { 1247 } else {
1101 aio_unlink $filename; 1248 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1249 aio_unlink "$filename.pst";
1103 } 1250 }
1127 my $st = eval { Coro::Storable::thaw $av }; 1274 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs}; 1275 $av = $st->{objs};
1129 } 1276 }
1130 1277
1131 utf8::decode (my $decname = $filename); 1278 utf8::decode (my $decname = $filename);
1132 warn sprintf "loading %s (%d,%d)\n", 1279 trace sprintf "loading %s (%d,%d)\n",
1133 $decname, length $data, scalar @{$av || []}; 1280 $decname, length $data, scalar @{$av || []}
1281 if $VERBOSE_IO;
1134 1282
1135 ($data, $av) 1283 ($data, $av)
1136} 1284}
1137 1285
1138=head2 COMMAND CALLBACKS 1286=head2 COMMAND CALLBACKS
1194 my ($name, $cb) = @_; 1342 my ($name, $cb) = @_;
1195 1343
1196 $EXTICMD{$name} = $cb; 1344 $EXTICMD{$name} = $cb;
1197} 1345}
1198 1346
1347use File::Glob ();
1348
1199cf::player->attach ( 1349cf::player->attach (
1200 on_command => sub { 1350 on_unknown_command => sub {
1201 my ($pl, $name, $params) = @_; 1351 my ($pl, $name, $params) = @_;
1202 1352
1203 my $cb = $COMMAND{$name} 1353 my $cb = $COMMAND{$name}
1204 or return; 1354 or return;
1205 1355
1228 1378
1229 $pl->ext_reply ($reply, @reply) 1379 $pl->ext_reply ($reply, @reply)
1230 if $reply; 1380 if $reply;
1231 1381
1232 } else { 1382 } else {
1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1234 } 1384 }
1235 1385
1236 cf::override; 1386 cf::override;
1237 }, 1387 },
1238); 1388);
1239 1389
1390# "readahead" all extensions
1391sub cache_extensions {
1392 my $grp = IO::AIO::aio_group;
1393
1394 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1395 for (grep /\.ext$/, @{$_[0]}) {
1396 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1397 }
1398 };
1399
1400 $grp
1401}
1402
1240sub load_extensions { 1403sub load_extensions {
1404 info "loading extensions...";
1405
1241 cf::sync_job { 1406 cf::sync_job {
1242 my %todo; 1407 my %todo;
1243 1408
1244 for my $path (<$LIBDIR/*.ext>) { 1409 for my $path (<$LIBDIR/*.ext>) {
1245 next unless -r $path; 1410 next unless -r $path;
1263 1428
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1429 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1430 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1431
1267 $ext{source} = 1432 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1433 "package $pkg; use common::sense;\n"
1269 . "#line 1 \"$path\"\n{\n" 1434 . "#line 1 \"$path\"\n{\n"
1270 . $source 1435 . $source
1271 . "\n};\n1"; 1436 . "\n};\n1";
1272 1437
1273 $todo{$base} = \%ext; 1438 $todo{$base} = \%ext;
1274 } 1439 }
1275 1440
1441 my $pass = 0;
1276 my %done; 1442 my %done;
1277 while (%todo) { 1443 while (%todo) {
1278 my $progress; 1444 my $progress;
1279 1445
1446 ++$pass;
1447
1448 ext:
1280 while (my ($k, $v) = each %todo) { 1449 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) { 1450 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip 1451 next ext
1283 unless exists $done{$_}; 1452 unless exists $done{$_};
1284 } 1453 }
1285 1454
1286 warn "... loading '$k' into '$v->{pkg}'\n"; 1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1287 1456
1288 unless (eval $v->{source}) { 1457 my $active = eval $v->{source};
1458
1459 if (length $@) {
1289 my $msg = $@ ? "$v->{path}: $@\n" 1460 error "$v->{path}: $@\n";
1290 : "$v->{base}: extension inactive.\n";
1291 1461
1462 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1292 if (exists $v->{meta}{mandatory}) { 1463 if exists $v->{meta}{mandatory};
1293 warn $msg; 1464
1294 warn "mandatory extension failed to load, exiting.\n"; 1465 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1295 exit 1; 1466 delete $todo{$k};
1296 } 1467 } else {
1297 1468 $done{$k} = delete $todo{$k};
1298 warn $msg; 1469 push @EXTS, $v->{pkg};
1470 $progress = 1;
1471
1472 info "$v->{base}: extension inactive.\n"
1473 unless $active;
1299 } 1474 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
1304 } 1475 }
1305 1476
1306 skip: 1477 unless ($progress) {
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1478 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1308 unless $progress; 1479
1480 while (my ($k, $v) = each %todo) {
1481 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1482 if exists $v->{meta}{mandatory};
1483 }
1484 }
1309 } 1485 }
1310 }; 1486 };
1311} 1487}
1312 1488
1313############################################################################# 1489#############################################################################
1314 1490
1315=back 1491=back
1316 1492
1317=head2 CORE EXTENSIONS 1493=head2 CORE EXTENSIONS
1318 1494
1319Functions and methods that extend core crossfire objects. 1495Functions and methods that extend core deliantra objects.
1320 1496
1321=cut 1497=cut
1322 1498
1323package cf::player; 1499package cf::player;
1324 1500
1367 1543
1368sub exists($) { 1544sub exists($) {
1369 my ($login) = @_; 1545 my ($login) = @_;
1370 1546
1371 $cf::PLAYER{$login} 1547 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1548 or !aio_stat path $login
1373} 1549}
1374 1550
1375sub find($) { 1551sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1552 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1553 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1565 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1566 or return;
1391 1567
1392 my $pl = cf::player::load_pl $f 1568 my $pl = cf::player::load_pl $f
1393 or return; 1569 or return;
1570
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1571 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1572 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1573 $cf::PLAYER{$login} = $pl
1397 } 1574 }
1398 } 1575 }
1399} 1576}
1400 1577
1578cf::player->attach (
1579 on_load => sub {
1580 my ($pl, $path) = @_;
1581
1582 # restore slots saved in save, below
1583 my $slots = delete $pl->{_slots};
1584
1585 $pl->ob->current_weapon ($slots->[0]);
1586 $pl->combat_ob ($slots->[1]);
1587 $pl->ranged_ob ($slots->[2]);
1588 },
1589);
1590
1401sub save($) { 1591sub save($) {
1402 my ($pl) = @_; 1592 my ($pl) = @_;
1403 1593
1404 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1405 1595
1408 1598
1409 return if $pl->{deny_save}; 1599 return if $pl->{deny_save};
1410 1600
1411 aio_mkdir playerdir $pl, 0770; 1601 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1602 $pl->{last_save} = $cf::RUNTIME;
1603
1604 cf::get_slot 0.01;
1605
1606 # save slots, to be restored later
1607 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1413 1608
1414 $pl->save_pl ($path); 1609 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1610 cf::cede_to_tick;
1416} 1611}
1417 1612
1449 my ($pl) = @_; 1644 my ($pl) = @_;
1450 1645
1451 my $name = $pl->ob->name; 1646 my $name = $pl->ob->name;
1452 1647
1453 $pl->{deny_save} = 1; 1648 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1649 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1650
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1652 $pl->deactivate;
1653 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1654 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1655 $pl->ns->destroy if $pl->ns;
1460 1656
1461 my $path = playerdir $pl; 1657 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1658 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1697
1502 for my $login (@$dirs) { 1698 for my $login (@$dirs) {
1503 my $path = path $login; 1699 my $path = path $login;
1504 1700
1505 # a .pst is a dead give-away for a valid player 1701 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1702 # if no pst file found, open and chekc for blocked users
1703 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1704 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1705 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1706 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1707 }
1511 1708
1515 1712
1516 \@logins 1713 \@logins
1517} 1714}
1518 1715
1519=item $player->maps 1716=item $player->maps
1717
1718=item cf::player::maps $login
1520 1719
1521Returns an arrayref of map paths that are private for this 1720Returns an arrayref of map paths that are private for this
1522player. May block. 1721player. May block.
1523 1722
1524=cut 1723=cut
1542 } 1741 }
1543 1742
1544 \@paths 1743 \@paths
1545} 1744}
1546 1745
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1746=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1747
1549Expand crossfire pod fragments into protocol xml. 1748Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1563sub expand_cfpod {
1564 my ($self, $pod) = @_;
1565
1566 my $xml;
1567
1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1570 $group = $1;
1571
1572 $group =~ s/&/&amp;/g;
1573 $group =~ s/</&lt;/g;
1574
1575 $xml .= $group;
1576 } elsif ($pod =~ m%\G
1577 ([BCGHITU])
1578 <
1579 (?:
1580 ([^<>]*) (?{ $group = $^N })
1581 | < $interior >
1582 )
1583 >
1584 %gcsx
1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1605 "")
1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1617
1618 for ($xml) {
1619 # create single paragraphs (very hackish)
1620 s/(?<=\S)\n(?=\w)/ /g;
1621
1622 # compress some whitespace
1623 s/\s+\n/\n/g; # ws line-ends
1624 s/\n\n+/\n/g; # double lines
1625 s/^\n+//; # beginning lines
1626 s/\n+$//; # ending lines
1627 }
1628
1629 $xml
1630}
1631
1632sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode}
1635}
1636 1749
1637=item $player->ext_reply ($msgid, @msg) 1750=item $player->ext_reply ($msgid, @msg)
1638 1751
1639Sends an ext reply to the player. 1752Sends an ext reply to the player.
1640 1753
1672 1785
1673=cut 1786=cut
1674 1787
1675sub find_by_path($) { 1788sub find_by_path($) {
1676 my ($path) = @_; 1789 my ($path) = @_;
1790
1791 $path =~ s/^~[^\/]*//; # skip ~login
1677 1792
1678 my ($match, $specificity); 1793 my ($match, $specificity);
1679 1794
1680 for my $region (list) { 1795 for my $region (list) {
1681 if ($region->{match} && $path =~ $region->{match}) { 1796 if ($region->{match} && $path =~ $region->{match}) {
1707our $MAX_RESET = 3600; 1822our $MAX_RESET = 3600;
1708our $DEFAULT_RESET = 3000; 1823our $DEFAULT_RESET = 3000;
1709 1824
1710sub generate_random_map { 1825sub generate_random_map {
1711 my ($self, $rmp) = @_; 1826 my ($self, $rmp) = @_;
1827
1828 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1829
1712 # mit "rum" bekleckern, nicht 1830 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1831 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1832 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1833 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1834 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map}, 1835 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize}, 1836 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1837 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1838 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1735 1853
1736sub register { 1854sub register {
1737 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1738 my $pkg = caller; 1856 my $pkg = caller;
1739 1857
1740 no strict;
1741 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1742 1859
1743 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1744} 1861}
1745 1862
1746# also paths starting with '/' 1863# also paths starting with '/'
1747$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1864$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1748 1865
1749sub thawer_merge { 1866sub thawer_merge {
1750 my ($self, $merge) = @_; 1867 my ($self, $merge) = @_;
1751 1868
1752 # we have to keep some variables in memory intact 1869 # we have to keep some variables in memory intact
1757} 1874}
1758 1875
1759sub normalise { 1876sub normalise {
1760 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1761 1878
1762 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1763 1880
1764 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1765 1882
1766 # map plan: 1883 # map plan:
1767 # 1884 #
1806 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1807 return $self; 1924 return $self;
1808 } 1925 }
1809 } 1926 }
1810 1927
1811 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1812 () 1929 ()
1813} 1930}
1814 1931
1815sub init { 1932sub init {
1816 my ($self) = @_; 1933 my ($self) = @_;
1838 1955
1839# the temporary/swap location 1956# the temporary/swap location
1840sub save_path { 1957sub save_path {
1841 my ($self) = @_; 1958 my ($self) = @_;
1842 1959
1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1960 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1844 "$TMPDIR/$path.map" 1961 "$TMPDIR/$path.map"
1845} 1962}
1846 1963
1847# the unique path, undef == no special unique path 1964# the unique path, undef == no special unique path
1848sub uniq_path { 1965sub uniq_path {
1849 my ($self) = @_; 1966 my ($self) = @_;
1850 1967
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1968 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1969 "$UNIQUEDIR/$path"
1853}
1854
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862} 1970}
1863 1971
1864sub decay_objects { 1972sub decay_objects {
1865 my ($self) = @_; 1973 my ($self) = @_;
1866 1974
1948 2056
1949sub find; 2057sub find;
1950sub find { 2058sub find {
1951 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
1952 2060
2061 cf::cede_to_tick;
2062
1953 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
1954 2064
1955 cf::lock_wait "map_data:$path";#d#remove 2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2067
1958 $cf::MAP{$path} || do { 2068 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961
1962 my $map = new_from_path cf::map $path 2069 my $map = new_from_path cf::map $path
1963 or return; 2070 or return;
1964 2071
1965 $map->{last_save} = $cf::RUNTIME; 2072 $map->{last_save} = $cf::RUNTIME;
1966 2073
1968 or return; 2075 or return;
1969 2076
1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2077 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1971 # doing this can freeze the server in a sync job, obviously 2078 # doing this can freeze the server in a sync job, obviously
1972 #$cf::WAIT_FOR_TICK->wait; 2079 #$cf::WAIT_FOR_TICK->wait;
2080 undef $guard2;
1973 undef $guard1; 2081 undef $guard1;
1974 undef $guard2;
1975 $map->reset; 2082 $map->reset;
1976 return find $path; 2083 return find $path;
1977 } 2084 }
1978 2085
1979 $cf::MAP{$path} = $map 2086 $cf::MAP{$path} = $map
1980 } 2087 }
1981} 2088}
1982 2089
1983sub pre_load { } 2090sub pre_load { }
1984sub post_load { } 2091#sub post_load { } # XS
1985 2092
1986sub load { 2093sub load {
1987 my ($self) = @_; 2094 my ($self) = @_;
1988 2095
1989 local $self->{deny_reset} = 1; # loading can take a long time 2096 local $self->{deny_reset} = 1; # loading can take a long time
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2113 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2114 $f->skip_block;
2008 $self->_load_objects ($f) 2115 $self->_load_objects ($f)
2009 or return; 2116 or return;
2010 2117
2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2118 $self->post_load_original
2012 if delete $self->{load_original}; 2119 if delete $self->{load_original};
2013 2120
2014 if (my $uniq = $self->uniq_path) { 2121 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2122 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2123 unless (aio_stat $uniq) {
2034 unless ($self->{deny_activate}) { 2141 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2142 $self->decay_objects;
2036 $self->fix_auto_apply; 2143 $self->fix_auto_apply;
2037 $self->update_buttons; 2144 $self->update_buttons;
2038 cf::cede_to_tick; 2145 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2146 $self->activate;
2042 } 2147 }
2043 2148
2044 $self->{last_save} = $cf::RUNTIME; 2149 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2150 $self->last_access ($cf::RUNTIME);
2046 2151
2047 $self->in_memory (cf::MAP_IN_MEMORY); 2152 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2153 }
2049 2154
2050 $self->post_load; 2155 $self->post_load;
2051} 2156}
2052 2157
2158# customize the map for a given player, i.e.
2159# return the _real_ map. used by e.g. per-player
2160# maps to change the path to ~playername/mappath
2053sub customise_for { 2161sub customise_for {
2054 my ($self, $ob) = @_; 2162 my ($self, $ob) = @_;
2055 2163
2056 return find "~" . $ob->name . "/" . $self->{path} 2164 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2165 if $self->per_player;
2073 or next; 2181 or next;
2074 $neigh = find $neigh, $map 2182 $neigh = find $neigh, $map
2075 or next; 2183 or next;
2076 $neigh->load; 2184 $neigh->load;
2077 2185
2186 # now find the diagonal neighbours
2078 push @neigh, 2187 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2190 }
2082 2191
2089} 2198}
2090 2199
2091sub find_sync { 2200sub find_sync {
2092 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
2093 2202
2094 cf::sync_job { find $path, $origin } 2203 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204 if $Coro::current == $Coro::main;
2205
2206 find $path, $origin
2095} 2207}
2096 2208
2097sub do_load_sync { 2209sub do_load_sync {
2098 my ($map) = @_; 2210 my ($map) = @_;
2099 2211
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
2102 2214
2103 cf::sync_job { $map->load }; 2215 $map->load;
2104} 2216}
2105 2217
2106our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
2108 2220
2110 my ($path, $origin, $load) = @_; 2222 my ($path, $origin, $load) = @_;
2111 2223
2112 $path = normalise $path, $origin && $origin->{path}; 2224 $path = normalise $path, $origin && $origin->{path};
2113 2225
2114 if (my $map = $cf::MAP{$path}) { 2226 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2227 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2228 }
2117 2229
2118 $MAP_PREFETCH{$path} |= $load; 2230 $MAP_PREFETCH{$path} |= $load;
2119 2231
2120 $MAP_PREFETCHER ||= cf::async { 2232 $MAP_PREFETCHER ||= cf::async {
2134 $MAP_PREFETCHER->prio (6); 2246 $MAP_PREFETCHER->prio (6);
2135 2247
2136 () 2248 ()
2137} 2249}
2138 2250
2251# common code, used by both ->save and ->swapout
2139sub save { 2252sub _save {
2140 my ($self) = @_; 2253 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2254
2144 $self->{last_save} = $cf::RUNTIME; 2255 $self->{last_save} = $cf::RUNTIME;
2145 2256
2146 return unless $self->dirty; 2257 return unless $self->dirty;
2147 2258
2156 2267
2157 cf::async { 2268 cf::async {
2158 $Coro::current->{desc} = "map player save"; 2269 $Coro::current->{desc} = "map player save";
2159 $_->contr->save for $self->players; 2270 $_->contr->save for $self->players;
2160 }; 2271 };
2272
2273 cf::get_slot 0.02;
2161 2274
2162 if ($uniq) { 2275 if ($uniq) {
2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2276 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2277 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2165 } else { 2278 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2279 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167 } 2280 }
2168} 2281}
2169 2282
2283sub save {
2284 my ($self) = @_;
2285
2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287
2288 $self->_save;
2289}
2290
2170sub swap_out { 2291sub swap_out {
2171 my ($self) = @_; 2292 my ($self) = @_;
2172 2293
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2295
2296 return if $self->in_memory != cf::MAP_ACTIVE;
2297 return if $self->{deny_save};
2178 return if $self->players; 2298 return if $self->players;
2179 return if $self->in_memory != cf::MAP_IN_MEMORY;
2180 return if $self->{deny_save};
2181 2299
2300 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->in_memory (cf::MAP_SWAPPED); 2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # then atomically save
2306 $self->_save;
2307
2308 # then free the map
2309 $self->clear;
2310}
2311
2312sub reset_at {
2313 my ($self) = @_;
2314
2315 # TODO: safety, remove and allow resettable per-player maps
2316 return 1e99 if $self->{deny_reset};
2317
2318 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2319 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2320
2321 $time + $to
2322}
2323
2324sub should_reset {
2325 my ($self) = @_;
2326
2327 $self->reset_at <= $cf::RUNTIME
2328}
2329
2330sub reset {
2331 my ($self) = @_;
2332
2333 my $lock = cf::lock_acquire "map_data:$self->{path}";
2334
2335 return if $self->players;
2336
2337 cf::trace "resetting map ", $self->path, "\n";
2338
2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # need to save uniques path
2342 unless ($self->{deny_save}) {
2343 my $uniq = $self->uniq_path; utf8::encode $uniq;
2344
2345 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2346 if $uniq;
2347 }
2348
2349 delete $cf::MAP{$self->path};
2183 2350
2184 $self->deactivate; 2351 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2352 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2353 $self->clear;
2187}
2188
2189sub reset_at {
2190 my ($self) = @_;
2191
2192 # TODO: safety, remove and allow resettable per-player maps
2193 return 1e99 if $self->{deny_reset};
2194
2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198 $time + $to
2199}
2200
2201sub should_reset {
2202 my ($self) = @_;
2203
2204 $self->reset_at <= $cf::RUNTIME
2205}
2206
2207sub reset {
2208 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212 return if $self->players;
2213
2214 warn "resetting map ", $self->path;
2215
2216 $self->in_memory (cf::MAP_SWAPPED);
2217
2218 # need to save uniques path
2219 unless ($self->{deny_save}) {
2220 my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2223 if $uniq;
2224 }
2225
2226 delete $cf::MAP{$self->path};
2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2230 $self->clear;
2231 2354
2232 $self->unlink_save; 2355 $self->unlink_save;
2233 $self->destroy; 2356 $self->destroy;
2234} 2357}
2235 2358
2243 2366
2244 delete $cf::MAP{$self->path}; 2367 delete $cf::MAP{$self->path};
2245 2368
2246 $self->unlink_save; 2369 $self->unlink_save;
2247 2370
2248 bless $self, "cf::map"; 2371 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2372 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2373 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2374 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2375 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2376
2302 2425
2303sub unique_maps() { 2426sub unique_maps() {
2304 [ 2427 [
2305 map { 2428 map {
2306 utf8::decode $_; 2429 utf8::decode $_;
2307 /\.map$/ 2430 s/\.map$//; # TODO future compatibility hack
2431 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2432 ? ()
2308 ? normalise $_ 2433 : normalise $_
2309 : ()
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2434 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2435 ]
2312} 2436}
2313 2437
2314package cf; 2438=item cf::map::static_maps
2439
2440Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2441file in the shared directory excluding F</styles> and F</editor>). May
2442block.
2443
2444=cut
2445
2446sub static_maps() {
2447 my @dirs = "";
2448 my @maps;
2449
2450 while (@dirs) {
2451 my $dir = shift @dirs;
2452
2453 next if $dir eq "/styles" || $dir eq "/editor";
2454
2455 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2456 or return;
2457
2458 for (@$files) {
2459 s/\.map$// or next;
2460 utf8::decode $_;
2461 push @maps, "$dir/$_";
2462 }
2463
2464 push @dirs, map "$dir/$_", @$dirs;
2465 }
2466
2467 \@maps
2468}
2315 2469
2316=back 2470=back
2317 2471
2318=head3 cf::object 2472=head3 cf::object
2319 2473
2323 2477
2324=over 4 2478=over 4
2325 2479
2326=item $ob->inv_recursive 2480=item $ob->inv_recursive
2327 2481
2328Returns the inventory of the object _and_ their inventories, recursively. 2482Returns the inventory of the object I<and> their inventories, recursively,
2483but I<not> the object itself.
2329 2484
2330=cut 2485=cut
2331 2486
2332sub inv_recursive_; 2487sub inv_recursive_;
2333sub inv_recursive_ { 2488sub inv_recursive_ {
2338 inv_recursive_ inv $_[0] 2493 inv_recursive_ inv $_[0]
2339} 2494}
2340 2495
2341=item $ref = $ob->ref 2496=item $ref = $ob->ref
2342 2497
2343creates and returns a persistent reference to an objetc that can be stored as a string. 2498Creates and returns a persistent reference to an object that can be stored as a string.
2344 2499
2345=item $ob = cf::object::deref ($refstring) 2500=item $ob = cf::object::deref ($refstring)
2346 2501
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2502returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block. 2503even if the object actually exists. May block.
2380can be C<undef>. Does the right thing when the player is currently in a 2535can be C<undef>. Does the right thing when the player is currently in a
2381dialogue with the given NPC character. 2536dialogue with the given NPC character.
2382 2537
2383=cut 2538=cut
2384 2539
2540our $SAY_CHANNEL = {
2541 id => "say",
2542 title => "Map",
2543 reply => "say ",
2544 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2545};
2546
2547our $CHAT_CHANNEL = {
2548 id => "chat",
2549 title => "Chat",
2550 reply => "chat ",
2551 tooltip => "Player chat and shouts, global to the server.",
2552};
2553
2385# rough implementation of a future "reply" method that works 2554# rough implementation of a future "reply" method that works
2386# with dialog boxes. 2555# with dialog boxes.
2387#TODO: the first argument must go, split into a $npc->reply_to ( method 2556#TODO: the first argument must go, split into a $npc->reply_to ( method
2388sub cf::object::player::reply($$$;$) { 2557sub cf::object::player::reply($$$;$) {
2389 my ($self, $npc, $msg, $flags) = @_; 2558 my ($self, $npc, $msg, $flags) = @_;
2400 my $dialog = $pl->{npc_dialog}; 2569 my $dialog = $pl->{npc_dialog};
2401 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2570 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2402 2571
2403 } else { 2572 } else {
2404 $msg = $npc->name . " says: $msg" if $npc; 2573 $msg = $npc->name . " says: $msg" if $npc;
2405 $self->message ($msg, $flags); 2574 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2406 } 2575 }
2407 } 2576 }
2408} 2577}
2409 2578
2410=item $object->send_msg ($channel, $msg, $color, [extra...]) 2579=item $object->send_msg ($channel, $msg, $color, [extra...])
2435 2604
2436=item $player_object->enter_link 2605=item $player_object->enter_link
2437 2606
2438Freezes the player and moves him/her to a special map (C<{link}>). 2607Freezes the player and moves him/her to a special map (C<{link}>).
2439 2608
2440The player should be reasonably safe there for short amounts of time. You 2609The player should be reasonably safe there for short amounts of time (e.g.
2441I<MUST> call C<leave_link> as soon as possible, though. 2610for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2611though, as the player cannot control the character while it is on the link
2612map.
2442 2613
2443Will never block. 2614Will never block.
2444 2615
2445=item $player_object->leave_link ($map, $x, $y) 2616=item $player_object->leave_link ($map, $x, $y)
2446 2617
2466sub cf::object::player::enter_link { 2637sub cf::object::player::enter_link {
2467 my ($self) = @_; 2638 my ($self) = @_;
2468 2639
2469 $self->deactivate_recursive; 2640 $self->deactivate_recursive;
2470 2641
2642 ++$self->{_link_recursion};
2643
2471 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2644 return if UNIVERSAL::isa $self->map, "ext::map_link";
2472 2645
2473 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2646 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2474 if $self->map && $self->map->{path} ne "{link}"; 2647 if $self->map && $self->map->{path} ne "{link}";
2475 2648
2476 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2649 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2477} 2650}
2478 2651
2479sub cf::object::player::leave_link { 2652sub cf::object::player::leave_link {
2480 my ($self, $map, $x, $y) = @_; 2653 my ($self, $map, $x, $y) = @_;
2481 2654
2498 ($x, $y) = (-1, -1) 2671 ($x, $y) = (-1, -1)
2499 unless (defined $x) && (defined $y); 2672 unless (defined $x) && (defined $y);
2500 2673
2501 # use -1 or undef as default coordinates, not 0, 0 2674 # use -1 or undef as default coordinates, not 0, 0
2502 ($x, $y) = ($map->enter_x, $map->enter_y) 2675 ($x, $y) = ($map->enter_x, $map->enter_y)
2503 if $x <=0 && $y <= 0; 2676 if $x <= 0 && $y <= 0;
2504 2677
2505 $map->load; 2678 $map->load;
2506 $map->load_neighbours; 2679 $map->load_neighbours;
2507 2680
2508 return unless $self->contr->active; 2681 return unless $self->contr->active;
2509 $self->activate_recursive;
2510 2682
2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2512 $self->enter_map ($map, $x, $y); 2684 if ($self->enter_map ($map, $x, $y)) {
2513} 2685 # entering was successful
2686 delete $self->{_link_recursion};
2687 # only activate afterwards, to support waiting in hooks
2688 $self->activate_recursive;
2689 }
2514 2690
2691}
2692
2515=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2693=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2516 2694
2517Moves the player to the given map-path and coordinates by first freezing 2695Moves the player to the given map-path and coordinates by first freezing
2518her, loading and preparing them map, calling the provided $check callback 2696her, loading and preparing them map, calling the provided $check callback
2519that has to return the map if sucecssful, and then unfreezes the player on 2697that has to return the map if sucecssful, and then unfreezes the player on
2520the new (success) or old (failed) map position. In either case, $done will 2698the new (success) or old (failed) map position. In either case, $done will
2521be called at the end of this process. 2699be called at the end of this process.
2522 2700
2701Note that $check will be called with a potentially non-loaded map, so if
2702it needs a loaded map it has to call C<< ->load >>.
2703
2523=cut 2704=cut
2524 2705
2525our $GOTOGEN; 2706our $GOTOGEN;
2526 2707
2527sub cf::object::player::goto { 2708sub cf::object::player::goto {
2528 my ($self, $path, $x, $y, $check, $done) = @_; 2709 my ($self, $path, $x, $y, $check, $done) = @_;
2710
2711 if ($self->{_link_recursion} >= $MAX_LINKS) {
2712 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2713 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2714 ($path, $x, $y) = @$EMERGENCY_POSITION;
2715 }
2529 2716
2530 # do generation counting so two concurrent goto's will be executed in-order 2717 # do generation counting so two concurrent goto's will be executed in-order
2531 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2718 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2532 2719
2533 $self->enter_link; 2720 $self->enter_link;
2557 my $map = eval { 2744 my $map = eval {
2558 my $map = defined $path ? cf::map::find $path : undef; 2745 my $map = defined $path ? cf::map::find $path : undef;
2559 2746
2560 if ($map) { 2747 if ($map) {
2561 $map = $map->customise_for ($self); 2748 $map = $map->customise_for ($self);
2562 $map = $check->($map) if $check && $map; 2749 $map = $check->($map, $x, $y, $self) if $check && $map;
2563 } else { 2750 } else {
2564 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2751 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 } 2752 }
2566 2753
2567 $map 2754 $map
2575 if ($gen == $self->{_goto_generation}) { 2762 if ($gen == $self->{_goto_generation}) {
2576 delete $self->{_goto_generation}; 2763 delete $self->{_goto_generation};
2577 $self->leave_link ($map, $x, $y); 2764 $self->leave_link ($map, $x, $y);
2578 } 2765 }
2579 2766
2580 $done->() if $done; 2767 $done->($self) if $done;
2581 })->prio (1); 2768 })->prio (1);
2582} 2769}
2583 2770
2584=item $player_object->enter_exit ($exit_object) 2771=item $player_object->enter_exit ($exit_object)
2585 2772
2605} 2792}
2606 2793
2607sub prepare_random_map { 2794sub prepare_random_map {
2608 my ($exit) = @_; 2795 my ($exit) = @_;
2609 2796
2610 my $guard = cf::lock_acquire "exit_prepare:$exit";
2611
2612 # all this does is basically replace the /! path by 2797 # all this does is basically replace the /! path by
2613 # a new random map path (?random/...) with a seed 2798 # a new random map path (?random/...) with a seed
2614 # that depends on the exit object 2799 # that depends on the exit object
2615 2800
2616 my $rmp = parse_random_map_params $exit->msg; 2801 my $rmp = parse_random_map_params $exit->msg;
2618 if ($exit->map) { 2803 if ($exit->map) {
2619 $rmp->{region} = $exit->region->name; 2804 $rmp->{region} = $exit->region->name;
2620 $rmp->{origin_map} = $exit->map->path; 2805 $rmp->{origin_map} = $exit->map->path;
2621 $rmp->{origin_x} = $exit->x; 2806 $rmp->{origin_x} = $exit->x;
2622 $rmp->{origin_y} = $exit->y; 2807 $rmp->{origin_y} = $exit->y;
2808
2809 $exit->map->touch;
2623 } 2810 }
2624 2811
2625 $rmp->{random_seed} ||= $exit->random_seed; 2812 $rmp->{random_seed} ||= $exit->random_seed;
2626 2813
2627 my $data = cf::to_json $rmp; 2814 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628 my $md5 = Digest::MD5::md5_hex $data; 2815 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2816 my $meta = "$RANDOMDIR/$md5.meta";
2630 2817
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2818 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2819 aio_write $fh, 0, (length $data), $data, 0;
2633 undef $fh; 2820 undef $fh;
2634 aio_rename "$meta~", $meta; 2821 aio_rename "$meta~", $meta;
2635 2822
2823 my $slaying = "?random/$md5";
2824
2825 if ($exit->valid) {
2636 $exit->slaying ("?random/$md5"); 2826 $exit->slaying ("?random/$md5");
2637 $exit->msg (undef); 2827 $exit->msg (undef);
2828 }
2638 } 2829 }
2639} 2830}
2640 2831
2641sub cf::object::player::enter_exit { 2832sub cf::object::player::enter_exit {
2642 my ($self, $exit) = @_; 2833 my ($self, $exit) = @_;
2643 2834
2644 return unless $self->type == cf::PLAYER; 2835 return unless $self->type == cf::PLAYER;
2645 2836
2646 if ($exit->slaying eq "/!") {
2647 #TODO: this should de-fi-ni-te-ly not be a sync-job
2648 # the problem is that $exit might not survive long enough
2649 # so it needs to be done right now, right here
2650 cf::sync_job { prepare_random_map $exit };
2651 }
2652
2653 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2654 my $hp = $exit->stats->hp;
2655 my $sp = $exit->stats->sp;
2656
2657 $self->enter_link; 2837 $self->enter_link;
2658 2838
2659 # if exit is damned, update players death & WoR home-position
2660 $self->contr->savebed ($slaying, $hp, $sp)
2661 if $exit->flag (FLAG_DAMNED);
2662
2663 (async { 2839 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2840 $Coro::current->{desc} = "enter_exit";
2665 2841
2666 $self->deactivate_recursive; # just to be sure
2667 unless (eval { 2842 unless (eval {
2843 $self->deactivate_recursive; # just to be sure
2844
2845 # random map handling
2846 {
2847 my $guard = cf::lock_acquire "exit_prepare:$exit";
2848
2849 prepare_random_map $exit
2850 if $exit->slaying eq "/!";
2851 }
2852
2853 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2854 my $x = $exit->stats->hp;
2855 my $y = $exit->stats->sp;
2856
2668 $self->goto ($slaying, $hp, $sp); 2857 $self->goto ($map, $x, $y);
2669 2858
2859 # if exit is damned, update players death & WoR home-position
2860 $self->contr->savebed ($map, $x, $y)
2861 if $exit->flag (cf::FLAG_DAMNED);
2862
2670 1; 2863 1
2671 }) { 2864 }) {
2672 $self->message ("Something went wrong deep within the crossfire server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2673 . "I'll try to bring you back to the map you were before. " 2866 . "I'll try to bring you back to the map you were before. "
2674 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2675 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2676 2869
2677 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2678 $self->leave_link; 2871 $self->leave_link;
2679 } 2872 }
2680 })->prio (1); 2873 })->prio (1);
2681} 2874}
2682 2875
2694sub cf::client::send_drawinfo { 2887sub cf::client::send_drawinfo {
2695 my ($self, $text, $flags) = @_; 2888 my ($self, $text, $flags) = @_;
2696 2889
2697 utf8::encode $text; 2890 utf8::encode $text;
2698 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2891 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2892}
2893
2894=item $client->send_big_packet ($pkt)
2895
2896Like C<send_packet>, but tries to compress large packets, and fragments
2897them as required.
2898
2899=cut
2900
2901our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2902
2903sub cf::client::send_big_packet {
2904 my ($self, $pkt) = @_;
2905
2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2909
2910 # split very large packets
2911 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2912 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2913 $pkt = "frag";
2914 }
2915
2916 $self->send_packet ($pkt);
2699} 2917}
2700 2918
2701=item $client->send_msg ($channel, $msg, $color, [extra...]) 2919=item $client->send_msg ($channel, $msg, $color, [extra...])
2702 2920
2703Send a drawinfo or msg packet to the client, formatting the msg for the 2921Send a drawinfo or msg packet to the client, formatting the msg for the
2707 2925
2708=cut 2926=cut
2709 2927
2710# non-persistent channels (usually the info channel) 2928# non-persistent channels (usually the info channel)
2711our %CHANNEL = ( 2929our %CHANNEL = (
2930 "c/motd" => {
2931 id => "infobox",
2932 title => "MOTD",
2933 reply => undef,
2934 tooltip => "The message of the day",
2935 },
2712 "c/identify" => { 2936 "c/identify" => {
2713 id => "infobox", 2937 id => "infobox",
2714 title => "Identify", 2938 title => "Identify",
2715 reply => undef, 2939 reply => undef,
2716 tooltip => "Items recently identified", 2940 tooltip => "Items recently identified",
2718 "c/examine" => { 2942 "c/examine" => {
2719 id => "infobox", 2943 id => "infobox",
2720 title => "Examine", 2944 title => "Examine",
2721 reply => undef, 2945 reply => undef,
2722 tooltip => "Signs and other items you examined", 2946 tooltip => "Signs and other items you examined",
2947 },
2948 "c/shopinfo" => {
2949 id => "infobox",
2950 title => "Shop Info",
2951 reply => undef,
2952 tooltip => "What your bargaining skill tells you about the shop",
2723 }, 2953 },
2724 "c/book" => { 2954 "c/book" => {
2725 id => "infobox", 2955 id => "infobox",
2726 title => "Book", 2956 title => "Book",
2727 reply => undef, 2957 reply => undef,
2743 id => "infobox", 2973 id => "infobox",
2744 title => "Body Parts", 2974 title => "Body Parts",
2745 reply => undef, 2975 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available", 2976 tooltip => "Shows which body parts you posess and are available",
2747 }, 2977 },
2978 "c/statistics" => {
2979 id => "infobox",
2980 title => "Statistics",
2981 reply => undef,
2982 tooltip => "Shows your primary statistics",
2983 },
2984 "c/skills" => {
2985 id => "infobox",
2986 title => "Skills",
2987 reply => undef,
2988 tooltip => "Shows your experience per skill and item power",
2989 },
2990 "c/shopitems" => {
2991 id => "infobox",
2992 title => "Shop Items",
2993 reply => undef,
2994 tooltip => "Shows the items currently for sale in this shop",
2995 },
2996 "c/resistances" => {
2997 id => "infobox",
2998 title => "Resistances",
2999 reply => undef,
3000 tooltip => "Shows your resistances",
3001 },
3002 "c/pets" => {
3003 id => "infobox",
3004 title => "Pets",
3005 reply => undef,
3006 tooltip => "Shows information abotu your pets/a specific pet",
3007 },
3008 "c/perceiveself" => {
3009 id => "infobox",
3010 title => "Perceive Self",
3011 reply => undef,
3012 tooltip => "You gained detailed knowledge about yourself",
3013 },
2748 "c/uptime" => { 3014 "c/uptime" => {
2749 id => "infobox", 3015 id => "infobox",
2750 title => "Uptime", 3016 title => "Uptime",
2751 reply => undef, 3017 reply => undef,
2752 tooltip => "How long the server has been running since last restart", 3018 tooltip => "How long the server has been running since last restart",
2755 id => "infobox", 3021 id => "infobox",
2756 title => "Map Info", 3022 title => "Map Info",
2757 reply => undef, 3023 reply => undef,
2758 tooltip => "Information related to the maps", 3024 tooltip => "Information related to the maps",
2759 }, 3025 },
3026 "c/party" => {
3027 id => "party",
3028 title => "Party",
3029 reply => "gsay ",
3030 tooltip => "Messages and chat related to your party",
3031 },
3032 "c/death" => {
3033 id => "death",
3034 title => "Death",
3035 reply => undef,
3036 tooltip => "Reason for and more info about your most recent death",
3037 },
3038 "c/say" => $SAY_CHANNEL,
3039 "c/chat" => $CHAT_CHANNEL,
2760); 3040);
2761 3041
2762sub cf::client::send_msg { 3042sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_; 3043 my ($self, $channel, $msg, $color, @extra) = @_;
2764 3044
2765 $msg = $self->pl->expand_cfpod ($msg); 3045 $msg = $self->pl->expand_cfpod ($msg)
3046 unless $color & cf::NDI_VERBATIM;
2766 3047
2767 $color &= cf::NDI_CLIENT_MASK; # just in case... 3048 $color &= cf::NDI_CLIENT_MASK; # just in case...
2768 3049
2769 # check predefined channels, for the benefit of C 3050 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) { 3051 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel}; 3052 $channel = $CHANNEL{$channel};
2772 3053
2773 $self->ext_msg (channel_info => $channel) 3054 $self->ext_msg (channel_info => $channel);
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id}; 3055 $channel = $channel->{id};
2777 3056
2778 } elsif (ref $channel) { 3057 } elsif (ref $channel) {
2779 # send meta info to client, if not yet sent 3058 # send meta info to client, if not yet sent
2780 unless (exists $self->{channel}{$channel->{id}}) { 3059 unless (exists $self->{channel}{$channel->{id}}) {
2781 $self->{channel}{$channel->{id}} = $channel; 3060 $self->{channel}{$channel->{id}} = $channel;
2782 $self->ext_msg (channel_info => $channel) 3061 $self->ext_msg (channel_info => $channel);
2783 if $self->can_msg;
2784 } 3062 }
2785 3063
2786 $channel = $channel->{id}; 3064 $channel = $channel->{id};
2787 } 3065 }
2788 3066
2789 return unless @extra || length $msg; 3067 return unless @extra || length $msg;
2790 3068
2791 if ($self->can_msg) {
2792 # default colour, mask it out 3069 # default colour, mask it out
2793 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3070 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794 if $color & cf::NDI_DEF; 3071 if $color & cf::NDI_DEF;
2795 3072
2796 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3073 my $pkt = "msg "
3074 . $self->{json_coder}->encode (
2797 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3075 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2798 } else { 3076 );
2799 if ($color >= 0) {
2800 # replace some tags by gcfclient-compatible ones
2801 for ($msg) {
2802 1 while
2803 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2804 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2805 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2806 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2807 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2808 }
2809 3077
2810 $color &= cf::NDI_COLOR_MASK; 3078 $self->send_big_packet ($pkt);
2811
2812 utf8::encode $msg;
2813
2814 if (0 && $msg =~ /\[/) {
2815 # COMMAND/INFO
2816 $self->send_packet ("drawextinfo $color 10 8 $msg")
2817 } else {
2818 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2819 $self->send_packet ("drawinfo $color $msg")
2820 }
2821 }
2822 }
2823} 3079}
2824 3080
2825=item $client->ext_msg ($type, @msg) 3081=item $client->ext_msg ($type, @msg)
2826 3082
2827Sends an ext event to the client. 3083Sends an ext event to the client.
2830 3086
2831sub cf::client::ext_msg($$@) { 3087sub cf::client::ext_msg($$@) {
2832 my ($self, $type, @msg) = @_; 3088 my ($self, $type, @msg) = @_;
2833 3089
2834 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2835 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2836 } elsif ($self->extcmd == 1) { # TODO: remove 3092 } elsif ($self->extcmd == 1) { # TODO: remove
2837 push @msg, msgtype => "event_$type"; 3093 push @msg, msgtype => "event_$type";
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2839 } 3095 }
2840} 3096}
2841 3097
2842=item $client->ext_reply ($msgid, @msg) 3098=item $client->ext_reply ($msgid, @msg)
2843 3099
2847 3103
2848sub cf::client::ext_reply($$@) { 3104sub cf::client::ext_reply($$@) {
2849 my ($self, $id, @msg) = @_; 3105 my ($self, $id, @msg) = @_;
2850 3106
2851 if ($self->extcmd == 2) { 3107 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3108 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2853 } elsif ($self->extcmd == 1) { 3109 } elsif ($self->extcmd == 1) {
2854 #TODO: version 1, remove 3110 #TODO: version 1, remove
2855 unshift @msg, msgtype => "reply", msgid => $id; 3111 unshift @msg, msgtype => "reply", msgid => $id;
2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3112 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 } 3113 }
2858} 3114}
2859 3115
2860=item $success = $client->query ($flags, "text", \&cb) 3116=item $success = $client->query ($flags, "text", \&cb)
2861 3117
2932 3188
2933 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
2934 if $reply; 3190 if $reply;
2935 3191
2936 } else { 3192 } else {
2937 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3193 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2938 } 3194 }
2939 3195
2940 cf::override; 3196 cf::override;
2941 }, 3197 },
2942); 3198);
2962 3218
2963 $coro 3219 $coro
2964} 3220}
2965 3221
2966cf::client->attach ( 3222cf::client->attach (
2967 on_destroy => sub { 3223 on_client_destroy => sub {
2968 my ($ns) = @_; 3224 my ($ns) = @_;
2969 3225
2970 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3226 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2971 }, 3227 },
2972); 3228);
2988our $safe_hole = new Safe::Hole; 3244our $safe_hole = new Safe::Hole;
2989 3245
2990$SIG{FPE} = 'IGNORE'; 3246$SIG{FPE} = 'IGNORE';
2991 3247
2992$safe->permit_only (Opcode::opset qw( 3248$safe->permit_only (Opcode::opset qw(
2993 :base_core :base_mem :base_orig :base_math 3249 :base_core :base_mem :base_orig :base_math :base_loop
2994 grepstart grepwhile mapstart mapwhile 3250 grepstart grepwhile mapstart mapwhile
2995 sort time 3251 sort time
2996)); 3252));
2997 3253
2998# here we export the classes and methods available to script code 3254# here we export the classes and methods available to script code
3001 3257
3002The following functions and methods are available within a safe environment: 3258The following functions and methods are available within a safe environment:
3003 3259
3004 cf::object 3260 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy 3261 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr 3262 insert remove name archname title slaying race decrease split
3263 value
3007 3264
3008 cf::object::player 3265 cf::object::player
3009 player 3266 player
3010 3267
3011 cf::player 3268 cf::player
3016 3273
3017=cut 3274=cut
3018 3275
3019for ( 3276for (
3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3277 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race 3278 insert remove inv nrof name archname title slaying race
3022 decrease_ob_nr destroy)], 3279 decrease split destroy change_exp value msg lore send_msg)],
3023 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
3024 ["cf::player" => qw(peaceful)], 3281 ["cf::player" => qw(peaceful send_msg)],
3025 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
3026) { 3283) {
3027 no strict 'refs';
3028 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
3029 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3030 for @funs; 3286 for @funs;
3031} 3287}
3032 3288
3047 3303
3048 my $qcode = $code; 3304 my $qcode = $code;
3049 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3305 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3050 $qcode =~ s/\n/\\n/g; 3306 $qcode =~ s/\n/\\n/g;
3051 3307
3308 %vars = (_dummy => 0) unless %vars;
3309
3310 my @res;
3052 local $_; 3311 local $_;
3053 local @safe::cf::_safe_eval_args = values %vars;
3054 3312
3055 my $eval = 3313 my $eval =
3056 "do {\n" 3314 "do {\n"
3057 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3315 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3058 . "#line 0 \"{$qcode}\"\n" 3316 . "#line 0 \"{$qcode}\"\n"
3059 . $code 3317 . $code
3060 . "\n}" 3318 . "\n}"
3061 ; 3319 ;
3062 3320
3321 if ($CFG{safe_eval}) {
3063 sub_generation_inc; 3322 sub_generation_inc;
3323 local @safe::cf::_safe_eval_args = values %vars;
3064 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3324 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3065 sub_generation_inc; 3325 sub_generation_inc;
3326 } else {
3327 local @cf::_safe_eval_args = values %vars;
3328 @res = wantarray ? eval eval : scalar eval $eval;
3329 }
3066 3330
3067 if ($@) { 3331 if ($@) {
3068 warn "$@"; 3332 warn "$@",
3069 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
3070 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
3071 } 3335 }
3072 3336
3073 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
3074} 3338}
3075 3339
3089=cut 3353=cut
3090 3354
3091sub register_script_function { 3355sub register_script_function {
3092 my ($fun, $cb) = @_; 3356 my ($fun, $cb) = @_;
3093 3357
3094 no strict 'refs'; 3358 $fun = "safe::$fun" if $CFG{safe_eval};
3095 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3359 *$fun = $safe_hole->wrap ($cb);
3096} 3360}
3097 3361
3098=back 3362=back
3099 3363
3100=cut 3364=cut
3109 # for this (global event?) 3373 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3111 3375
3112 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3113 3377
3114 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
3115 3379
3116 my $facedata;
3117 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
3118 or die "$path: $!"; 3381 or die "$path: $!";
3119 3382
3120 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
3121 3384
3122 $facedata->{version} == 2 3385 $facedata->{version} == 2
3123 or cf::cleanup "$path: version mismatch, cannot proceed."; 3386 or cf::cleanup "$path: version mismatch, cannot proceed.";
3124 3387
3125 # patch in the exptable 3388 # patch in the exptable
3389 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3126 $facedata->{resource}{"res/exp_table"} = { 3390 $facedata->{resource}{"res/exp_table"} = {
3127 type => FT_RSRC, 3391 type => FT_RSRC,
3128 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3392 data => $exp_table,
3393 hash => (Digest::MD5::md5 $exp_table),
3129 }; 3394 };
3130 cf::cede_to_tick; 3395 cf::cede_to_tick;
3131 3396
3132 { 3397 {
3133 my $faces = $facedata->{faceinfo}; 3398 my $faces = $facedata->{faceinfo};
3134 3399
3135 while (my ($face, $info) = each %$faces) { 3400 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3401 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3402
3137 cf::face::set_visibility $idx, $info->{visibility}; 3403 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3404 cf::face::set_magicmap $idx, $info->{magicmap};
3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3405 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3406 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3141 3407
3142 cf::cede_to_tick; 3408 cf::cede_to_tick;
3143 } 3409 }
3144 3410
3145 while (my ($face, $info) = each %$faces) { 3411 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3412 next unless $info->{smooth};
3413
3147 my $idx = cf::face::find $face 3414 my $idx = cf::face::find $face
3148 or next; 3415 or next;
3416
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3420 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
3154 } 3422 }
3155 3423
3156 cf::cede_to_tick; 3424 cf::cede_to_tick;
3157 } 3425 }
3158 } 3426 }
3167 3435
3168 cf::anim::invalidate_all; # d'oh 3436 cf::anim::invalidate_all; # d'oh
3169 } 3437 }
3170 3438
3171 { 3439 {
3172 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3440 my $res = $facedata->{resource};
3175 3441
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3442 while (my ($name, $info) = each %$res) {
3443 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data;
3181 3445
3182 if ($info->{type} & 1) { 3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3183 # prepend meta info 3447 cf::face::set_type $idx, $info->{type};
3184
3185 my $meta = $enc->encode ({
3186 name => $name,
3187 %{ $info->{meta} || {} },
3188 });
3189
3190 $data = pack "(w/a*)*", $meta, $info->{data};
3191 } else { 3448 } else {
3192 $data = $info->{data}; 3449 $RESOURCE{$name} = $info; # unused
3193 } 3450 }
3194 3451
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
3198 cf::cede_to_tick; 3452 cf::cede_to_tick;
3199 } 3453 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
3218 } 3454 }
3455
3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3457
3220 1 3458 1
3221} 3459}
3222 3460
3223register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
3225 3463
3226 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v); 3465 $ns->fx_want ($k, $v);
3228 } 3466 }
3229}; 3467};
3468
3469sub load_resource_file($) {
3470 my $guard = lock_acquire "load_resource_file";
3471
3472 my $status = load_resource_file_ $_[0];
3473 get_slot 0.1, 100;
3474 cf::arch::commit_load;
3475
3476 $status
3477}
3230 3478
3231sub reload_regions { 3479sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework 3480 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?) 3481 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = (); 3482 %ext::player_env::MUSIC_FACE_CACHE = ();
3248} 3496}
3249 3497
3250sub reload_archetypes { 3498sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes" 3499 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n"; 3500 or die "unable to load archetypes\n";
3253 #d# NEED to laod twice to resolve forward references
3254 # this really needs to be done in an extra post-pass
3255 # (which needs to be synchronous, so solve it differently)
3256 load_resource_file "$DATADIR/archetypes"
3257 or die "unable to load archetypes\n";
3258} 3501}
3259 3502
3260sub reload_treasures { 3503sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
3263} 3506}
3264 3507
3508sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n";
3510
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3515
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_]
3518 or next;
3519
3520 my $face = cf::face::find "sound/$sound->[1]";
3521 cf::sound::set $sound->[0] => $face;
3522 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3523 }
3524
3525 while (my ($k, $v) = each %{$soundconf->{event}}) {
3526 my $face = cf::face::find "sound/$v";
3527 cf::sound::set $k => $face;
3528 }
3529}
3530
3265sub reload_resources { 3531sub reload_resources {
3266 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3267 3533
3534 reload_exp_table;
3535 reload_materials;
3536 reload_facedata;
3537 reload_sound;
3538 reload_archetypes;
3268 reload_regions; 3539 reload_regions;
3269 reload_facedata;
3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures; 3540 reload_treasures;
3273 3541
3274 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3275}
3276
3277sub init {
3278 reload_resources;
3279} 3543}
3280 3544
3281sub reload_config { 3545sub reload_config {
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3546 trace "reloading config file...\n";
3283 or return;
3284 3547
3285 local $/; 3548 0 < aio_load "$CONFDIR/config", my $config
3549 or die "$CONFDIR/config: $!";
3550
3551 utf8::decode $config;
3552
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3286 *CFG = YAML::Syck::Load <$fh>; 3554 *CFG = YAML::XS::Load $config;
3287 3555
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3289 3557
3290 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3558 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3291 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3559 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3292 3560
3293 if (exists $CFG{mlockall}) { 3561 if (exists $CFG{mlockall}) {
3297 }; 3565 };
3298 warn $@ if $@; 3566 warn $@ if $@;
3299 } 3567 }
3300} 3568}
3301 3569
3570sub pidfile() {
3571 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3572 or die "$PIDFILE: $!";
3573 flock $fh, &Fcntl::LOCK_EX
3574 or die "$PIDFILE: flock: $!";
3575 $fh
3576}
3577
3578# make sure only one server instance is running at any one time
3579sub atomic {
3580 my $fh = pidfile;
3581
3582 my $pid = <$fh>;
3583 kill 9, $pid if $pid > 0;
3584
3585 seek $fh, 0, 0;
3586 print $fh $$;
3587}
3588
3589sub main_loop {
3590 trace "EV::loop starting\n";
3591 if (1) {
3592 EV::loop;
3593 }
3594 trace "EV::loop returned\n";
3595 goto &main_loop unless $REALLY_UNLOOP;
3596}
3597
3302sub main { 3598sub main {
3599 cf::init_globals; # initialise logging
3600
3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3602 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3604 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3605
3606 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3607
3303 # we must not ever block the main coroutine 3608 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3609 local $Coro::idle = sub {
3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3610 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3306 (async { 3611 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3612 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3613 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3614 })->prio (Coro::PRIO_MAX);
3310 }; 3615 };
3311 3616
3617 evthread_start IO::AIO::poll_fileno;
3618
3619 cf::sync_job {
3620 cf::incloader::init ();
3621
3622 cf::init_anim;
3623 cf::init_attackmess;
3624 cf::init_dynamic;
3625
3626 cf::load_settings;
3627
3628 reload_resources;
3312 reload_config; 3629 reload_config;
3313 db_init; 3630 db_init;
3631
3632 cf::init_uuid;
3633 cf::init_signals;
3634 cf::init_skills;
3635
3636 cf::init_beforeplay;
3637
3638 atomic;
3639
3314 load_extensions; 3640 load_extensions;
3315 3641
3316 $TICK_WATCHER->start; 3642 utime time, time, $RUNTIMEFILE;
3317 Event::loop; 3643
3644 # no (long-running) fork's whatsoever before this point(!)
3645 use POSIX ();
3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3647
3648 (pop @POST_INIT)->(0) while @POST_INIT;
3649 };
3650
3651 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n";
3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3659 goto &main_loop;
3318} 3660}
3319 3661
3320############################################################################# 3662#############################################################################
3321# initialisation and cleanup 3663# initialisation and cleanup
3322 3664
3323# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3324BEGIN { 3666BEGIN {
3667 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3327 reentrant => 0,
3328 data => WF_AUTOCANCEL,
3329 signal => $signal,
3330 prio => 0,
3331 cb => sub {
3332 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3333 },
3334 ); 3671 };
3335 } 3672 }
3336} 3673}
3337 3674
3338sub write_runtime { 3675sub write_runtime_sync {
3339 my $runtime = "$LOCALDIR/runtime"; 3676 my $t0 = AE::time;
3340 3677
3341 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3343 3680
3344 IO::AIO::aio_utime $runtime, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3345 3682
3346 my $guard = cf::lock_acquire "write_runtime"; 3683 my $guard = cf::lock_acquire "write_runtime";
3347 3684
3348 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3685 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3349 or return; 3686 or return;
3350 3687
3351 my $value = $cf::RUNTIME + 90 + 10; 3688 my $value = $cf::RUNTIME + 90 + 10;
3352 # 10 is the runtime save interval, for a monotonic clock 3689 # 10 is the runtime save interval, for a monotonic clock
3353 # 60 allows for the watchdog to kill the server. 3690 # 60 allows for the watchdog to kill the server.
3363 aio_utime $fh, undef, undef; 3700 aio_utime $fh, undef, undef;
3364 3701
3365 close $fh 3702 close $fh
3366 or return; 3703 or return;
3367 3704
3368 aio_rename "$runtime~", $runtime 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3369 and return; 3706 and return;
3370 3707
3371 warn "runtime file written.\n"; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3372 3709
3373 1 3710 1
3711}
3712
3713our $uuid_lock;
3714our $uuid_skip;
3715
3716sub write_uuid_sync($) {
3717 $uuid_skip ||= $_[0];
3718
3719 return if $uuid_lock;
3720 local $uuid_lock = 1;
3721
3722 my $uuid = "$LOCALDIR/uuid";
3723
3724 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3725 or return;
3726
3727 my $value = uuid_seq uuid_cur;
3728
3729 unless ($value) {
3730 info "cowardly refusing to write zero uuid value!\n";
3731 return;
3732 }
3733
3734 my $value = uuid_str $value + $uuid_skip;
3735 $uuid_skip = 0;
3736
3737 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3738 and return;
3739
3740 # always fsync - this file is important
3741 aio_fsync $fh
3742 and return;
3743
3744 close $fh
3745 or return;
3746
3747 aio_rename "$uuid~", $uuid
3748 and return;
3749
3750 trace "uuid file written ($value).\n";
3751
3752 1
3753
3754}
3755
3756sub write_uuid($$) {
3757 my ($skip, $sync) = @_;
3758
3759 $sync ? write_uuid_sync $skip
3760 : async { write_uuid_sync $skip };
3374} 3761}
3375 3762
3376sub emergency_save() { 3763sub emergency_save() {
3377 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3378 3765
3379 warn "enter emergency perl save\n"; 3766 info "emergency_perl_save: enter\n";
3767
3768 # this is a trade-off: we want to be very quick here, so
3769 # save all maps without fsync, and later call a global sync
3770 # (which in turn might be very very slow)
3771 local $USE_FSYNC = 0;
3380 3772
3381 cf::sync_job { 3773 cf::sync_job {
3774 cf::write_runtime_sync; # external watchdog should not bark
3775
3382 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3383 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3384 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3385 warn "begin emergency player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3386 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3387 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3388 $pl->valid or next; 3782 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3390 $pl->save; 3784 $pl->save;
3391 } 3785 }
3392 warn "end emergency player save\n"; 3786 info "emergency_perl_save: end player save\n";
3393 3787
3394 warn "begin emergency map save\n"; 3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3790 info "emergency_perl_save: begin map save\n";
3395 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3396 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3397 $map->valid or next; 3793 $map->valid or next;
3398 $map->save; 3794 $map->save;
3399 } 3795 }
3400 warn "end emergency map save\n"; 3796 info "emergency_perl_save: end map save\n";
3401 3797
3402 warn "begin emergency database checkpoint\n"; 3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3800 info "emergency_perl_save: begin database checkpoint\n";
3403 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3404 warn "end emergency database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3803
3804 info "emergency_perl_save: begin write uuid\n";
3805 write_uuid_sync 1;
3806 info "emergency_perl_save: end write uuid\n";
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: syncing database to disk";
3811 BDB::db_env_txn_checkpoint $DB_ENV;
3812
3813 info "emergency_perl_save: starting sync\n";
3814 IO::AIO::aio_sync sub {
3815 info "emergency_perl_save: finished sync\n";
3816 };
3817
3818 cf::write_runtime_sync; # external watchdog should not bark
3819
3820 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3823 }
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3405 }; 3826 };
3406 3827
3407 warn "leave emergency perl save\n"; 3828 info "emergency_perl_save: leave\n";
3408} 3829}
3409 3830
3410sub post_cleanup { 3831sub post_cleanup {
3411 my ($make_core) = @_; 3832 my ($make_core) = @_;
3412 3833
3834 IO::AIO::flush;
3835
3413 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3414 if $make_core; 3837 if $make_core;
3838
3839 my $fh = pidfile;
3840 unlink $PIDFILE if <$fh> == $$;
3841}
3842
3843# a safer delete_package, copied from Symbol
3844sub clear_package($) {
3845 my $pkg = shift;
3846
3847 # expand to full symbol table name if needed
3848 unless ($pkg =~ /^main::.*::$/) {
3849 $pkg = "main$pkg" if $pkg =~ /^::/;
3850 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3851 $pkg .= '::' unless $pkg =~ /::$/;
3852 }
3853
3854 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3855 my $stem_symtab = *{$stem}{HASH};
3856
3857 defined $stem_symtab and exists $stem_symtab->{$leaf}
3858 or return;
3859
3860 # clear all symbols
3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3862 for my $name (keys %$leaf_symtab) {
3863 _gv_clear *{"$pkg$name"};
3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3865 }
3415} 3866}
3416 3867
3417sub do_reload_perl() { 3868sub do_reload_perl() {
3418 # can/must only be called in main 3869 # can/must only be called in main
3419 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3420 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3421 return; 3872 return;
3422 } 3873 }
3423 3874
3875 return if $RELOAD++;
3876
3877 my $t1 = AE::time;
3878
3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3424 warn "reloading..."; 3881 info "reloading...";
3425 3882
3426 warn "entering sync_job"; 3883 trace "entering sync_job";
3427 3884
3428 cf::sync_job { 3885 cf::sync_job {
3429 cf::write_runtime; # external watchdog should not bark
3430 cf::emergency_save; 3886 #cf::emergency_save;
3431 cf::write_runtime; # external watchdog should not bark
3432 3887
3433 warn "syncing database to disk";
3434 BDB::db_env_txn_checkpoint $DB_ENV;
3435
3436 # if anything goes wrong in here, we should simply crash as we already saved
3437
3438 warn "cancelling all WF_AUTOCANCEL watchers";
3439 for (Event::all_watchers) {
3440 $_->cancel if $_->data & WF_AUTOCANCEL;
3441 }
3442
3443 warn "flushing outstanding aio requests";
3444 for (;;) {
3445 BDB::flush;
3446 IO::AIO::flush;
3447 Coro::cede_notself;
3448 last unless IO::AIO::nreqs || BDB::nreqs;
3449 warn "iterate...";
3450 }
3451
3452 ++$RELOAD;
3453
3454 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3455 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3456 %EXT_CORO = (); 3890 %EXT_CORO = ();
3457 3891
3458 warn "removing commands"; 3892 trace "removing commands";
3459 %COMMAND = (); 3893 %COMMAND = ();
3460 3894
3461 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3462 %EXTCMD = (); 3896 %EXTCMD = ();
3463 %EXTICMD = (); 3897 %EXTICMD = ();
3464 3898
3465 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3466 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3467 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3468 3902
3469 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3470 eval { 3904 eval {
3471 $cb->($pkg); 3905 $cb->($pkg);
3472 1 3906 1
3473 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3908 }
3909
3910 trace "... clearing $pkg";
3911 clear_package $pkg;
3474 } 3912 }
3475 3913
3476 warn "... nuking $pkg";
3477 Symbol::delete_package $pkg;
3478 }
3479
3480 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3481 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3482 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3483 3917
3484 warn "... unloading $k"; 3918 trace "... unloading $k";
3485 delete $INC{$k}; 3919 delete $INC{$k};
3486 3920
3487 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3488 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3489 3923
3490 if (my $cb = $k->can ("unload_module")) { 3924 if (my $cb = $k->can ("unload_module")) {
3491 $cb->(); 3925 $cb->();
3926 }
3927
3928 clear_package $k;
3492 } 3929 }
3493 3930
3494 Symbol::delete_package $k;
3495 }
3496
3497 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3498 Symbol::delete_package "safe::$_" 3932 clear_package "safe::$_"
3499 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3500 3934
3501 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3502 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3503 delete $INC{"cf/pod.pm"}; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3504 3938
3505 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3506 # and global variables created in xs 3940 # and global variables created in xs
3507 #Symbol::delete_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3508 3942
3509 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3510 3944
3511 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3512 require cf; 3946 require cf;
3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3947 cf::_connect_to_perl_1;
3514 3948
3515 warn "loading config and database again"; 3949 trace "loading config and database again";
3516 cf::reload_config; 3950 cf::reload_config;
3517 3951
3518 warn "loading extensions"; 3952 trace "loading extensions";
3519 cf::load_extensions; 3953 cf::load_extensions;
3520 3954
3955 if ($REATTACH_ON_RELOAD) {
3521 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3522 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3523 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3524 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3525 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3526 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3962 }
3527 3963
3964 trace "running post_init jobs";
3965 (pop @POST_INIT)->(1) while @POST_INIT;
3966
3528 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3529 3968
3530 1 3969 1
3531 } or do { 3970 } or do {
3532 warn $@; 3971 error $@;
3533 warn "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3534 exit 1; 3973 };
3974
3975 info "reloaded";
3976 --$RELOAD;
3535 }; 3977 }
3536 3978
3537 warn "reloaded"; 3979 $t1 = AE::time - $t1;
3980 info "reload completed in ${t1}s\n";
3538}; 3981};
3539 3982
3540our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3541 3984
3542sub reload_perl() { 3985sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 3986 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3545 3988
3546 $RELOAD_WATCHER ||= Event->timer ( 3989 $RELOAD_WATCHER ||= cf::async {
3547 reentrant => 0, 3990 Coro::AIO::aio_wait cache_extensions;
3548 after => 0, 3991
3549 data => WF_AUTOCANCEL, 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3550 cb => sub {
3551 do_reload_perl; 3993 do_reload_perl;
3552 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3553 }, 3995 };
3554 ); 3996 };
3555} 3997}
3556 3998
3557register_command "reload" => sub { 3999register_command "reload" => sub {
3558 my ($who, $arg) = @_; 4000 my ($who, $arg) = @_;
3559 4001
3564 reload_perl; 4006 reload_perl;
3565 }; 4007 };
3566 } 4008 }
3567}; 4009};
3568 4010
3569unshift @INC, $LIBDIR; 4011#############################################################################
3570 4012
3571my $bug_warning = 0; 4013my $bug_warning = 0;
3572 4014
3573our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3575 4017
3576sub wait_for_tick { 4018sub wait_for_tick() {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3579 4020
3580 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait; 4023 $signal->wait;
3583} 4024}
3584 4025
3585sub wait_for_tick_begin { 4026sub wait_for_tick_begin() {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3588 4028
3589 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 4031 $signal->wait;
3592} 4032}
3593 4033
3594$TICK_WATCHER = Event->timer ( 4034sub tick {
3595 reentrant => 0,
3596 parked => 1,
3597 prio => 0,
3598 at => $NEXT_TICK || $TICK,
3599 data => WF_AUTOCANCEL,
3600 cb => sub {
3601 if ($Coro::current != $Coro::main) { 4035 if ($Coro::current != $Coro::main) {
3602 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4036 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3603 unless ++$bug_warning > 10; 4037 unless ++$bug_warning > 10;
3604 return; 4038 return;
3605 } 4039 }
3606 4040
3607 $NOW = $tick_start = Event::time;
3608
3609 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3610 4042
3611 $RUNTIME += $TICK; 4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3612 $NEXT_TICK += $TICK;
3613 4044
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 4047 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 4049 write_runtime_sync
3619 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3620 };
3621 } 4051 };
4052 }
3622 4053
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 4055 $sig->send;
3625 } 4056 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 4057 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 4058 $sig->send;
3628 } 4059 }
3629 4060
3630 $NOW = Event::time; 4061 $LOAD = ($NOW - $TICK_START) / $TICK;
3631
3632 # if we are delayed by four ticks or more, skip them all
3633 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3634
3635 $TICK_WATCHER->at ($NEXT_TICK);
3636 $TICK_WATCHER->start;
3637
3638 $LOAD = ($NOW - $tick_start) / $TICK;
3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4062 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 4063
3641 _post_tick; 4064 if (0) {
4065 if ($NEXT_TICK) {
4066 my $jitter = $TICK_START - $NEXT_TICK;
4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4068 debug "jitter $JITTER\n";#d#
4069 }
3642 }, 4070 }
3643); 4071}
3644 4072
3645{ 4073{
4074 # configure BDB
4075
3646 BDB::min_parallel 8; 4076 BDB::min_parallel 16;
3647 BDB::max_poll_time $TICK * 0.1; 4077 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 4078 $AnyEvent::BDB::WATCHER->priority (1);
3649 reentrant => 0,
3650 fd => BDB::poll_fileno,
3651 poll => 'r',
3652 prio => 0,
3653 data => WF_AUTOCANCEL,
3654 cb => \&BDB::poll_cb,
3655 );
3656
3657 BDB::set_sync_prepare {
3658 my $status;
3659 my $current = $Coro::current;
3660 (
3661 sub {
3662 $status = $!;
3663 $current->ready; undef $current;
3664 },
3665 sub {
3666 Coro::schedule while defined $current;
3667 $! = $status;
3668 },
3669 )
3670 };
3671 4079
3672 unless ($DB_ENV) { 4080 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 4081 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4082 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3675 | BDB::LOG_AUTOREMOVE, 1); 4083 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4084 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4085 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4086 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3678 4087
3679 cf::sync_job { 4088 cf::sync_job {
3680 eval { 4089 eval {
3690 4099
3691 cf::cleanup "db_env_open(db): $@" if $@; 4100 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 4101 };
3693 } 4102 }
3694 4103
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 4104 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4105 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 ); 4106 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4107 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4108 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 4109 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 4110 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4111 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 4112 };
3725} 4113}
3726 4114
3727{ 4115{
4116 # configure IO::AIO
4117
3728 IO::AIO::min_parallel 8; 4118 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 4119 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 4120 undef $AnyEvent::AIO::WATCHER;
3733 reentrant => 0,
3734 data => WF_AUTOCANCEL,
3735 fd => IO::AIO::poll_fileno,
3736 poll => 'r',
3737 prio => 0,
3738 cb => \&IO::AIO::poll_cb,
3739 );
3740} 4121}
3741 4122
3742my $_log_backtrace; 4123my $_log_backtrace;
3743 4124
3744sub _log_backtrace { 4125sub _log_backtrace {
3747 $msg =~ s/\n//; 4128 $msg =~ s/\n//;
3748 4129
3749 # limit the # of concurrent backtraces 4130 # limit the # of concurrent backtraces
3750 if ($_log_backtrace < 2) { 4131 if ($_log_backtrace < 2) {
3751 ++$_log_backtrace; 4132 ++$_log_backtrace;
4133 my $perl_bt = Carp::longmess $msg;
3752 async { 4134 async {
3753 $Coro::current->{desc} = "abt $msg"; 4135 $Coro::current->{desc} = "abt $msg";
3754 4136
3755 my @bt = fork_call { 4137 my @bt = fork_call {
3756 @addr = map { sprintf "%x", $_ } @addr; 4138 @addr = map { sprintf "%x", $_ } @addr;
3767 } 4149 }
3768 4150
3769 @funcs 4151 @funcs
3770 }; 4152 };
3771 4153
3772 LOG llevInfo, "[ABT] $msg\n"; 4154 LOG llevInfo, "[ABT] $perl_bt\n";
4155 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3773 LOG llevInfo, "[ABT] $_\n" for @bt; 4156 LOG llevInfo, "[ABT] $_\n" for @bt;
3774 --$_log_backtrace; 4157 --$_log_backtrace;
3775 }; 4158 };
3776 } else { 4159 } else {
3777 LOG llevInfo, "[ABT] $msg\n"; 4160 LOG llevInfo, "[ABT] $msg\n";
3778 LOG llevInfo, "[ABT] [suppressed]\n"; 4161 LOG llevInfo, "[ABT] [suppressed]\n";
3779 } 4162 }
3780} 4163}
3781 4164
3782# load additional modules 4165# load additional modules
3783use cf::pod; 4166require "cf/$_.pm" for @EXTRA_MODULES;
4167cf::_connect_to_perl_2;
3784 4168
3785END { cf::emergency_save } 4169END { cf::emergency_save }
3786 4170
37871 41711
3788 4172

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines