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.295 by root, Wed Jul 4 05:08:15 2007 UTC vs.
Revision 1.535 by root, Thu Apr 29 08:21:28 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines