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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines