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.302 by root, Tue Jul 10 16:23:59 2007 UTC vs.
Revision 1.538 by root, Tue May 4 21:45:43 2010 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines