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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines