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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines