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.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.540 by root, Tue May 4 23:32: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);
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
919=cut 1102=cut
920 1103
921############################################################################# 1104#############################################################################
922# object support 1105# object support
923 1106
1107sub _object_equal($$);
1108sub _object_equal($$) {
1109 my ($a, $b) = @_;
1110
1111 return 0 unless (ref $a) eq (ref $b);
1112
1113 if ("HASH" eq ref $a) {
1114 my @ka = keys %$a;
1115 my @kb = keys %$b;
1116
1117 return 0 if @ka != @kb;
1118
1119 for (0 .. $#ka) {
1120 return 0 unless $ka[$_] eq $kb[$_];
1121 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1122 }
1123
1124 } elsif ("ARRAY" eq ref $a) {
1125
1126 return 0 if @$a != @$b;
1127
1128 for (0 .. $#$a) {
1129 return 0 unless _object_equal $a->[$_], $b->[$_];
1130 }
1131
1132 } elsif ($a ne $b) {
1133 return 0;
1134 }
1135
1136 1
1137}
1138
1139our $SLOW_MERGES;#d#
1140sub _can_merge {
1141 my ($ob1, $ob2) = @_;
1142
1143 ++$SLOW_MERGES;#d#
1144
1145 # we do the slow way here
1146 return _object_equal $ob1, $ob2
1147}
1148
924sub reattach { 1149sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1151 my ($obj) = @_;
927 1152
1153 # no longer needed after getting rid of delete_package?
928 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
929 1155
930 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
931 1157
932 @$registry = (); 1158 @$registry = ();
933 1159
938 for (@$attach) { 1164 for (@$attach) {
939 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
940 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
941 } 1167 }
942 } else { 1168 } else {
943 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
944 } 1170 }
945 } 1171 }
946} 1172}
947 1173
948cf::attachable->attach ( 1174cf::attachable->attach (
949 prio => -1000000, 1175 prio => -1000000,
950 on_instantiate => sub { 1176 on_instantiate => sub {
951 my ($obj, $data) = @_; 1177 my ($obj, $data) = @_;
952 1178
953 $data = from_json $data; 1179 $data = decode_json $data;
954 1180
955 for (@$data) { 1181 for (@$data) {
956 my ($name, $args) = @$_; 1182 my ($name, $args) = @$_;
957 1183
958 $obj->attach ($name, %{$args || {} }); 1184 $obj->attach ($name, %{$args || {} });
974sub object_freezer_save { 1200sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
976 1202
977 sync_job { 1203 sync_job {
978 if (length $$rdata) { 1204 if (length $$rdata) {
1205 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
981 1209
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 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 }
986 close $fh; 1217 aio_close $fh;
987 1218
988 if (@$objs) { 1219 if (@$objs) {
989 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) {
990 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
993 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 }
994 close $fh; 1228 aio_close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
996 } 1230 }
997 } else { 1231 } else {
998 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
999 } 1233 }
1000 1234
1001 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1002 } else { 1239 } else {
1003 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1004 } 1241 }
1005 } else { 1242 } else {
1006 aio_unlink $filename; 1243 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1008 } 1245 }
1009 } 1246 };
1010} 1247}
1011 1248
1012sub object_freezer_as_string { 1249sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1250 my ($rdata, $objs) = @_;
1014 1251
1026 or return; 1263 or return;
1027 1264
1028 unless (aio_stat "$filename.pst") { 1265 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1266 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1267 or return;
1268
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1269 my $st = eval { Coro::Storable::thaw $av };
1270 $av = $st->{objs};
1032 } 1271 }
1033 1272
1273 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1277
1036 return ($data, $av); 1278 ($data, $av)
1037} 1279}
1038 1280
1039=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1040 1282
1041=over 4 1283=over 4
1095 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1096 1338
1097 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1098} 1340}
1099 1341
1342use File::Glob ();
1343
1100cf::player->attach ( 1344cf::player->attach (
1101 on_command => sub { 1345 on_unknown_command => sub {
1102 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1103 1347
1104 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1105 or return; 1349 or return;
1106 1350
1114 my ($pl, $buf) = @_; 1358 my ($pl, $buf) = @_;
1115 1359
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1360 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1361
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1370 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1371 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1372 }
1373
1374 $pl->ext_reply ($reply, @reply)
1375 if $reply;
1376
1124 } else { 1377 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1379 }
1127 1380
1128 cf::override; 1381 cf::override;
1129 }, 1382 },
1130); 1383);
1131 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
1132sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1133 cf::sync_job { 1401 cf::sync_job {
1134 my %todo; 1402 my %todo;
1135 1403
1136 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1137 next unless -r $path; 1405 next unless -r $path;
1155 1423
1156 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1157 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1158 1426
1159 $ext{source} = 1427 $ext{source} =
1160 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1161 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1162 . $source 1430 . $source
1163 . "\n};\n1"; 1431 . "\n};\n1";
1164 1432
1165 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1166 } 1434 }
1167 1435
1436 my $pass = 0;
1168 my %done; 1437 my %done;
1169 while (%todo) { 1438 while (%todo) {
1170 my $progress; 1439 my $progress;
1171 1440
1441 ++$pass;
1442
1443 ext:
1172 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1173 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1174 goto skip 1446 next ext
1175 unless exists $done{$_}; 1447 unless exists $done{$_};
1176 } 1448 }
1177 1449
1178 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1179 1451
1180 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1181 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1182 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1183 1457
1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1184 if (exists $v->{meta}{mandatory}) { 1459 if exists $v->{meta}{mandatory};
1185 warn $msg; 1460
1186 warn "mandatory extension failed to load, exiting.\n"; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1187 exit 1; 1462 delete $todo{$k};
1188 } 1463 } else {
1189 1464 $done{$k} = delete $todo{$k};
1190 warn $msg; 1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1191 } 1470 }
1192
1193 $done{$k} = delete $todo{$k};
1194 push @EXTS, $v->{pkg};
1195 $progress = 1;
1196 } 1471 }
1197 1472
1198 skip: 1473 unless ($progress) {
1199 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1200 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1201 } 1481 }
1202 }; 1482 };
1203} 1483}
1204 1484
1205############################################################################# 1485#############################################################################
1206 1486
1207=back 1487=back
1208 1488
1209=head2 CORE EXTENSIONS 1489=head2 CORE EXTENSIONS
1210 1490
1211Functions and methods that extend core crossfire objects. 1491Functions and methods that extend core deliantra objects.
1212 1492
1213=cut 1493=cut
1214 1494
1215package cf::player; 1495package cf::player;
1216 1496
1217use Coro::AIO; 1497use Coro::AIO;
1218 1498
1219=head3 cf::player 1499=head3 cf::player
1220 1500
1221=over 4 1501=over 4
1502
1503=item cf::player::num_playing
1504
1505Returns the official number of playing players, as per the Crossfire metaserver rules.
1506
1507=cut
1508
1509sub num_playing {
1510 scalar grep
1511 $_->ob->map
1512 && !$_->hidden
1513 && !$_->ob->flag (cf::FLAG_WIZ),
1514 cf::player::list
1515}
1222 1516
1223=item cf::player::find $login 1517=item cf::player::find $login
1224 1518
1225Returns the given player object, loading it if necessary (might block). 1519Returns the given player object, loading it if necessary (might block).
1226 1520
1245 1539
1246sub exists($) { 1540sub exists($) {
1247 my ($login) = @_; 1541 my ($login) = @_;
1248 1542
1249 $cf::PLAYER{$login} 1543 $cf::PLAYER{$login}
1250 or cf::sync_job { !aio_stat path $login } 1544 or !aio_stat path $login
1251} 1545}
1252 1546
1253sub find($) { 1547sub find($) {
1254 return $cf::PLAYER{$_[0]} || do { 1548 return $cf::PLAYER{$_[0]} || do {
1255 my $login = $_[0]; 1549 my $login = $_[0];
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1556 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1557 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1558 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1559 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1560
1267 my $pl = load_pl path $login 1561 my $f = new_from_file cf::object::thawer path $login
1268 or return; 1562 or return;
1563
1564 my $pl = cf::player::load_pl $f
1565 or return;
1566
1567 local $cf::PLAYER_LOADING{$login} = $pl;
1568 $f->resolve_delayed_derefs;
1269 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1270 } 1570 }
1271 } 1571 }
1272} 1572}
1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1273 1586
1274sub save($) { 1587sub save($) {
1275 my ($pl) = @_; 1588 my ($pl) = @_;
1276 1589
1277 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1282 return if $pl->{deny_save}; 1595 return if $pl->{deny_save};
1283 1596
1284 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1286 1599
1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1604
1287 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1288 Coro::cede; 1606 cf::cede_to_tick;
1289} 1607}
1290 1608
1291sub new($) { 1609sub new($) {
1292 my ($login) = @_; 1610 my ($login) = @_;
1293 1611
1299 $cf::PLAYER{$login} = $self; 1617 $cf::PLAYER{$login} = $self;
1300 1618
1301 $self 1619 $self
1302} 1620}
1303 1621
1622=item $player->send_msg ($channel, $msg, $color, [extra...])
1623
1624=cut
1625
1626sub send_msg {
1627 my $ns = shift->ns
1628 or return;
1629 $ns->send_msg (@_);
1630}
1631
1304=item $pl->quit_character 1632=item $pl->quit_character
1305 1633
1306Nukes the player without looking back. If logged in, the connection will 1634Nukes the player without looking back. If logged in, the connection will
1307be destroyed. May block for a long time. 1635be destroyed. May block for a long time.
1308 1636
1312 my ($pl) = @_; 1640 my ($pl) = @_;
1313 1641
1314 my $name = $pl->ob->name; 1642 my $name = $pl->ob->name;
1315 1643
1316 $pl->{deny_save} = 1; 1644 $pl->{deny_save} = 1;
1317 $pl->password ("*"); # this should lock out the player until we nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1318 1646
1319 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1320 $pl->deactivate; 1648 $pl->deactivate;
1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1321 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1322 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1323 1652
1324 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1325 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1361 or return []; 1690 or return [];
1362 1691
1363 my @logins; 1692 my @logins;
1364 1693
1365 for my $login (@$dirs) { 1694 for my $login (@$dirs) {
1695 my $path = path $login;
1696
1697 # a .pst is a dead give-away for a valid player
1698 # if no pst file found, open and chekc for blocked users
1699 if (aio_stat "$path.pst") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1700 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1701 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1702 $buf !~ /^password -------------$/m or next; # official not-valid tag
1703 }
1369 1704
1370 utf8::decode $login; 1705 utf8::decode $login;
1371 push @logins, $login; 1706 push @logins, $login;
1372 } 1707 }
1373 1708
1374 \@logins 1709 \@logins
1375} 1710}
1376 1711
1377=item $player->maps 1712=item $player->maps
1713
1714=item cf::player::maps $login
1378 1715
1379Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1380player. May block. 1717player. May block.
1381 1718
1382=cut 1719=cut
1400 } 1737 }
1401 1738
1402 \@paths 1739 \@paths
1403} 1740}
1404 1741
1405=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1742=item $protocol_xml = $player->expand_cfpod ($cfpod)
1406 1743
1407Expand crossfire pod fragments into protocol xml. 1744Expand deliantra pod fragments into protocol xml.
1408 1745
1409=cut
1410
1411sub expand_cfpod {
1412 ((my $self), (local $_)) = @_;
1413
1414 # escape & and <
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417
1418 # this is buggy, it needs to properly take care of nested <'s
1419
1420 1 while
1421 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/
1425 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1
1428 }ge
1429 # replace H<hint text>
1430 || s{H<([^\>]*)>}
1431 {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "")
1435 [$self->{hintmode}]
1436 }ge;
1437
1438 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g;
1440
1441 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines
1446
1447 $_
1448}
1449
1450sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode}
1453}
1454
1455=item $player->ext_reply ($msgid, %msg) 1746=item $player->ext_reply ($msgid, @msg)
1456 1747
1457Sends an ext reply to the player. 1748Sends an ext reply to the player.
1458 1749
1459=cut 1750=cut
1460 1751
1461sub ext_reply($$%) { 1752sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1753 my ($self, $id, @msg) = @_;
1463 1754
1464 $msg{msgid} = $id; 1755 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1756}
1467 1757
1468=item $player->ext_event ($type, %msg) 1758=item $player->ext_msg ($type, @msg)
1469 1759
1470Sends an ext event to the client. 1760Sends an ext event to the client.
1471 1761
1472=cut 1762=cut
1473 1763
1474sub ext_event($$%) { 1764sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1765 my ($self, $type, @msg) = @_;
1476 1766
1477 $self->ns->ext_event ($type, %msg); 1767 $self->ns->ext_msg ($type, @msg);
1478} 1768}
1479 1769
1480=head3 cf::region 1770=head3 cf::region
1481 1771
1482=over 4 1772=over 4
1491 1781
1492=cut 1782=cut
1493 1783
1494sub find_by_path($) { 1784sub find_by_path($) {
1495 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1496 1788
1497 my ($match, $specificity); 1789 my ($match, $specificity);
1498 1790
1499 for my $region (list) { 1791 for my $region (list) {
1500 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1526our $MAX_RESET = 3600; 1818our $MAX_RESET = 3600;
1527our $DEFAULT_RESET = 3000; 1819our $DEFAULT_RESET = 3000;
1528 1820
1529sub generate_random_map { 1821sub generate_random_map {
1530 my ($self, $rmp) = @_; 1822 my ($self, $rmp) = @_;
1823
1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825
1531 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1532 $self->_create_random_map ( 1827 $self->_create_random_map (
1533 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1534 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1535 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1536 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1537 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1538 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1539 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1554 1849
1555sub register { 1850sub register {
1556 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1557 my $pkg = caller; 1852 my $pkg = caller;
1558 1853
1559 no strict;
1560 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1561 1855
1562 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1563} 1857}
1564 1858
1565# also paths starting with '/' 1859# also paths starting with '/'
1566$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1567 1861
1568sub thawer_merge { 1862sub thawer_merge {
1569 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1570 1864
1571 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1657 1951
1658# the temporary/swap location 1952# the temporary/swap location
1659sub save_path { 1953sub save_path {
1660 my ($self) = @_; 1954 my ($self) = @_;
1661 1955
1662 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1663 "$TMPDIR/$path.map" 1957 "$TMPDIR/$path.map"
1664} 1958}
1665 1959
1666# the unique path, undef == no special unique path 1960# the unique path, undef == no special unique path
1667sub uniq_path { 1961sub uniq_path {
1668 my ($self) = @_; 1962 my ($self) = @_;
1669 1963
1670 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1671 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1672}
1673
1674# and all this just because we cannot iterate over
1675# all maps in C++...
1676sub change_all_map_light {
1677 my ($change) = @_;
1678
1679 $_->change_map_light ($change)
1680 for grep $_->outdoor, values %cf::MAP;
1681} 1966}
1682 1967
1683sub decay_objects { 1968sub decay_objects {
1684 my ($self) = @_; 1969 my ($self) = @_;
1685 1970
1698 1983
1699sub load_header_from($) { 1984sub load_header_from($) {
1700 my ($self, $path) = @_; 1985 my ($self, $path) = @_;
1701 1986
1702 utf8::encode $path; 1987 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1988 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 or return; 1989 or return;
1990
1991 $self->_load_header ($f)
1992 or return;
1993
1994 local $MAP_LOADING{$self->{path}} = $self;
1995 $f->resolve_delayed_derefs;
1708 1996
1709 $self->{load_path} = $path; 1997 $self->{load_path} = $path;
1710 1998
1711 1 1999 1
1712} 2000}
1766sub find { 2054sub find {
1767 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1768 2056
1769 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1770 2058
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1772 2061
1773 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
1774 my $guard = cf::lock_acquire "map_find:$path";
1775 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
1776 or return; 2064 or return;
1777 2065
1778 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1779 2067
1781 or return; 2069 or return;
1782 2070
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2071 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 2072 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 2073 #$cf::WAIT_FOR_TICK->wait;
2074 undef $guard2;
2075 undef $guard1;
1786 $map->reset; 2076 $map->reset;
1787 undef $guard;
1788 return find $path; 2077 return find $path;
1789 } 2078 }
1790 2079
1791 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1792 } 2081 }
1793} 2082}
1794 2083
1795sub pre_load { } 2084sub pre_load { }
1796sub post_load { } 2085#sub post_load { } # XS
1797 2086
1798sub load { 2087sub load {
1799 my ($self) = @_; 2088 my ($self) = @_;
1800 2089
1801 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
1802 2091
1803 my $path = $self->{path}; 2092 my $path = $self->{path};
1804 2093
1805 { 2094 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 2095 my $guard = cf::lock_acquire "map_data:$path";
1807 2096
2097 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 2098 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 2099
1810 $self->in_memory (cf::MAP_LOADING); 2100 $self->in_memory (cf::MAP_LOADING);
1811 2101
1812 $self->alloc; 2102 $self->alloc;
1813 2103
1814 $self->pre_load; 2104 $self->pre_load;
1815 Coro::cede; 2105 cf::cede_to_tick;
1816 2106
2107 my $f = new_from_file cf::object::thawer $self->{load_path};
2108 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2109 $self->_load_objects ($f)
1818 or return; 2110 or return;
1819 2111
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
1821 if delete $self->{load_original}; 2113 if delete $self->{load_original};
1822 2114
1823 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2116 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2117 unless (aio_stat $uniq) {
2118 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2119 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2120 $self->_load_objects ($f);
2121 $f->resolve_delayed_derefs;
2122 }
1828 } 2123 }
1829 } 2124 }
1830 2125
1831 Coro::cede; 2126 $f->resolve_delayed_derefs;
2127
2128 cf::cede_to_tick;
1832 # now do the right thing for maps 2129 # now do the right thing for maps
1833 $self->link_multipart_objects; 2130 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2131 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2132 unless $self->difficulty;
1836 Coro::cede; 2133 cf::cede_to_tick;
1837 2134
1838 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2136 $self->decay_objects;
1840 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
1841 $self->update_buttons; 2138 $self->update_buttons;
1842 Coro::cede; 2139 cf::cede_to_tick;
1843 $self->set_darkness_map;
1844 Coro::cede;
1845 $self->activate; 2140 $self->activate;
1846 } 2141 }
1847 2142
2143 $self->{last_save} = $cf::RUNTIME;
2144 $self->last_access ($cf::RUNTIME);
2145
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2146 $self->in_memory (cf::MAP_ACTIVE);
1849 } 2147 }
1850 2148
1851 $self->post_load; 2149 $self->post_load;
1852} 2150}
1853 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
1854sub customise_for { 2155sub customise_for {
1855 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
1856 2157
1857 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
1858 if $self->per_player; 2159 if $self->per_player;
1862 2163
1863 $self 2164 $self
1864} 2165}
1865 2166
1866# find and load all maps in the 3x3 area around a map 2167# find and load all maps in the 3x3 area around a map
1867sub load_diag { 2168sub load_neighbours {
1868 my ($map) = @_; 2169 my ($map) = @_;
1869 2170
1870 my @diag; # diagonal neighbours 2171 my @neigh; # diagonal neighbours
1871 2172
1872 for (0 .. 3) { 2173 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2174 my $neigh = $map->tile_path ($_)
1874 or next; 2175 or next;
1875 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
1876 or next; 2177 or next;
1877 $neigh->load; 2178 $neigh->load;
1878 2179
2180 # now find the diagonal neighbours
2181 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2184 }
1882 2185
1883 for (@diag) { 2186 for (grep defined $_->[0], @neigh) {
2187 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2188 my $neigh = find $path, $origin
1885 or next; 2189 or next;
1886 $neigh->load; 2190 $neigh->load;
1887 } 2191 }
1888} 2192}
1889 2193
1890sub find_sync { 2194sub find_sync {
1891 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
1892 2196
1893 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
1894} 2201}
1895 2202
1896sub do_load_sync { 2203sub do_load_sync {
1897 my ($map) = @_; 2204 my ($map) = @_;
1898 2205
1899 cf::sync_job { $map->load }; 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2207 if $Coro::current == $Coro::main;
2208
2209 $map->load;
1900} 2210}
1901 2211
1902our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
1904 2214
1905sub find_async { 2215sub find_async {
1906 my ($path, $origin) = @_; 2216 my ($path, $origin, $load) = @_;
1907 2217
1908 $path = normalise $path, $origin && $origin->{path}; 2218 $path = normalise $path, $origin && $origin->{path};
1909 2219
1910 if (my $map = $cf::MAP{$path}) { 2220 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1912 } 2222 }
1913 2223
1914 undef $MAP_PREFETCH{$path}; 2224 $MAP_PREFETCH{$path} |= $load;
2225
1915 $MAP_PREFETCHER ||= cf::async { 2226 $MAP_PREFETCHER ||= cf::async {
2227 $Coro::current->{desc} = "map prefetcher";
2228
1916 while (%MAP_PREFETCH) { 2229 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2230 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2231 if (my $map = find $k) {
1919 $map->load; 2232 $map->load if $v;
1920 } 2233 }
1921 2234
1922 delete $MAP_PREFETCH{$path}; 2235 delete $MAP_PREFETCH{$k};
1923 } 2236 }
1924 } 2237 }
1925 undef $MAP_PREFETCHER; 2238 undef $MAP_PREFETCHER;
1926 }; 2239 };
1927 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
1928 2241
1929 () 2242 ()
1930} 2243}
1931 2244
2245# common code, used by both ->save and ->swapout
1932sub save { 2246sub _save {
1933 my ($self) = @_; 2247 my ($self) = @_;
1934
1935 my $lock = cf::lock_acquire "map_data:" . $self->path;
1936 2248
1937 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
1938 2250
1939 return unless $self->dirty; 2251 return unless $self->dirty;
1940 2252
1946 return if $self->{deny_save}; 2258 return if $self->{deny_save};
1947 2259
1948 local $self->{last_access} = $self->last_access;#d# 2260 local $self->{last_access} = $self->last_access;#d#
1949 2261
1950 cf::async { 2262 cf::async {
2263 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2264 $_->contr->save for $self->players;
1952 }; 2265 };
2266
2267 cf::get_slot 0.02;
1953 2268
1954 if ($uniq) { 2269 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2270 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2271 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1957 } else { 2272 } else {
1958 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1959 } 2274 }
1960} 2275}
1961 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
1962sub swap_out { 2285sub swap_out {
1963 my ($self) = @_; 2286 my ($self) = @_;
1964 2287
1965 # save first because save cedes
1966 $self->save;
1967
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2289
2290 return if $self->in_memory != cf::MAP_ACTIVE;
2291 return if $self->{deny_save};
1970 return if $self->players; 2292 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save};
1973 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
1974 $self->clear; 2303 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2304}
1977 2305
1978sub reset_at { 2306sub reset_at {
1979 my ($self) = @_; 2307 my ($self) = @_;
1980 2308
1998 2326
1999 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2000 2328
2001 return if $self->players; 2329 return if $self->players;
2002 2330
2003 warn "resetting map ", $self->path; 2331 cf::trace "resetting map ", $self->path, "\n";
2004 2332
2005 $self->in_memory (cf::MAP_SWAPPED); 2333 $self->in_memory (cf::MAP_SWAPPED);
2006 2334
2007 # need to save uniques path 2335 # need to save uniques path
2008 unless ($self->{deny_save}) { 2336 unless ($self->{deny_save}) {
2012 if $uniq; 2340 if $uniq;
2013 } 2341 }
2014 2342
2015 delete $cf::MAP{$self->path}; 2343 delete $cf::MAP{$self->path};
2016 2344
2345 $self->deactivate;
2346 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2347 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2348
2021 $self->unlink_save; 2349 $self->unlink_save;
2022 $self->destroy; 2350 $self->destroy;
2023} 2351}
2024 2352
2025my $nuke_counter = "aaaa"; 2353my $nuke_counter = "aaaa";
2026 2354
2027sub nuke { 2355sub nuke {
2028 my ($self) = @_; 2356 my ($self) = @_;
2029 2357
2358 {
2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
2360
2030 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2031 2362
2032 $self->unlink_save; 2363 $self->unlink_save;
2033 2364
2034 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2035 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2370
2040 $cf::MAP{$self->path} = $self; 2371 $cf::MAP{$self->path} = $self;
2372 }
2041 2373
2042 $self->reset; # polite request, might not happen 2374 $self->reset; # polite request, might not happen
2043} 2375}
2044 2376
2045=item $maps = cf::map::tmp_maps 2377=item $maps = cf::map::tmp_maps
2087 2419
2088sub unique_maps() { 2420sub unique_maps() {
2089 [ 2421 [
2090 map { 2422 map {
2091 utf8::decode $_; 2423 utf8::decode $_;
2092 /\.map$/ 2424 s/\.map$//; # TODO future compatibility hack
2425 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2426 ? ()
2093 ? normalise $_ 2427 : normalise $_
2094 : ()
2095 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2096 ] 2429 ]
2097} 2430}
2098 2431
2099package cf; 2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2100 2463
2101=back 2464=back
2102 2465
2103=head3 cf::object 2466=head3 cf::object
2104 2467
2108 2471
2109=over 4 2472=over 4
2110 2473
2111=item $ob->inv_recursive 2474=item $ob->inv_recursive
2112 2475
2113Returns the inventory of the object _and_ their inventories, recursively. 2476Returns the inventory of the object I<and> their inventories, recursively,
2477but I<not> the object itself.
2114 2478
2115=cut 2479=cut
2116 2480
2117sub inv_recursive_; 2481sub inv_recursive_;
2118sub inv_recursive_ { 2482sub inv_recursive_ {
2121 2485
2122sub inv_recursive { 2486sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2487 inv_recursive_ inv $_[0]
2124} 2488}
2125 2489
2490=item $ref = $ob->ref
2491
2492Creates and returns a persistent reference to an object that can be stored as a string.
2493
2494=item $ob = cf::object::deref ($refstring)
2495
2496returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2497even if the object actually exists. May block.
2498
2499=cut
2500
2501sub deref {
2502 my ($ref) = @_;
2503
2504 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2505 my ($uuid, $name) = ($1, $2);
2506 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2507 or return;
2508 $pl->ob->uuid eq $uuid
2509 or return;
2510
2511 $pl->ob
2512 } else {
2513 warn "$ref: cannot resolve object reference\n";
2514 undef
2515 }
2516}
2517
2126package cf; 2518package cf;
2127 2519
2128=back 2520=back
2129 2521
2130=head3 cf::object::player 2522=head3 cf::object::player
2136Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2528Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2137can be C<undef>. Does the right thing when the player is currently in a 2529can be C<undef>. Does the right thing when the player is currently in a
2138dialogue with the given NPC character. 2530dialogue with the given NPC character.
2139 2531
2140=cut 2532=cut
2533
2534our $SAY_CHANNEL = {
2535 id => "say",
2536 title => "Map",
2537 reply => "say ",
2538 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2539};
2540
2541our $CHAT_CHANNEL = {
2542 id => "chat",
2543 title => "Chat",
2544 reply => "chat ",
2545 tooltip => "Player chat and shouts, global to the server.",
2546};
2141 2547
2142# rough implementation of a future "reply" method that works 2548# rough implementation of a future "reply" method that works
2143# with dialog boxes. 2549# with dialog boxes.
2144#TODO: the first argument must go, split into a $npc->reply_to ( method 2550#TODO: the first argument must go, split into a $npc->reply_to ( method
2145sub cf::object::player::reply($$$;$) { 2551sub cf::object::player::reply($$$;$) {
2152 2558
2153 } else { 2559 } else {
2154 my $pl = $self->contr; 2560 my $pl = $self->contr;
2155 2561
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2562 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2563 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2564 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2565
2165 } else { 2566 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2567 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2568 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2168 } 2569 }
2169 } 2570 }
2571}
2572
2573=item $object->send_msg ($channel, $msg, $color, [extra...])
2574
2575=cut
2576
2577sub cf::object::send_msg {
2578 my $pl = shift->contr
2579 or return;
2580 $pl->send_msg (@_);
2170} 2581}
2171 2582
2172=item $player_object->may ("access") 2583=item $player_object->may ("access")
2173 2584
2174Returns wether the given player is authorized to access resource "access" 2585Returns wether the given player is authorized to access resource "access"
2187 2598
2188=item $player_object->enter_link 2599=item $player_object->enter_link
2189 2600
2190Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2191 2602
2192The player should be reasonably safe there for short amounts of time. You 2603The player should be reasonably safe there for short amounts of time (e.g.
2193I<MUST> call C<leave_link> as soon as possible, though. 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2605though, as the player cannot control the character while it is on the link
2606map.
2194 2607
2195Will never block. 2608Will never block.
2196 2609
2197=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2198 2611
2218sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2219 my ($self) = @_; 2632 my ($self) = @_;
2220 2633
2221 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2222 2635
2636 ++$self->{_link_recursion};
2637
2223 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2224 2639
2225 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2226 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2227 2642
2228 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2229} 2644}
2230 2645
2231sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2232 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2233 2648
2250 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2251 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2252 2667
2253 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2256 2671
2257 $map->load; 2672 $map->load;
2258 $map->load_diag; 2673 $map->load_neighbours;
2259 2674
2260 return unless $self->contr->active; 2675 return unless $self->contr->active;
2261 $self->activate_recursive;
2262 2676
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2264 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2265} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2266 2684
2685}
2686
2267=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2268 2688
2269Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2270her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2271that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2272the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
2273be called at the end of this process. 2693be called at the end of this process.
2274 2694
2695Note that $check will be called with a potentially non-loaded map, so if
2696it needs a loaded map it has to call C<< ->load >>.
2697
2275=cut 2698=cut
2276 2699
2277our $GOTOGEN; 2700our $GOTOGEN;
2278 2701
2279sub cf::object::player::goto { 2702sub cf::object::player::goto {
2280 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2281 2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2710
2282 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2713
2285 $self->enter_link; 2714 $self->enter_link;
2286 2715
2287 (async { 2716 (async {
2717 $Coro::current->{desc} = "player::goto $path $x $y";
2718
2719 # *tag paths override both path and x|y
2720 if ($path =~ /^\*(.*)$/) {
2721 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2722 my $ob = $obs[rand @obs];
2723
2724 # see if we actually can go there
2725 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2726 $ob = $obs[rand @obs];
2727 } else {
2728 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2729 }
2730 # else put us there anyways for now #d#
2731
2732 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2733 } else {
2734 ($path, $x, $y) = (undef, undef, undef);
2735 }
2736 }
2737
2288 my $map = eval { 2738 my $map = eval {
2289 my $map = cf::map::find $path; 2739 my $map = defined $path ? cf::map::find $path : undef;
2290 2740
2291 if ($map) { 2741 if ($map) {
2292 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2294 } else { 2744 } else {
2295 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2296 } 2746 }
2297 2747
2298 $map 2748 $map
2299 }; 2749 };
2300 2750
2306 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2307 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2308 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2309 } 2759 }
2310 2760
2311 $done->() if $done; 2761 $done->($self) if $done;
2312 })->prio (1); 2762 })->prio (1);
2313} 2763}
2314 2764
2315=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2316 2766
2336} 2786}
2337 2787
2338sub prepare_random_map { 2788sub prepare_random_map {
2339 my ($exit) = @_; 2789 my ($exit) = @_;
2340 2790
2341 my $guard = cf::lock_acquire "exit_prepare:$exit";
2342
2343 # all this does is basically replace the /! path by 2791 # all this does is basically replace the /! path by
2344 # a new random map path (?random/...) with a seed 2792 # a new random map path (?random/...) with a seed
2345 # that depends on the exit object 2793 # that depends on the exit object
2346 2794
2347 my $rmp = parse_random_map_params $exit->msg; 2795 my $rmp = parse_random_map_params $exit->msg;
2349 if ($exit->map) { 2797 if ($exit->map) {
2350 $rmp->{region} = $exit->region->name; 2798 $rmp->{region} = $exit->region->name;
2351 $rmp->{origin_map} = $exit->map->path; 2799 $rmp->{origin_map} = $exit->map->path;
2352 $rmp->{origin_x} = $exit->x; 2800 $rmp->{origin_x} = $exit->x;
2353 $rmp->{origin_y} = $exit->y; 2801 $rmp->{origin_y} = $exit->y;
2802
2803 $exit->map->touch;
2354 } 2804 }
2355 2805
2356 $rmp->{random_seed} ||= $exit->random_seed; 2806 $rmp->{random_seed} ||= $exit->random_seed;
2357 2807
2358 my $data = cf::to_json $rmp; 2808 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2359 my $md5 = Digest::MD5::md5_hex $data; 2809 my $md5 = Digest::MD5::md5_hex $data;
2360 my $meta = "$RANDOMDIR/$md5.meta"; 2810 my $meta = "$RANDOMDIR/$md5.meta";
2361 2811
2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2812 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363 aio_write $fh, 0, (length $data), $data, 0; 2813 aio_write $fh, 0, (length $data), $data, 0;
2364 undef $fh; 2814 undef $fh;
2365 aio_rename "$meta~", $meta; 2815 aio_rename "$meta~", $meta;
2366 2816
2817 my $slaying = "?random/$md5";
2818
2819 if ($exit->valid) {
2367 $exit->slaying ("?random/$md5"); 2820 $exit->slaying ("?random/$md5");
2368 $exit->msg (undef); 2821 $exit->msg (undef);
2822 }
2369 } 2823 }
2370} 2824}
2371 2825
2372sub cf::object::player::enter_exit { 2826sub cf::object::player::enter_exit {
2373 my ($self, $exit) = @_; 2827 my ($self, $exit) = @_;
2374 2828
2375 return unless $self->type == cf::PLAYER; 2829 return unless $self->type == cf::PLAYER;
2376 2830
2377 if ($exit->slaying eq "/!") {
2378 #TODO: this should de-fi-ni-te-ly not be a sync-job
2379 # the problem is that $exit might not survive long enough
2380 # so it needs to be done right now, right here
2381 cf::sync_job { prepare_random_map $exit };
2382 }
2383
2384 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2385 my $hp = $exit->stats->hp;
2386 my $sp = $exit->stats->sp;
2387
2388 $self->enter_link; 2831 $self->enter_link;
2389 2832
2390 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED);
2393
2394 (async { 2833 (async {
2395 $self->deactivate_recursive; # just to be sure 2834 $Coro::current->{desc} = "enter_exit";
2835
2396 unless (eval { 2836 unless (eval {
2837 $self->deactivate_recursive; # just to be sure
2838
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2848 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp;
2850
2397 $self->goto ($slaying, $hp, $sp); 2851 $self->goto ($map, $x, $y);
2398 2852
2853 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y)
2855 if $exit->flag (cf::FLAG_DAMNED);
2856
2399 1; 2857 1
2400 }) { 2858 }) {
2401 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2402 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2403 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2404 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2405 2863
2406 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2407 $self->leave_link; 2865 $self->leave_link;
2408 } 2866 }
2409 })->prio (1); 2867 })->prio (1);
2410} 2868}
2411 2869
2423sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2424 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2425 2883
2426 utf8::encode $text; 2884 utf8::encode $text;
2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2428} 2911}
2429 2912
2430=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2431 2914
2432Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2917the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2918the message unless the client supports the msg packet.
2436 2919
2437=cut 2920=cut
2438 2921
2922# non-persistent channels (usually the info channel)
2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2930 "c/identify" => {
2931 id => "infobox",
2932 title => "Identify",
2933 reply => undef,
2934 tooltip => "Items recently identified",
2935 },
2936 "c/examine" => {
2937 id => "infobox",
2938 title => "Examine",
2939 reply => undef,
2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2947 },
2948 "c/book" => {
2949 id => "infobox",
2950 title => "Book",
2951 reply => undef,
2952 tooltip => "The contents of a note or book",
2953 },
2954 "c/lookat" => {
2955 id => "infobox",
2956 title => "Look",
2957 reply => undef,
2958 tooltip => "What you saw there",
2959 },
2960 "c/who" => {
2961 id => "infobox",
2962 title => "Players",
2963 reply => undef,
2964 tooltip => "Shows players who are currently online",
2965 },
2966 "c/body" => {
2967 id => "infobox",
2968 title => "Body Parts",
2969 reply => undef,
2970 tooltip => "Shows which body parts you posess and are available",
2971 },
2972 "c/statistics" => {
2973 id => "infobox",
2974 title => "Statistics",
2975 reply => undef,
2976 tooltip => "Shows your primary statistics",
2977 },
2978 "c/skills" => {
2979 id => "infobox",
2980 title => "Skills",
2981 reply => undef,
2982 tooltip => "Shows your experience per skill and item power",
2983 },
2984 "c/shopitems" => {
2985 id => "infobox",
2986 title => "Shop Items",
2987 reply => undef,
2988 tooltip => "Shows the items currently for sale in this shop",
2989 },
2990 "c/resistances" => {
2991 id => "infobox",
2992 title => "Resistances",
2993 reply => undef,
2994 tooltip => "Shows your resistances",
2995 },
2996 "c/pets" => {
2997 id => "infobox",
2998 title => "Pets",
2999 reply => undef,
3000 tooltip => "Shows information abotu your pets/a specific pet",
3001 },
3002 "c/perceiveself" => {
3003 id => "infobox",
3004 title => "Perceive Self",
3005 reply => undef,
3006 tooltip => "You gained detailed knowledge about yourself",
3007 },
3008 "c/uptime" => {
3009 id => "infobox",
3010 title => "Uptime",
3011 reply => undef,
3012 tooltip => "How long the server has been running since last restart",
3013 },
3014 "c/mapinfo" => {
3015 id => "infobox",
3016 title => "Map Info",
3017 reply => undef,
3018 tooltip => "Information related to the maps",
3019 },
3020 "c/party" => {
3021 id => "party",
3022 title => "Party",
3023 reply => "gsay ",
3024 tooltip => "Messages and chat related to your party",
3025 },
3026 "c/death" => {
3027 id => "death",
3028 title => "Death",
3029 reply => undef,
3030 tooltip => "Reason for and more info about your most recent death",
3031 },
3032 "c/say" => $SAY_CHANNEL,
3033 "c/chat" => $CHAT_CHANNEL,
3034);
3035
2439sub cf::client::send_msg { 3036sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2441 3038
2442 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2443 3041
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 3043
3044 # check predefined channels, for the benefit of C
3045 if ($CHANNEL{$channel}) {
3046 $channel = $CHANNEL{$channel};
3047
3048 $self->ext_msg (channel_info => $channel);
3049 $channel = $channel->{id};
3050
2448 if (ref $channel) { 3051 } elsif (ref $channel) {
2449 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 3055 $self->ext_msg (channel_info => $channel);
2453 } 3056 }
2454 3057
2455 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2456 } 3059 }
2457 3060
2458 if ($self->can_msg) { 3061 return unless @extra || length $msg;
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2460 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470 3062
2471 if ($color >= 0) { 3063 # default colour, mask it out
2472 if (0 && $msg =~ /\[/) { 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 3065 if $color & cf::NDI_DEF;
2474 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg")
2477 }
2478 }
2479 }
2480}
2481 3066
3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3070 );
3071
3072 $self->send_big_packet ($pkt);
3073}
3074
2482=item $client->ext_event ($type, %msg) 3075=item $client->ext_msg ($type, @msg)
2483 3076
2484Sends an ext event to the client. 3077Sends an ext event to the client.
2485 3078
2486=cut 3079=cut
2487 3080
2488sub cf::client::ext_event($$%) { 3081sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 3082 my ($self, $type, @msg) = @_;
2490 3083
2491 return unless $self->extcmd; 3084 if ($self->extcmd == 2) {
2492 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3086 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 3087 push @msg, msgtype => "event_$type";
2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3089 }
3090}
3091
3092=item $client->ext_reply ($msgid, @msg)
3093
3094Sends an ext reply to the client.
3095
3096=cut
3097
3098sub cf::client::ext_reply($$@) {
3099 my ($self, $id, @msg) = @_;
3100
3101 if ($self->extcmd == 2) {
3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3103 } elsif ($self->extcmd == 1) {
3104 #TODO: version 1, remove
3105 unshift @msg, msgtype => "reply", msgid => $id;
3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3107 }
2495} 3108}
2496 3109
2497=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2498 3111
2499Queues a query to the client, calling the given callback with 3112Queues a query to the client, calling the given callback with
2554 my ($ns, $buf) = @_; 3167 my ($ns, $buf) = @_;
2555 3168
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3169 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 3170
2558 if (ref $msg) { 3171 if (ref $msg) {
3172 my ($type, $reply, @payload) =
3173 "ARRAY" eq ref $msg
3174 ? @$msg
3175 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3176
3177 my @reply;
3178
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3179 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 3180 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 3181 }
3182
3183 $ns->ext_reply ($reply, @reply)
3184 if $reply;
3185
2565 } else { 3186 } else {
2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567 } 3188 }
2568 3189
2569 cf::override; 3190 cf::override;
2570 }, 3191 },
2571); 3192);
2591 3212
2592 $coro 3213 $coro
2593} 3214}
2594 3215
2595cf::client->attach ( 3216cf::client->attach (
2596 on_destroy => sub { 3217 on_client_destroy => sub {
2597 my ($ns) = @_; 3218 my ($ns) = @_;
2598 3219
2599 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2600 }, 3221 },
2601); 3222);
2616our $safe = new Safe "safe"; 3237our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
2618 3239
2619$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
2620 3241
2621$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3242$safe->permit_only (Opcode::opset qw(
3243 :base_core :base_mem :base_orig :base_math :base_loop
3244 grepstart grepwhile mapstart mapwhile
3245 sort time
3246));
2622 3247
2623# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
2624 3249
2625=pod 3250=pod
2626 3251
2627The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
2628 3253
2629 cf::object 3254 cf::object
2630 contr pay_amount pay_player map x y force_find force_add 3255 contr pay_amount pay_player map x y force_find force_add destroy
2631 insert remove 3256 insert remove name archname title slaying race decrease split
3257 value
2632 3258
2633 cf::object::player 3259 cf::object::player
2634 player 3260 player
2635 3261
2636 cf::player 3262 cf::player
2641 3267
2642=cut 3268=cut
2643 3269
2644for ( 3270for (
2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3271 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2646 insert remove)], 3272 insert remove inv nrof name archname title slaying race
3273 decrease split destroy change_exp value msg lore send_msg)],
2647 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
2649 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
2650) { 3277) {
2651 no strict 'refs';
2652 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
2653 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2654 for @funs; 3280 for @funs;
2655} 3281}
2656 3282
2671 3297
2672 my $qcode = $code; 3298 my $qcode = $code;
2673 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2674 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
2675 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
2676 local $_; 3305 local $_;
2677 local @safe::cf::_safe_eval_args = values %vars;
2678 3306
2679 my $eval = 3307 my $eval =
2680 "do {\n" 3308 "do {\n"
2681 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2682 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
2683 . $code 3311 . $code
2684 . "\n}" 3312 . "\n}"
2685 ; 3313 ;
2686 3314
3315 if ($CFG{safe_eval}) {
2687 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
2688 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2689 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
2690 3324
2691 if ($@) { 3325 if ($@) {
2692 warn "$@"; 3326 warn "$@",
2693 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
2694 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
2695 } 3329 }
2696 3330
2697 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
2698} 3332}
2699 3333
2713=cut 3347=cut
2714 3348
2715sub register_script_function { 3349sub register_script_function {
2716 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
2717 3351
2718 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
2719 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
2720} 3354}
2721 3355
2722=back 3356=back
2723 3357
2724=cut 3358=cut
2725 3359
2726############################################################################# 3360#############################################################################
2727# the server's init and main functions 3361# the server's init and main functions
2728 3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3405
2729sub load_facedata($) { 3406sub load_facedata($) {
2730 my ($path) = @_; 3407 my ($path) = @_;
2731 3408
3409 # HACK to clear player env face cache, we need some signal framework
3410 # for this (global event?)
3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3412
3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3414
2732 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
2733 3416
2734 my $facedata; 3417 my $facedata;
2735 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 3419 or die "$path: $!";
2737 3420
2738 $facedata = Coro::Storable::thaw $facedata; 3421 $facedata = Coro::Storable::thaw $facedata;
2739 3422
2740 $facedata->{version} == 2 3423 $facedata->{version} == 2
2741 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
2742 3425
3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3428 $facedata->{resource}{"res/exp_table"} = {
3429 type => FT_RSRC,
3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3432 };
3433 cf::cede_to_tick;
3434
2743 { 3435 {
2744 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
2745 3437
2746 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3440
2748 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2752 3445
2753 cf::cede_to_tick; 3446 cf::cede_to_tick;
2754 } 3447 }
2755 3448
2756 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
2757 next unless $info->{smooth}; 3450 next unless $info->{smooth};
3451
2758 my $idx = cf::face::find $face 3452 my $idx = cf::face::find $face
2759 or next; 3453 or next;
3454
2760 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2763 } else { 3458 } else {
2764 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
2765 } 3460 }
2766 3461
2767 cf::cede_to_tick; 3462 cf::cede_to_tick;
2768 } 3463 }
2769 } 3464 }
2778 3473
2779 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
2780 } 3475 }
2781 3476
2782 { 3477 {
2783 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787 3479
2788 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({ 3481 if (defined $info->{type}) {
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2796 3483
2797 if ($name =~ /\.jpg$/) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3485 cf::face::set_type $idx, $info->{type};
2800 } else { 3486 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3487 $RESOURCE{$name} = $info; # unused
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3488 }
2807 3489
2808 cf::cede_to_tick; 3490 cf::cede_to_tick;
2809 } 3491 }
2810 } 3492 }
2811 3493
3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3495
2812 1 3496 1
2813} 3497}
2814 3498
3499register_exticmd fx_want => sub {
3500 my ($ns, $want) = @_;
3501
3502 while (my ($k, $v) = each %$want) {
3503 $ns->fx_want ($k, $v);
3504 }
3505};
3506
3507sub load_resource_file($) {
3508 my $guard = lock_acquire "load_resource_file";
3509
3510 my $status = load_resource_file_ $_[0];
3511 get_slot 0.1, 100;
3512 cf::arch::commit_load;
3513
3514 $status
3515}
3516
2815sub reload_regions { 3517sub reload_regions {
3518 # HACK to clear player env face cache, we need some signal framework
3519 # for this (global event?)
3520 %ext::player_env::MUSIC_FACE_CACHE = ();
3521
2816 load_resource_file "$MAPDIR/regions" 3522 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3523 or die "unable to load regions file\n";
2818 3524
2819 for (cf::region::list) { 3525 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3526 $_->{match} = qr/$_->{match}/
2828} 3534}
2829 3535
2830sub reload_archetypes { 3536sub reload_archetypes {
2831 load_resource_file "$DATADIR/archetypes" 3537 load_resource_file "$DATADIR/archetypes"
2832 or die "unable to load archetypes\n"; 3538 or die "unable to load archetypes\n";
2833 #d# NEED to laod twice to resolve forward references
2834 # this really needs to be done in an extra post-pass
2835 # (which needs to be synchronous, so solve it differently)
2836 load_resource_file "$DATADIR/archetypes"
2837 or die "unable to load archetypes\n";
2838} 3539}
2839 3540
2840sub reload_treasures { 3541sub reload_treasures {
2841 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
2842 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
2843} 3544}
2844 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
2845sub reload_resources { 3569sub reload_resources {
2846 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
2847 3571
3572 reload_facedata;
3573 reload_sound;
3574 reload_archetypes;
2848 reload_regions; 3575 reload_regions;
2849 reload_facedata;
2850 #reload_archetypes;#d#
2851 reload_archetypes;
2852 reload_treasures; 3576 reload_treasures;
2853 3577
2854 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
2855} 3579}
2856 3580
2857sub init { 3581sub reload_config {
2858 reload_resources; 3582 trace "reloading config file...\n";
2859}
2860 3583
2861sub cfg_load {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3585 or return;
2864 3586
2865 local $/; 3587 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
2867 3589
2868 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2869 3591
2870 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2871 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2872 3594
2873 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
2875 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2876 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
2877 }; 3599 };
2878 warn $@ if $@; 3600 warn $@ if $@;
2879 } 3601 }
3602
3603 trace "finished reloading resource files\n";
3604}
3605
3606sub pidfile() {
3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3608 or die "$PIDFILE: $!";
3609 flock $fh, &Fcntl::LOCK_EX
3610 or die "$PIDFILE: flock: $!";
3611 $fh
3612}
3613
3614# make sure only one server instance is running at any one time
3615sub atomic {
3616 my $fh = pidfile;
3617
3618 my $pid = <$fh>;
3619 kill 9, $pid if $pid > 0;
3620
3621 seek $fh, 0, 0;
3622 print $fh $$;
3623}
3624
3625sub main_loop {
3626 trace "EV::loop starting\n";
3627 if (1) {
3628 EV::loop;
3629 }
3630 trace "EV::loop returned\n";
3631 goto &main_loop unless $REALLY_UNLOOP;
2880} 3632}
2881 3633
2882sub main { 3634sub main {
3635 cf::init_globals; # initialise logging
3636
3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3641
3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3643
2883 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
2884 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
2885 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3646 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2886 (async { 3647 (async {
2887 Event::one_event; 3648 $Coro::current->{desc} = "IDLE BUG HANDLER";
3649 EV::loop EV::LOOP_ONESHOT;
2888 })->prio (Coro::PRIO_MAX); 3650 })->prio (Coro::PRIO_MAX);
2889 }; 3651 };
2890 3652
2891 cfg_load; 3653 evthread_start IO::AIO::poll_fileno;
3654
3655 cf::sync_job {
3656 init_inc;
3657
3658 cf::init_experience;
3659 cf::init_anim;
3660 cf::init_attackmess;
3661 cf::init_dynamic;
3662
3663 cf::load_settings;
3664 cf::load_materials;
3665
3666 reload_resources;
3667 reload_config;
2892 db_init; 3668 db_init;
3669
3670 cf::init_uuid;
3671 cf::init_signals;
3672 cf::init_skills;
3673
3674 cf::init_beforeplay;
3675
3676 atomic;
3677
2893 load_extensions; 3678 load_extensions;
2894 3679
2895 $TICK_WATCHER->start; 3680 utime time, time, $RUNTIMEFILE;
2896 Event::loop; 3681
3682 # no (long-running) fork's whatsoever before this point(!)
3683 use POSIX ();
3684 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3685
3686 (pop @POST_INIT)->(0) while @POST_INIT;
3687 };
3688
3689 cf::object::thawer::errors_are_fatal 0;
3690 info "parse errors in files are no longer fatal from this point on.\n";
3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3697 goto &main_loop;
2897} 3698}
2898 3699
2899############################################################################# 3700#############################################################################
2900# initialisation and cleanup 3701# initialisation and cleanup
2901 3702
2902# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
2903BEGIN { 3704BEGIN {
3705 our %SIGWATCHER = ();
2904 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
2905 Event->signal ( 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2906 reentrant => 0,
2907 data => WF_AUTOCANCEL,
2908 signal => $signal,
2909 prio => 0,
2910 cb => sub {
2911 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
2912 },
2913 ); 3709 };
2914 } 3710 }
2915} 3711}
2916 3712
2917sub write_runtime { 3713sub write_runtime_sync {
2918 my $runtime = "$LOCALDIR/runtime"; 3714 my $t0 = AE::time;
2919 3715
2920 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
2921 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
2922 3718
2923 IO::AIO::aio_utime $runtime, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2924 3720
2925 my $guard = cf::lock_acquire "write_runtime"; 3721 my $guard = cf::lock_acquire "write_runtime";
2926 3722
2927 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3723 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2928 or return; 3724 or return;
2929 3725
2930 my $value = $cf::RUNTIME + 90 + 10; 3726 my $value = $cf::RUNTIME + 90 + 10;
2931 # 10 is the runtime save interval, for a monotonic clock 3727 # 10 is the runtime save interval, for a monotonic clock
2932 # 60 allows for the watchdog to kill the server. 3728 # 60 allows for the watchdog to kill the server.
2942 aio_utime $fh, undef, undef; 3738 aio_utime $fh, undef, undef;
2943 3739
2944 close $fh 3740 close $fh
2945 or return; 3741 or return;
2946 3742
2947 aio_rename "$runtime~", $runtime 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2948 and return; 3744 and return;
2949 3745
2950 warn "runtime file written.\n"; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2951 3747
2952 1 3748 1
3749}
3750
3751our $uuid_lock;
3752our $uuid_skip;
3753
3754sub write_uuid_sync($) {
3755 $uuid_skip ||= $_[0];
3756
3757 return if $uuid_lock;
3758 local $uuid_lock = 1;
3759
3760 my $uuid = "$LOCALDIR/uuid";
3761
3762 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3763 or return;
3764
3765 my $value = uuid_seq uuid_cur;
3766
3767 unless ($value) {
3768 info "cowardly refusing to write zero uuid value!\n";
3769 return;
3770 }
3771
3772 my $value = uuid_str $value + $uuid_skip;
3773 $uuid_skip = 0;
3774
3775 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3776 and return;
3777
3778 # always fsync - this file is important
3779 aio_fsync $fh
3780 and return;
3781
3782 close $fh
3783 or return;
3784
3785 aio_rename "$uuid~", $uuid
3786 and return;
3787
3788 trace "uuid file written ($value).\n";
3789
3790 1
3791
3792}
3793
3794sub write_uuid($$) {
3795 my ($skip, $sync) = @_;
3796
3797 $sync ? write_uuid_sync $skip
3798 : async { write_uuid_sync $skip };
2953} 3799}
2954 3800
2955sub emergency_save() { 3801sub emergency_save() {
2956 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
2957 3803
2958 warn "enter emergency perl save\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
2959 3810
2960 cf::sync_job { 3811 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813
2961 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
2962 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
2963 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
2964 warn "begin emergency player save\n"; 3817 info "emergency_perl_save: begin player save\n";
2965 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
2966 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
2967 $pl->valid or next; 3820 $pl->valid or next;
3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968 $pl->save; 3822 $pl->save;
2969 } 3823 }
2970 warn "end emergency player save\n"; 3824 info "emergency_perl_save: end player save\n";
2971 3825
2972 warn "begin emergency map save\n"; 3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3828 info "emergency_perl_save: begin map save\n";
2973 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
2974 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
2975 $map->valid or next; 3831 $map->valid or next;
2976 $map->save; 3832 $map->save;
2977 } 3833 }
2978 warn "end emergency map save\n"; 3834 info "emergency_perl_save: end map save\n";
2979 3835
2980 warn "begin emergency database checkpoint\n"; 3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3838 info "emergency_perl_save: begin database checkpoint\n";
2981 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
2982 warn "end emergency database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3841
3842 info "emergency_perl_save: begin write uuid\n";
3843 write_uuid_sync 1;
3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
2983 }; 3864 };
2984 3865
2985 warn "leave emergency perl save\n"; 3866 info "emergency_perl_save: leave\n";
2986} 3867}
2987 3868
2988sub post_cleanup { 3869sub post_cleanup {
2989 my ($make_core) = @_; 3870 my ($make_core) = @_;
2990 3871
3872 IO::AIO::flush;
3873
2991 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
2992 if $make_core; 3875 if $make_core;
3876
3877 my $fh = pidfile;
3878 unlink $PIDFILE if <$fh> == $$;
3879}
3880
3881# a safer delete_package, copied from Symbol
3882sub clear_package($) {
3883 my $pkg = shift;
3884
3885 # expand to full symbol table name if needed
3886 unless ($pkg =~ /^main::.*::$/) {
3887 $pkg = "main$pkg" if $pkg =~ /^::/;
3888 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3889 $pkg .= '::' unless $pkg =~ /::$/;
3890 }
3891
3892 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3893 my $stem_symtab = *{$stem}{HASH};
3894
3895 defined $stem_symtab and exists $stem_symtab->{$leaf}
3896 or return;
3897
3898 # clear all symbols
3899 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3900 for my $name (keys %$leaf_symtab) {
3901 _gv_clear *{"$pkg$name"};
3902# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3903 }
2993} 3904}
2994 3905
2995sub do_reload_perl() { 3906sub do_reload_perl() {
2996 # can/must only be called in main 3907 # can/must only be called in main
2997 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
2998 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
2999 return; 3910 return;
3000 } 3911 }
3001 3912
3913 return if $RELOAD++;
3914
3915 my $t1 = AE::time;
3916
3917 while ($RELOAD) {
3002 warn "reloading..."; 3918 info "reloading...";
3003 3919
3004 warn "entering sync_job"; 3920 trace "entering sync_job";
3005 3921
3006 cf::sync_job { 3922 cf::sync_job {
3007 cf::write_runtime; # external watchdog should not bark
3008 cf::emergency_save; 3923 cf::emergency_save;
3009 cf::write_runtime; # external watchdog should not bark
3010 3924
3011 warn "syncing database to disk";
3012 BDB::db_env_txn_checkpoint $DB_ENV;
3013
3014 # if anything goes wrong in here, we should simply crash as we already saved
3015
3016 warn "cancelling all WF_AUTOCANCEL watchers";
3017 for (Event::all_watchers) {
3018 $_->cancel if $_->data & WF_AUTOCANCEL;
3019 }
3020
3021 warn "flushing outstanding aio requests";
3022 for (;;) {
3023 BDB::flush;
3024 IO::AIO::flush;
3025 Coro::cede;
3026 last unless IO::AIO::nreqs || BDB::nreqs;
3027 warn "iterate...";
3028 }
3029
3030 ++$RELOAD;
3031
3032 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3033 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3034 %EXT_CORO = (); 3927 %EXT_CORO = ();
3035 3928
3036 warn "removing commands"; 3929 trace "removing commands";
3037 %COMMAND = (); 3930 %COMMAND = ();
3038 3931
3039 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3040 %EXTCMD = (); 3933 %EXTCMD = ();
3041 %EXTICMD = (); 3934 %EXTICMD = ();
3042 3935
3043 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3044 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3045 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3046 3939
3047 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3048 eval { 3941 eval {
3049 $cb->($pkg); 3942 $cb->($pkg);
3050 1 3943 1
3051 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3945 }
3946
3947 trace "... clearing $pkg";
3948 clear_package $pkg;
3052 } 3949 }
3053 3950
3054 warn "... nuking $pkg";
3055 Symbol::delete_package $pkg;
3056 }
3057
3058 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3059 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3060 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3061 3954
3062 warn "... unloading $k"; 3955 trace "... unloading $k";
3063 delete $INC{$k}; 3956 delete $INC{$k};
3064 3957
3065 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3066 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3067 3960
3068 if (my $cb = $k->can ("unload_module")) { 3961 if (my $cb = $k->can ("unload_module")) {
3069 $cb->(); 3962 $cb->();
3963 }
3964
3965 clear_package $k;
3070 } 3966 }
3071 3967
3072 Symbol::delete_package $k;
3073 }
3074
3075 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3076 Symbol::delete_package "safe::$_" 3969 clear_package "safe::$_"
3077 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3078 3971
3079 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3080 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3081 delete $INC{"cf/pod.pm"}; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3082 3975
3083 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3084 # and global variables created in xs 3977 # and global variables created in xs
3085 #Symbol::delete_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3086 3979
3087 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3088 3981
3089 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3090 require cf; 3983 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3984 cf::_connect_to_perl_1;
3092 3985
3093 warn "loading config and database again"; 3986 trace "loading config and database again";
3094 cf::cfg_load; 3987 cf::reload_config;
3095 3988
3096 warn "loading extensions"; 3989 trace "loading extensions";
3097 cf::load_extensions; 3990 cf::load_extensions;
3098 3991
3992 if ($REATTACH_ON_RELOAD) {
3099 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3100 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3101 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3102 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3103 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3104 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3999 }
3105 4000
4001 trace "running post_init jobs";
4002 (pop @POST_INIT)->(1) while @POST_INIT;
4003
3106 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3107 4005
3108 1 4006 1
3109 } or do { 4007 } or do {
3110 warn $@; 4008 error $@;
3111 warn "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3112 exit 1; 4010 };
4011
4012 info "reloaded";
4013 --$RELOAD;
3113 }; 4014 }
3114 4015
3115 warn "reloaded"; 4016 $t1 = AE::time - $t1;
4017 info "reload completed in ${t1}s\n";
3116}; 4018};
3117 4019
3118our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3119 4021
3120sub reload_perl() { 4022sub reload_perl() {
3121 # doing reload synchronously and two reloads happen back-to-back, 4023 # doing reload synchronously and two reloads happen back-to-back,
3122 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3123 4025
3124 $RELOAD_WATCHER ||= Event->timer ( 4026 $RELOAD_WATCHER ||= cf::async {
3125 reentrant => 0, 4027 Coro::AIO::aio_wait cache_extensions;
3126 after => 0, 4028
3127 data => WF_AUTOCANCEL, 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3128 cb => sub {
3129 do_reload_perl; 4030 do_reload_perl;
3130 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
3131 }, 4032 };
3132 ); 4033 };
3133} 4034}
3134 4035
3135register_command "reload" => sub { 4036register_command "reload" => sub {
3136 my ($who, $arg) = @_; 4037 my ($who, $arg) = @_;
3137 4038
3138 if ($who->flag (FLAG_WIZ)) { 4039 if ($who->flag (FLAG_WIZ)) {
3139 $who->message ("reloading server."); 4040 $who->message ("reloading server.");
4041 async {
4042 $Coro::current->{desc} = "perl_reload";
3140 async { reload_perl }; 4043 reload_perl;
4044 };
3141 } 4045 }
3142}; 4046};
3143 4047
3144unshift @INC, $LIBDIR; 4048#############################################################################
3145 4049
3146my $bug_warning = 0; 4050my $bug_warning = 0;
3147 4051
3148our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3149our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
3150 4054
3151sub wait_for_tick { 4055sub wait_for_tick {
3152 return unless $TICK_WATCHER->is_active;
3153 return if $Coro::current == $Coro::main; 4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3154 4057
3155 my $signal = new Coro::Signal; 4058 my $signal = new Coro::Signal;
3156 push @WAIT_FOR_TICK, $signal; 4059 push @WAIT_FOR_TICK, $signal;
3157 $signal->wait; 4060 $signal->wait;
3158} 4061}
3159 4062
3160sub wait_for_tick_begin { 4063sub wait_for_tick_begin {
3161 return unless $TICK_WATCHER->is_active;
3162 return if $Coro::current == $Coro::main; 4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3163 4065
3164 my $signal = new Coro::Signal; 4066 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal; 4067 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait; 4068 $signal->wait;
3167} 4069}
3168 4070
3169 my $min = 1e6;#d# 4071sub tick {
3170 my $avg = 10;
3171$TICK_WATCHER = Event->timer (
3172 reentrant => 0,
3173 parked => 1,
3174 prio => 0,
3175 at => $NEXT_TICK || $TICK,
3176 data => WF_AUTOCANCEL,
3177 cb => sub {
3178 if ($Coro::current != $Coro::main) { 4072 if ($Coro::current != $Coro::main) {
3179 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4073 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3180 unless ++$bug_warning > 10; 4074 unless ++$bug_warning > 10;
3181 return; 4075 return;
3182 } 4076 }
3183 4077
3184 $NOW = $tick_start = Event::time;
3185
3186 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3187 4079
3188 0 && sync_job {#d# 4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3189 for(1..10) {
3190 my $t = Event::time;
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3192 or die;
3193 4081
3194 $map->width (50); 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3195 $map->height (50); 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3196 $map->alloc; 4084 Coro::async_pool {
3197 $map->_load_objects ("/tmp/x.map", 1); 4085 $Coro::current->{desc} = "runtime saver";
3198 my $t = Event::time - $t; 4086 write_runtime_sync
3199 4087 or error "ERROR: unable to write runtime file: $!";
3200 #next unless $t < 0.0013;#d#
3201 if ($t < $min) {
3202 $min = $t;
3203 }
3204 $avg = $avg * 0.99 + $t * 0.01;
3205 }
3206 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207 exit 0;
3208 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209 }; 4088 };
4089 }
3210 4090
3211 $RUNTIME += $TICK;
3212 $NEXT_TICK += $TICK;
3213
3214 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215 $NEXT_RUNTIME_WRITE = $NOW + 10;
3216 Coro::async_pool {
3217 write_runtime
3218 or warn "ERROR: unable to write runtime file: $!";
3219 };
3220 }
3221
3222# my $AFTER = Event::time;
3223# warn $AFTER - $NOW;#d#
3224
3225 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send; 4092 $sig->send;
3227 } 4093 }
3228 while (my $sig = shift @WAIT_FOR_TICK) { 4094 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send; 4095 $sig->send;
3230 } 4096 }
3231 4097
3232 $NOW = Event::time; 4098 $LOAD = ($NOW - $TICK_START) / $TICK;
3233
3234 # if we are delayed by four ticks or more, skip them all
3235 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3236
3237 $TICK_WATCHER->at ($NEXT_TICK);
3238 $TICK_WATCHER->start;
3239
3240 $LOAD = ($NOW - $tick_start) / $TICK;
3241 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4099 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242 4100
3243 _post_tick; 4101 if (0) {
3244 4102 if ($NEXT_TICK) {
3245 4103 my $jitter = $TICK_START - $NEXT_TICK;
4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4105 debug "jitter $JITTER\n";#d#
4106 }
3246 }, 4107 }
3247); 4108}
3248 4109
3249{ 4110{
3250 BDB::max_poll_time $TICK * 0.1; 4111 # configure BDB
3251 $BDB_POLL_WATCHER = Event->io ( 4112
3252 reentrant => 0,
3253 fd => BDB::poll_fileno,
3254 poll => 'r',
3255 prio => 0,
3256 data => WF_AUTOCANCEL,
3257 cb => \&BDB::poll_cb,
3258 );
3259 BDB::min_parallel 8; 4113 BDB::min_parallel 16;
3260 4114 BDB::max_poll_reqs $TICK * 0.1;
3261 BDB::set_sync_prepare { 4115 $AnyEvent::BDB::WATCHER->priority (1);
3262 my $status;
3263 my $current = $Coro::current;
3264 (
3265 sub {
3266 $status = $!;
3267 $current->ready; undef $current;
3268 },
3269 sub {
3270 Coro::schedule while defined $current;
3271 $! = $status;
3272 },
3273 )
3274 };
3275 4116
3276 unless ($DB_ENV) { 4117 unless ($DB_ENV) {
3277 $DB_ENV = BDB::db_env_create; 4118 $DB_ENV = BDB::db_env_create;
4119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4120 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4121 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4122 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4123 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3278 4124
3279 cf::sync_job { 4125 cf::sync_job {
3280 eval { 4126 eval {
3281 BDB::db_env_open 4127 BDB::db_env_open
3282 $DB_ENV, 4128 $DB_ENV,
3284 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4130 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4131 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286 0666; 4132 0666;
3287 4133
3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4134 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3291 $DB_ENV->set_lk_detect;
3292 }; 4135 };
3293 4136
3294 cf::cleanup "db_env_open(db): $@" if $@; 4137 cf::cleanup "db_env_open(db): $@" if $@;
3295 }; 4138 };
3296 } 4139 }
4140
4141 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4142 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4143 };
4144 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4145 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4146 };
4147 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4148 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4149 };
3297} 4150}
3298 4151
3299{ 4152{
4153 # configure IO::AIO
4154
3300 IO::AIO::min_parallel 8; 4155 IO::AIO::min_parallel 8;
3301
3302 undef $Coro::AIO::WATCHER;
3303 IO::AIO::max_poll_time $TICK * 0.1; 4156 IO::AIO::max_poll_time $TICK * 0.1;
3304 $AIO_POLL_WATCHER = Event->io ( 4157 undef $AnyEvent::AIO::WATCHER;
3305 reentrant => 0,
3306 data => WF_AUTOCANCEL,
3307 fd => IO::AIO::poll_fileno,
3308 poll => 'r',
3309 prio => 6,
3310 cb => \&IO::AIO::poll_cb,
3311 );
3312} 4158}
3313 4159
3314my $_log_backtrace; 4160my $_log_backtrace;
3315 4161
3316sub _log_backtrace { 4162sub _log_backtrace {
3319 $msg =~ s/\n//; 4165 $msg =~ s/\n//;
3320 4166
3321 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) { 4168 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace; 4169 ++$_log_backtrace;
4170 my $perl_bt = Carp::longmess $msg;
3324 async { 4171 async {
4172 $Coro::current->{desc} = "abt $msg";
4173
3325 my @bt = fork_call { 4174 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr; 4175 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4176 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4177 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3329 or die "addr2line: $!"; 4178 or die "addr2line: $!";
3337 } 4186 }
3338 4187
3339 @funcs 4188 @funcs
3340 }; 4189 };
3341 4190
3342 LOG llevInfo, "[ABT] $msg\n"; 4191 LOG llevInfo, "[ABT] $perl_bt\n";
4192 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3343 LOG llevInfo, "[ABT] $_\n" for @bt; 4193 LOG llevInfo, "[ABT] $_\n" for @bt;
3344 --$_log_backtrace; 4194 --$_log_backtrace;
3345 }; 4195 };
3346 } else { 4196 } else {
3347 LOG llevInfo, "[ABT] $msg\n"; 4197 LOG llevInfo, "[ABT] $msg\n";
3348 LOG llevInfo, "[ABT] [suppressed]\n"; 4198 LOG llevInfo, "[ABT] [suppressed]\n";
3349 } 4199 }
3350} 4200}
3351 4201
3352# load additional modules 4202# load additional modules
3353use cf::pod; 4203require "cf/$_.pm" for @EXTRA_MODULES;
4204cf::_connect_to_perl_2;
3354 4205
3355END { cf::emergency_save } 4206END { cf::emergency_save }
3356 4207
33571 42081
3358 4209

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines