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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines