ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.299 by root, Sun Jul 8 14:56:05 2007 UTC vs.
Revision 1.543 by root, Wed May 5 23:23:29 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines