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.293 by root, Tue Jul 3 05:14:15 2007 UTC vs.
Revision 1.538 by root, Tue May 4 21:45:43 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines