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.368 by root, Wed Sep 12 11:18:25 2007 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines