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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.297 by root, Thu Jul 5 08:10:30 2007 UTC vs.
Revision 1.532 by root, Thu Apr 29 07:32:34 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines