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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines