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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines