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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines