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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines