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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines