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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines