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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines