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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines