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.306 by root, Sat Jul 14 14:33:30 2007 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines