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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.543 by root, Wed May 5 23:23:29 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines