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.362 by root, Mon Sep 10 12:44:06 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.64 (); 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;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.32 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::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";
41Compress::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
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $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;
75 118
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 121our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
83 123
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript);
86 130
87our %CFG; 131our %CFG;
88 132
89our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 134our $RUNTIME;
135our $NOW;
91 136
92our (%PLAYER, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 138our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
95 140
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 143
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
101our $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 :)
102 153
103binmode STDOUT; 154binmode STDOUT;
104binmode STDERR; 155binmode STDERR;
105 156
106# read virtual server time, if available 157# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
111} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
112 165
113mkdir $_ 166mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 168
116our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
117 170
118sub 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::"} };
119 187
120############################################################################# 188#############################################################################
121 189
122=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
123 191
159 227
160The raw value load value from the last tick. 228The raw value load value from the last tick.
161 229
162=item %cf::CFG 230=item %cf::CFG
163 231
164Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 233from wherever your confdir points to.
166 234
167=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
168 236
169These 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
170returns 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
171per 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.
172 240
173=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
174 242
175This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
176C<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
177that call. 245that call.
178 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
179=back 253=back
180 254
181=cut 255=cut
182 256
183BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
184 *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 {
185 my $msg = join "", @_; 264 my $msg = join "", @_;
186 265
187 $msg .= "\n" 266 $msg .= "\n"
188 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
189 268
190 $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;
191 270
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
276Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
277deadlocked coro. 383deadlocked coro.
283 389
284Return 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.
285 391
286=cut 392=cut
287 393
288our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
289our %LOCKER;#d#
290 395
291sub lock_wait($) { 396sub lock_wait($) {
292 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
293
294 if ($LOCKER{$key} == $Coro::current) {#d#
295 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
296 return;#d#
297 }#d#
298
299 # wait for lock, if any
300 while ($LOCK{$key}) {
301 push @{ $LOCK{$key} }, $Coro::current;
302 Coro::schedule;
303 }
304} 398}
305 399
306sub lock_acquire($) { 400sub lock_acquire($) {
307 my ($key) = @_; 401 $LOCKS->guard ($_[0])
308
309 # wait, to be sure we are not locked
310 lock_wait $key;
311
312 $LOCK{$key} = [];
313 $LOCKER{$key} = $Coro::current;#d#
314
315 Coro::guard {
316 delete $LOCKER{$key};#d#
317 # wake up all waiters, to be on the safe side
318 $_->ready for @{ delete $LOCK{$key} };
319 }
320} 402}
321 403
322sub lock_active($) { 404sub lock_active($) {
323 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
324
325 ! ! $LOCK{$key}
326} 406}
327 407
328sub freeze_mainloop { 408sub freeze_mainloop {
329 return unless $TICK_WATCHER->is_active; 409 tick_inhibit_inc;
330 410
331 my $guard = Coro::guard { 411 &Guard::guard (\&tick_inhibit_dec);
332 $TICK_WATCHER->start; 412}
333 }; 413
334 $TICK_WATCHER->stop; 414=item cf::periodic $interval, $cb
335 $guard 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
336} 427}
337 428
338=item cf::get_slot $time[, $priority[, $name]] 429=item cf::get_slot $time[, $priority[, $name]]
339 430
340Allocate $time seconds of blocking CPU time at priority C<$priority>: 431Allocate $time seconds of blocking CPU time at priority C<$priority>:
348 439
349=cut 440=cut
350 441
351our @SLOT_QUEUE; 442our @SLOT_QUEUE;
352our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
353 445
354$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
355$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
448 $Coro::current->desc ("timeslot manager");
449
356 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
357 452
358 while () { 453 while () {
359 next_job: 454 next_job:
455
360 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
361 if ($avail > 0.01) { 457
362 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
363 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
364 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
365 $job->[2]->send; 462 $job->[2]->send;
366 Coro::cede; 463 Coro::cede;
367 goto next_job; 464 goto next_job;
368 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
369 } 467 }
370 } 468 }
371 469
372 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
373 # we do not use wait_For_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
374 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
375 $signal->wait; 473 $signal->wait;
376 } else { 474 } else {
475 $busy = 0;
377 Coro::schedule; 476 Coro::schedule;
378 } 477 }
379 } 478 }
380}; 479};
381 480
382sub get_slot($;$$) { 481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
383 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
384 485
385 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
386 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
387 489
388 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
389 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
390 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
401 503
402BEGIN { *async = \&Coro::async_pool } 504BEGIN { *async = \&Coro::async_pool }
403 505
404=item cf::sync_job { BLOCK } 506=item cf::sync_job { BLOCK }
405 507
406The design of Crossfire TRT requires that the main coroutine ($Coro::main) 508The design of Deliantra requires that the main coroutine ($Coro::main)
407is always able to handle events or runnable, as Crossfire TRT is only 509is always able to handle events or runnable, as Deliantra is only
408partly 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
409acceptable. 511acceptable.
410 512
411If 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
412the given BLOCK in another coroutine while waiting for the result. The 514the given BLOCK in another coroutine while waiting for the result. The
416=cut 518=cut
417 519
418sub sync_job(&) { 520sub sync_job(&) {
419 my ($job) = @_; 521 my ($job) = @_;
420 522
421 if ($Coro::current == $Coro::main) { 523 if (in_main) {
422 my $time = Event::time; 524 my $time = AE::time;
423 525
424 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
425 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
426 528
427 # TODO: use suspend/resume instead 529 #LOG llevError, Carp::longmess "sync job";#d#
428 # (but this is cancel-safe) 530
429 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
430 532
431 my $busy = 1; 533 my $busy = 1;
432 my @res; 534 my @res;
433 535
434 (async { 536 (async {
537 $Coro::current->desc ("sync job coro");
435 @res = eval { $job->() }; 538 @res = eval { $job->() };
436 warn $@ if $@; 539 error $@ if $@;
437 undef $busy; 540 undef $busy;
438 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
439 542
440 while ($busy) { 543 while ($busy) {
441 Coro::cede or Event::one_event; 544 if (Coro::nready) {
545 Coro::cede_notself;
546 } else {
547 EV::loop EV::LOOP_ONESHOT;
442 } 548 }
549 }
443 550
444 $time = Event::time - $time; 551 my $time = AE::time - $time;
445 552
446 LOG llevError | logBacktrace, Carp::longmess "long sync job"
447 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
448
449 $tick_start += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
450 554
451 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
452 } else { 556 } else {
453 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
454 558
479=item fork_call { }, $args 583=item fork_call { }, $args
480 584
481Executes the given code block with the given arguments in a seperate 585Executes the given code block with the given arguments in a seperate
482process, returning the results. Everything must be serialisable with 586process, returning the results. Everything must be serialisable with
483Coro::Storable. May, of course, block. Note that the executed sub may 587Coro::Storable. May, of course, block. Note that the executed sub may
484never block itself or use any form of Event handling. 588never block itself or use any form of event handling.
485 589
486=cut 590=cut
487 591
488sub fork_call(&@) { 592sub fork_call(&@) {
489 my ($cb, @args) = @_; 593 my ($cb, @args) = @_;
498 }, @args; 602 }, @args;
499 603
500 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
501} 605}
502 606
607sub objinfo {
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
643}
644
503=item $value = cf::db_get $family => $key 645=item $value = cf::db_get $family => $key
504 646
505Returns a single value from the environment database. 647Returns a single value from the environment database.
506 648
507=item cf::db_put $family => $key => $value 649=item cf::db_put $family => $key => $value
508 650
509Stores 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
510data 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).
511 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
512=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}
513 680
514our $DB; 681our $DB;
515 682
516sub db_init { 683sub db_init {
517 unless ($DB) { 684 $DB ||= db_table "db";
518 $DB = BDB::db_create $DB_ENV;
519
520 cf::sync_job {
521 eval {
522 $DB->set_flags (BDB::CHKSUM);
523
524 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
525 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
526 cf::cleanup "db_open(db): $!" if $!;
527 };
528 cf::cleanup "db_open(db): $@" if $@;
529 };
530 }
531} 685}
532 686
533sub db_get($$) { 687sub db_get($$) {
534 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
535 689
536 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
537 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
538 694
539 $! ? () 695 $! ? ()
540 : $data 696 : $data
541 }
542} 697}
543 698
544sub db_put($$$) { 699sub db_put($$$) {
545 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
546 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
602 757
603 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
604 my $data = $process->(\@data); 759 my $data = $process->(\@data);
605 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
606 761
607 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
608 763
609 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
610 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
611 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
612 767
622 777
623=cut 778=cut
624 779
625sub datalog($@) { 780sub datalog($@) {
626 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
627 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
628} 783}
629 784
630=back 785=back
631 786
632=cut 787=cut
633 788
634############################################################################# 789#############################################################################
635 790
636=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
637 792
638Many 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
639attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
640to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
641 796
642In 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>
643C<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
644Crossfire TRT). 799Deliantra).
645 800
646=over 4 801=over 4
647 802
648=item $attachable->attach ($attachment, key => $value...) 803=item $attachable->attach ($attachment, key => $value...)
649 804
693=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
694 849
695Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
696given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
697 852
698Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
699that 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.
700 855
701These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
702 857
703=over 4 858=over 4
827 982
828 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
829 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
830 985
831 } elsif (ref $type) { 986 } elsif (ref $type) {
832 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
833 988
834 } else { 989 } else {
835 shift @arg; 990 shift @arg;
836 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
837 } 992 }
838 } 993 }
839} 994}
840 995
841sub _object_attach { 996sub _object_attach {
851 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
852 } 1007 }
853 1008
854 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
855 } else { 1010 } else {
856 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
857 } 1012 }
858 1013
859 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
860} 1015}
861 1016
920 1075
921 for (@$callbacks) { 1076 for (@$callbacks) {
922 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
923 1078
924 if ($@) { 1079 if ($@) {
925 warn "$@";
926 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
927 override; 1081 override;
928 } 1082 }
929 1083
930 return 1 if $override; 1084 return 1 if $override;
931 } 1085 }
932 1086
933 0 1087 0
934} 1088}
935 1089
936=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
937 1091
938=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1092=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
939 1093
940Generate an object-specific event with the given arguments. 1094Generate an object-specific event with the given arguments.
941 1095
947 1101
948=cut 1102=cut
949 1103
950############################################################################# 1104#############################################################################
951# object support 1105# object support
952#
953 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#
954sub _can_merge { 1140sub _can_merge {
955 my ($ob1, $ob2) = @_; 1141 my ($ob1, $ob2) = @_;
956 1142
957 local $Storable::canonical = 1; 1143 ++$SLOW_MERGES;#d#
958 my $fob1 = Storable::freeze $ob1;
959 my $fob2 = Storable::freeze $ob2;
960 1144
961 $fob1 eq $fob2 1145 # we do the slow way here
1146 return _object_equal $ob1, $ob2
962} 1147}
963 1148
964sub reattach { 1149sub reattach {
965 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
966 my ($obj) = @_; 1151 my ($obj) = @_;
967 1152
1153 # no longer needed after getting rid of delete_package?
968 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
969 1155
970 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
971 1157
972 @$registry = (); 1158 @$registry = ();
973 1159
978 for (@$attach) { 1164 for (@$attach) {
979 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
980 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
981 } 1167 }
982 } else { 1168 } else {
983 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
984 } 1170 }
985 } 1171 }
986} 1172}
987 1173
988cf::attachable->attach ( 1174cf::attachable->attach (
989 prio => -1000000, 1175 prio => -1000000,
990 on_instantiate => sub { 1176 on_instantiate => sub {
991 my ($obj, $data) = @_; 1177 my ($obj, $data) = @_;
992 1178
993 $data = from_json $data; 1179 $data = decode_json $data;
994 1180
995 for (@$data) { 1181 for (@$data) {
996 my ($name, $args) = @$_; 1182 my ($name, $args) = @$_;
997 1183
998 $obj->attach ($name, %{$args || {} }); 1184 $obj->attach ($name, %{$args || {} });
1012); 1198);
1013 1199
1014sub object_freezer_save { 1200sub object_freezer_save {
1015 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1016 1202
1017 my $guard = cf::lock_acquire "io";
1018
1019 sync_job { 1203 sync_job {
1020 if (length $$rdata) { 1204 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1023 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1024 1209
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 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 }
1029 close $fh; 1217 aio_close $fh;
1030 1218
1031 if (@$objs) { 1219 if (@$objs) {
1032 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) {
1033 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1036 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 }
1037 close $fh; 1228 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1230 }
1040 } else { 1231 } else {
1041 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1042 } 1233 }
1043 1234
1044 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1045 } else { 1239 } else {
1046 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1047 } 1241 }
1048 } else { 1242 } else {
1049 aio_unlink $filename; 1243 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1051 } 1245 }
1052 }; 1246 };
1053
1054 undef $guard;
1055} 1247}
1056 1248
1057sub object_freezer_as_string { 1249sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1250 my ($rdata, $objs) = @_;
1059 1251
1064 1256
1065sub object_thawer_load { 1257sub object_thawer_load {
1066 my ($filename) = @_; 1258 my ($filename) = @_;
1067 1259
1068 my ($data, $av); 1260 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1261
1072 (aio_load $filename, $data) >= 0 1262 (aio_load $filename, $data) >= 0
1073 or return; 1263 or return;
1074 1264
1075 unless (aio_stat "$filename.pst") { 1265 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1266 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1267 or return;
1078 1268
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1269 my $st = eval { Coro::Storable::thaw $av };
1270 $av = $st->{objs};
1081 } 1271 }
1082 1272
1083 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1084 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1085 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1086 1277
1087 ($data, $av) 1278 ($data, $av)
1088} 1279}
1089 1280
1090=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1146 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1147 1338
1148 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1149} 1340}
1150 1341
1342use File::Glob ();
1343
1151cf::player->attach ( 1344cf::player->attach (
1152 on_command => sub { 1345 on_unknown_command => sub {
1153 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1154 1347
1155 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1156 or return; 1349 or return;
1157 1350
1180 1373
1181 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1182 if $reply; 1375 if $reply;
1183 1376
1184 } else { 1377 } else {
1185 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1186 } 1379 }
1187 1380
1188 cf::override; 1381 cf::override;
1189 }, 1382 },
1190); 1383);
1191 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
1192sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1193 cf::sync_job { 1401 cf::sync_job {
1194 my %todo; 1402 my %todo;
1195 1403
1196 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1197 next unless -r $path; 1405 next unless -r $path;
1215 1423
1216 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1217 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1218 1426
1219 $ext{source} = 1427 $ext{source} =
1220 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1221 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1222 . $source 1430 . $source
1223 . "\n};\n1"; 1431 . "\n};\n1";
1224 1432
1225 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1226 } 1434 }
1227 1435
1436 my $pass = 0;
1228 my %done; 1437 my %done;
1229 while (%todo) { 1438 while (%todo) {
1230 my $progress; 1439 my $progress;
1231 1440
1441 ++$pass;
1442
1443 ext:
1232 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1233 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1234 goto skip 1446 next ext
1235 unless exists $done{$_}; 1447 unless exists $done{$_};
1236 } 1448 }
1237 1449
1238 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1239 1451
1240 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1241 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1242 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1243 1457
1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1244 if (exists $v->{meta}{mandatory}) { 1459 if exists $v->{meta}{mandatory};
1245 warn $msg; 1460
1246 warn "mandatory extension failed to load, exiting.\n"; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1247 exit 1; 1462 delete $todo{$k};
1248 } 1463 } else {
1249 1464 $done{$k} = delete $todo{$k};
1250 warn $msg; 1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1251 } 1470 }
1252
1253 $done{$k} = delete $todo{$k};
1254 push @EXTS, $v->{pkg};
1255 $progress = 1;
1256 } 1471 }
1257 1472
1258 skip: 1473 unless ($progress) {
1259 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1260 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 }
1261 } 1481 }
1262 }; 1482 };
1263} 1483}
1264 1484
1265############################################################################# 1485#############################################################################
1266 1486
1267=back 1487=back
1268 1488
1269=head2 CORE EXTENSIONS 1489=head2 CORE EXTENSIONS
1270 1490
1271Functions and methods that extend core crossfire objects. 1491Functions and methods that extend core deliantra objects.
1272 1492
1273=cut 1493=cut
1274 1494
1275package cf::player; 1495package cf::player;
1276 1496
1319 1539
1320sub exists($) { 1540sub exists($) {
1321 my ($login) = @_; 1541 my ($login) = @_;
1322 1542
1323 $cf::PLAYER{$login} 1543 $cf::PLAYER{$login}
1324 or cf::sync_job { !aio_stat path $login } 1544 or !aio_stat path $login
1325} 1545}
1326 1546
1327sub find($) { 1547sub find($) {
1328 return $cf::PLAYER{$_[0]} || do { 1548 return $cf::PLAYER{$_[0]} || do {
1329 my $login = $_[0]; 1549 my $login = $_[0];
1339 aio_unlink +(playerdir $login) . "/$login.pl"; 1559 aio_unlink +(playerdir $login) . "/$login.pl";
1340 1560
1341 my $f = new_from_file cf::object::thawer path $login 1561 my $f = new_from_file cf::object::thawer path $login
1342 or return; 1562 or return;
1343 1563
1344 $f->next;
1345 my $pl = cf::player::load_pl $f 1564 my $pl = cf::player::load_pl $f
1346 or return; 1565 or return;
1566
1347 local $cf::PLAYER_LOADING{$login} = $pl; 1567 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs; 1568 $f->resolve_delayed_derefs;
1349 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1350 } 1570 }
1351 } 1571 }
1352} 1572}
1353 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);
1586
1354sub save($) { 1587sub save($) {
1355 my ($pl) = @_; 1588 my ($pl) = @_;
1356 1589
1357 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1358 1591
1361 1594
1362 return if $pl->{deny_save}; 1595 return if $pl->{deny_save};
1363 1596
1364 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1365 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
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];
1366 1604
1367 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1368 cf::cede_to_tick; 1606 cf::cede_to_tick;
1369} 1607}
1370 1608
1402 my ($pl) = @_; 1640 my ($pl) = @_;
1403 1641
1404 my $name = $pl->ob->name; 1642 my $name = $pl->ob->name;
1405 1643
1406 $pl->{deny_save} = 1; 1644 $pl->{deny_save} = 1;
1407 $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
1408 1646
1409 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1410 $pl->deactivate; 1648 $pl->deactivate;
1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1411 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1412 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1413 1652
1414 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1415 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
1454 1693
1455 for my $login (@$dirs) { 1694 for my $login (@$dirs) {
1456 my $path = path $login; 1695 my $path = path $login;
1457 1696
1458 # a .pst is a dead give-away for a valid player 1697 # a .pst is a dead give-away for a valid player
1459 unless (-e "$path.pst") { 1698 # if no pst file found, open and chekc for blocked users
1699 if (aio_stat "$path.pst") {
1460 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1700 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1461 aio_read $fh, 0, 512, my $buf, 0 or next; 1701 aio_read $fh, 0, 512, my $buf, 0 or next;
1462 $buf !~ /^password -------------$/m or next; # official not-valid tag 1702 $buf !~ /^password -------------$/m or next; # official not-valid tag
1463 } 1703 }
1464 1704
1468 1708
1469 \@logins 1709 \@logins
1470} 1710}
1471 1711
1472=item $player->maps 1712=item $player->maps
1713
1714=item cf::player::maps $login
1473 1715
1474Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1475player. May block. 1717player. May block.
1476 1718
1477=cut 1719=cut
1495 } 1737 }
1496 1738
1497 \@paths 1739 \@paths
1498} 1740}
1499 1741
1500=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1742=item $protocol_xml = $player->expand_cfpod ($cfpod)
1501 1743
1502Expand crossfire pod fragments into protocol xml. 1744Expand deliantra pod fragments into protocol xml.
1503
1504=cut
1505
1506sub expand_cfpod {
1507 ((my $self), (local $_)) = @_;
1508
1509 # escape & and <
1510 s/&/&amp;/g;
1511 s/(?<![BIUGHT])</&lt;/g;
1512
1513 # this is buggy, it needs to properly take care of nested <'s
1514
1515 1 while
1516 # replace B<>, I<>, U<> etc.
1517 s/B<([^\>]*)>/<b>$1<\/b>/
1518 || s/I<([^\>]*)>/<i>$1<\/i>/
1519 || s/U<([^\>]*)>/<u>$1<\/u>/
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1521 # replace G<male|female> tags
1522 || s{G<([^>|]*)\|([^>]*)>}{
1523 $self->gender ? $2 : $1
1524 }ge
1525 # replace H<hint text>
1526 || s{H<([^\>]*)>}
1527 {
1528 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1529 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1530 "")
1531 [$self->{hintmode}]
1532 }ge;
1533
1534 # create single paragraphs (very hackish)
1535 s/(?<=\S)\n(?=\w)/ /g;
1536
1537 # compress some whitespace
1538 s/\s+\n/\n/g; # ws line-ends
1539 s/\n\n+/\n/g; # double lines
1540 s/^\n+//; # beginning lines
1541 s/\n+$//; # ending lines
1542
1543 $_
1544}
1545
1546sub hintmode {
1547 $_[0]{hintmode} = $_[1] if @_ > 1;
1548 $_[0]{hintmode}
1549}
1550 1745
1551=item $player->ext_reply ($msgid, @msg) 1746=item $player->ext_reply ($msgid, @msg)
1552 1747
1553Sends an ext reply to the player. 1748Sends an ext reply to the player.
1554 1749
1586 1781
1587=cut 1782=cut
1588 1783
1589sub find_by_path($) { 1784sub find_by_path($) {
1590 my ($path) = @_; 1785 my ($path) = @_;
1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1591 1788
1592 my ($match, $specificity); 1789 my ($match, $specificity);
1593 1790
1594 for my $region (list) { 1791 for my $region (list) {
1595 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1621our $MAX_RESET = 3600; 1818our $MAX_RESET = 3600;
1622our $DEFAULT_RESET = 3000; 1819our $DEFAULT_RESET = 3000;
1623 1820
1624sub generate_random_map { 1821sub generate_random_map {
1625 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
1626 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1627 $self->_create_random_map ( 1827 $self->_create_random_map (
1628 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1629 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1630 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1631 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1632 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1633 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1634 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1649 1849
1650sub register { 1850sub register {
1651 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1652 my $pkg = caller; 1852 my $pkg = caller;
1653 1853
1654 no strict;
1655 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1656 1855
1657 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1658} 1857}
1659 1858
1660# also paths starting with '/' 1859# also paths starting with '/'
1661$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1662 1861
1663sub thawer_merge { 1862sub thawer_merge {
1664 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1665 1864
1666 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1752 1951
1753# the temporary/swap location 1952# the temporary/swap location
1754sub save_path { 1953sub save_path {
1755 my ($self) = @_; 1954 my ($self) = @_;
1756 1955
1757 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1758 "$TMPDIR/$path.map" 1957 "$TMPDIR/$path.map"
1759} 1958}
1760 1959
1761# the unique path, undef == no special unique path 1960# the unique path, undef == no special unique path
1762sub uniq_path { 1961sub uniq_path {
1763 my ($self) = @_; 1962 my ($self) = @_;
1764 1963
1765 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1766 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1767}
1768
1769# and all this just because we cannot iterate over
1770# all maps in C++...
1771sub change_all_map_light {
1772 my ($change) = @_;
1773
1774 $_->change_map_light ($change)
1775 for grep $_->outdoor, values %cf::MAP;
1776} 1966}
1777 1967
1778sub decay_objects { 1968sub decay_objects {
1779 my ($self) = @_; 1969 my ($self) = @_;
1780 1970
1864sub find { 2054sub find {
1865 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1866 2056
1867 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1868 2058
1869 cf::lock_wait "map_data:$path";#d#remove 2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1870 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1871 2061
1872 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
1873 my $guard1 = cf::lock_acquire "map_find:$path";
1874 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1875
1876 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
1877 or return; 2064 or return;
1878 2065
1879 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1880 2067
1882 or return; 2069 or return;
1883 2070
1884 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2071 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1885 # doing this can freeze the server in a sync job, obviously 2072 # doing this can freeze the server in a sync job, obviously
1886 #$cf::WAIT_FOR_TICK->wait; 2073 #$cf::WAIT_FOR_TICK->wait;
2074 undef $guard2;
1887 undef $guard1; 2075 undef $guard1;
1888 undef $guard2;
1889 $map->reset; 2076 $map->reset;
1890 return find $path; 2077 return find $path;
1891 } 2078 }
1892 2079
1893 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1894 } 2081 }
1895} 2082}
1896 2083
1897sub pre_load { } 2084sub pre_load { }
1898sub post_load { } 2085#sub post_load { } # XS
1899 2086
1900sub load { 2087sub load {
1901 my ($self) = @_; 2088 my ($self) = @_;
1902 2089
1903 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
1920 my $f = new_from_file cf::object::thawer $self->{load_path}; 2107 my $f = new_from_file cf::object::thawer $self->{load_path};
1921 $f->skip_block; 2108 $f->skip_block;
1922 $self->_load_objects ($f) 2109 $self->_load_objects ($f)
1923 or return; 2110 or return;
1924 2111
1925 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
1926 if delete $self->{load_original}; 2113 if delete $self->{load_original};
1927 2114
1928 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
1929 utf8::encode $uniq; 2116 utf8::encode $uniq;
1930 unless (aio_stat $uniq) { 2117 unless (aio_stat $uniq) {
1948 unless ($self->{deny_activate}) { 2135 unless ($self->{deny_activate}) {
1949 $self->decay_objects; 2136 $self->decay_objects;
1950 $self->fix_auto_apply; 2137 $self->fix_auto_apply;
1951 $self->update_buttons; 2138 $self->update_buttons;
1952 cf::cede_to_tick; 2139 cf::cede_to_tick;
1953 $self->set_darkness_map;
1954 cf::cede_to_tick;
1955 $self->activate; 2140 $self->activate;
1956 } 2141 }
1957 2142
1958 $self->{last_save} = $cf::RUNTIME; 2143 $self->{last_save} = $cf::RUNTIME;
1959 $self->last_access ($cf::RUNTIME); 2144 $self->last_access ($cf::RUNTIME);
1960 2145
1961 $self->in_memory (cf::MAP_IN_MEMORY); 2146 $self->in_memory (cf::MAP_ACTIVE);
1962 } 2147 }
1963 2148
1964 $self->post_load; 2149 $self->post_load;
1965} 2150}
1966 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
1967sub customise_for { 2155sub customise_for {
1968 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
1969 2157
1970 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
1971 if $self->per_player; 2159 if $self->per_player;
1987 or next; 2175 or next;
1988 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
1989 or next; 2177 or next;
1990 $neigh->load; 2178 $neigh->load;
1991 2179
2180 # now find the diagonal neighbours
1992 push @neigh, 2181 push @neigh,
1993 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1994 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1995 } 2184 }
1996 2185
2003} 2192}
2004 2193
2005sub find_sync { 2194sub find_sync {
2006 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2007 2196
2008 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
2009} 2201}
2010 2202
2011sub do_load_sync { 2203sub do_load_sync {
2012 my ($map) = @_; 2204 my ($map) = @_;
2013 2205
2014 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2015 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2016 2208
2017 cf::sync_job { $map->load }; 2209 $map->load;
2018} 2210}
2019 2211
2020our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2021our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2022 2214
2024 my ($path, $origin, $load) = @_; 2216 my ($path, $origin, $load) = @_;
2025 2217
2026 $path = normalise $path, $origin && $origin->{path}; 2218 $path = normalise $path, $origin && $origin->{path};
2027 2219
2028 if (my $map = $cf::MAP{$path}) { 2220 if (my $map = $cf::MAP{$path}) {
2029 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2030 } 2222 }
2031 2223
2032 $MAP_PREFETCH{$path} |= $load; 2224 $MAP_PREFETCH{$path} |= $load;
2033 2225
2034 $MAP_PREFETCHER ||= cf::async { 2226 $MAP_PREFETCHER ||= cf::async {
2227 $Coro::current->{desc} = "map prefetcher";
2228
2035 while (%MAP_PREFETCH) { 2229 while (%MAP_PREFETCH) {
2036 while (my ($k, $v) = each %MAP_PREFETCH) { 2230 while (my ($k, $v) = each %MAP_PREFETCH) {
2037 if (my $map = find $k) { 2231 if (my $map = find $k) {
2038 $map->load if $v; 2232 $map->load if $v;
2039 } 2233 }
2046 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2047 2241
2048 () 2242 ()
2049} 2243}
2050 2244
2245# common code, used by both ->save and ->swapout
2051sub save { 2246sub _save {
2052 my ($self) = @_; 2247 my ($self) = @_;
2053
2054 my $lock = cf::lock_acquire "map_data:$self->{path}";
2055 2248
2056 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2057 2250
2058 return unless $self->dirty; 2251 return unless $self->dirty;
2059 2252
2065 return if $self->{deny_save}; 2258 return if $self->{deny_save};
2066 2259
2067 local $self->{last_access} = $self->last_access;#d# 2260 local $self->{last_access} = $self->last_access;#d#
2068 2261
2069 cf::async { 2262 cf::async {
2263 $Coro::current->{desc} = "map player save";
2070 $_->contr->save for $self->players; 2264 $_->contr->save for $self->players;
2071 }; 2265 };
2266
2267 cf::get_slot 0.02;
2072 2268
2073 if ($uniq) { 2269 if ($uniq) {
2074 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2270 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2075 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2271 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2076 } else { 2272 } else {
2077 $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);
2078 } 2274 }
2079} 2275}
2080 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2081sub swap_out { 2285sub swap_out {
2082 my ($self) = @_; 2286 my ($self) = @_;
2083 2287
2084 # save first because save cedes
2085 $self->save;
2086
2087 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2088 2289
2290 return if $self->in_memory != cf::MAP_ACTIVE;
2291 return if $self->{deny_save};
2089 return if $self->players; 2292 return if $self->players;
2090 return if $self->in_memory != cf::MAP_IN_MEMORY;
2091 return if $self->{deny_save};
2092 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2093 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2094 2344
2095 $self->deactivate; 2345 $self->deactivate;
2096 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2097 $self->clear; 2347 $self->clear;
2098}
2099
2100sub reset_at {
2101 my ($self) = @_;
2102
2103 # TODO: safety, remove and allow resettable per-player maps
2104 return 1e99 if $self->{deny_reset};
2105
2106 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2107 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2108
2109 $time + $to
2110}
2111
2112sub should_reset {
2113 my ($self) = @_;
2114
2115 $self->reset_at <= $cf::RUNTIME
2116}
2117
2118sub reset {
2119 my ($self) = @_;
2120
2121 my $lock = cf::lock_acquire "map_data:$self->{path}";
2122
2123 return if $self->players;
2124
2125 warn "resetting map ", $self->path;
2126
2127 $self->in_memory (cf::MAP_SWAPPED);
2128
2129 # need to save uniques path
2130 unless ($self->{deny_save}) {
2131 my $uniq = $self->uniq_path; utf8::encode $uniq;
2132
2133 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2134 if $uniq;
2135 }
2136
2137 delete $cf::MAP{$self->path};
2138
2139 $self->deactivate;
2140 $_->clear_links_to ($self) for values %cf::MAP;
2141 $self->clear;
2142 2348
2143 $self->unlink_save; 2349 $self->unlink_save;
2144 $self->destroy; 2350 $self->destroy;
2145} 2351}
2146 2352
2154 2360
2155 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2156 2362
2157 $self->unlink_save; 2363 $self->unlink_save;
2158 2364
2159 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2160 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2161 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2162 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2163 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2164 2370
2213 2419
2214sub unique_maps() { 2420sub unique_maps() {
2215 [ 2421 [
2216 map { 2422 map {
2217 utf8::decode $_; 2423 utf8::decode $_;
2218 /\.map$/ 2424 s/\.map$//; # TODO future compatibility hack
2425 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2426 ? ()
2219 ? normalise $_ 2427 : normalise $_
2220 : ()
2221 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2222 ] 2429 ]
2223} 2430}
2224 2431
2225package 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}
2226 2463
2227=back 2464=back
2228 2465
2229=head3 cf::object 2466=head3 cf::object
2230 2467
2234 2471
2235=over 4 2472=over 4
2236 2473
2237=item $ob->inv_recursive 2474=item $ob->inv_recursive
2238 2475
2239Returns 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.
2240 2478
2241=cut 2479=cut
2242 2480
2243sub inv_recursive_; 2481sub inv_recursive_;
2244sub inv_recursive_ { 2482sub inv_recursive_ {
2249 inv_recursive_ inv $_[0] 2487 inv_recursive_ inv $_[0]
2250} 2488}
2251 2489
2252=item $ref = $ob->ref 2490=item $ref = $ob->ref
2253 2491
2254creates and returns a persistent reference to an objetc that can be stored as a string. 2492Creates and returns a persistent reference to an object that can be stored as a string.
2255 2493
2256=item $ob = cf::object::deref ($refstring) 2494=item $ob = cf::object::deref ($refstring)
2257 2495
2258returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2496returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2259even if the object actually exists. May block. 2497even if the object actually exists. May block.
2261=cut 2499=cut
2262 2500
2263sub deref { 2501sub deref {
2264 my ($ref) = @_; 2502 my ($ref) = @_;
2265 2503
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2504 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2); 2505 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2506 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return; 2507 or return;
2273 $pl->ob->uuid eq $uuid 2508 $pl->ob->uuid eq $uuid
2274 or return; 2509 or return;
2294can 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
2295dialogue with the given NPC character. 2530dialogue with the given NPC character.
2296 2531
2297=cut 2532=cut
2298 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};
2547
2299# rough implementation of a future "reply" method that works 2548# rough implementation of a future "reply" method that works
2300# with dialog boxes. 2549# with dialog boxes.
2301#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
2302sub cf::object::player::reply($$$;$) { 2551sub cf::object::player::reply($$$;$) {
2303 my ($self, $npc, $msg, $flags) = @_; 2552 my ($self, $npc, $msg, $flags) = @_;
2314 my $dialog = $pl->{npc_dialog}; 2563 my $dialog = $pl->{npc_dialog};
2315 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2564 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2316 2565
2317 } else { 2566 } else {
2318 $msg = $npc->name . " says: $msg" if $npc; 2567 $msg = $npc->name . " says: $msg" if $npc;
2319 $self->message ($msg, $flags); 2568 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2320 } 2569 }
2321 } 2570 }
2322} 2571}
2323 2572
2324=item $object->send_msg ($channel, $msg, $color, [extra...]) 2573=item $object->send_msg ($channel, $msg, $color, [extra...])
2349 2598
2350=item $player_object->enter_link 2599=item $player_object->enter_link
2351 2600
2352Freezes 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}>).
2353 2602
2354The 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.
2355I<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.
2356 2607
2357Will never block. 2608Will never block.
2358 2609
2359=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
2360 2611
2380sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2381 my ($self) = @_; 2632 my ($self) = @_;
2382 2633
2383 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2384 2635
2636 ++$self->{_link_recursion};
2637
2385 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2386 2639
2387 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2388 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2389 2642
2390 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2391} 2644}
2392 2645
2393sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2394 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2395 2648
2412 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2413 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2414 2667
2415 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2416 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2417 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2418 2671
2419 $map->load; 2672 $map->load;
2420 $map->load_neighbours; 2673 $map->load_neighbours;
2421 2674
2422 return unless $self->contr->active; 2675 return unless $self->contr->active;
2423 $self->activate_recursive;
2424 2676
2425 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2426 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2427} 2679 # entering was successful
2680 delete $self->{_link_recursion};
2681 # only activate afterwards, to support waiting in hooks
2682 $self->activate_recursive;
2683 }
2428 2684
2685}
2686
2429=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)]])
2430 2688
2431Moves 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
2432her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2433that 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
2434the 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
2435be called at the end of this process. 2693be called at the end of this process.
2436 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
2437=cut 2698=cut
2438 2699
2439our $GOTOGEN; 2700our $GOTOGEN;
2440 2701
2441sub cf::object::player::goto { 2702sub cf::object::player::goto {
2442 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2443 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
2444 # 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
2445 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2446 2713
2447 $self->enter_link; 2714 $self->enter_link;
2448 2715
2449 (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
2450 my $map = eval { 2738 my $map = eval {
2451 my $map = cf::map::find $path; 2739 my $map = defined $path ? cf::map::find $path : undef;
2452 2740
2453 if ($map) { 2741 if ($map) {
2454 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2455 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2456 } else { 2744 } else {
2457 $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);
2458 } 2746 }
2459 2747
2460 $map 2748 $map
2461 }; 2749 };
2462 2750
2468 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2469 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2470 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2471 } 2759 }
2472 2760
2473 $done->() if $done; 2761 $done->($self) if $done;
2474 })->prio (1); 2762 })->prio (1);
2475} 2763}
2476 2764
2477=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2478 2766
2498} 2786}
2499 2787
2500sub prepare_random_map { 2788sub prepare_random_map {
2501 my ($exit) = @_; 2789 my ($exit) = @_;
2502 2790
2503 my $guard = cf::lock_acquire "exit_prepare:$exit";
2504
2505 # all this does is basically replace the /! path by 2791 # all this does is basically replace the /! path by
2506 # a new random map path (?random/...) with a seed 2792 # a new random map path (?random/...) with a seed
2507 # that depends on the exit object 2793 # that depends on the exit object
2508 2794
2509 my $rmp = parse_random_map_params $exit->msg; 2795 my $rmp = parse_random_map_params $exit->msg;
2511 if ($exit->map) { 2797 if ($exit->map) {
2512 $rmp->{region} = $exit->region->name; 2798 $rmp->{region} = $exit->region->name;
2513 $rmp->{origin_map} = $exit->map->path; 2799 $rmp->{origin_map} = $exit->map->path;
2514 $rmp->{origin_x} = $exit->x; 2800 $rmp->{origin_x} = $exit->x;
2515 $rmp->{origin_y} = $exit->y; 2801 $rmp->{origin_y} = $exit->y;
2802
2803 $exit->map->touch;
2516 } 2804 }
2517 2805
2518 $rmp->{random_seed} ||= $exit->random_seed; 2806 $rmp->{random_seed} ||= $exit->random_seed;
2519 2807
2520 my $data = cf::to_json $rmp; 2808 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2521 my $md5 = Digest::MD5::md5_hex $data; 2809 my $md5 = Digest::MD5::md5_hex $data;
2522 my $meta = "$RANDOMDIR/$md5.meta"; 2810 my $meta = "$RANDOMDIR/$md5.meta";
2523 2811
2524 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2812 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2525 aio_write $fh, 0, (length $data), $data, 0; 2813 aio_write $fh, 0, (length $data), $data, 0;
2526 undef $fh; 2814 undef $fh;
2527 aio_rename "$meta~", $meta; 2815 aio_rename "$meta~", $meta;
2528 2816
2817 my $slaying = "?random/$md5";
2818
2819 if ($exit->valid) {
2529 $exit->slaying ("?random/$md5"); 2820 $exit->slaying ("?random/$md5");
2530 $exit->msg (undef); 2821 $exit->msg (undef);
2822 }
2531 } 2823 }
2532} 2824}
2533 2825
2534sub cf::object::player::enter_exit { 2826sub cf::object::player::enter_exit {
2535 my ($self, $exit) = @_; 2827 my ($self, $exit) = @_;
2536 2828
2537 return unless $self->type == cf::PLAYER; 2829 return unless $self->type == cf::PLAYER;
2538 2830
2539 if ($exit->slaying eq "/!") {
2540 #TODO: this should de-fi-ni-te-ly not be a sync-job
2541 # the problem is that $exit might not survive long enough
2542 # so it needs to be done right now, right here
2543 cf::sync_job { prepare_random_map $exit };
2544 }
2545
2546 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2547 my $hp = $exit->stats->hp;
2548 my $sp = $exit->stats->sp;
2549
2550 $self->enter_link; 2831 $self->enter_link;
2551 2832
2552 # if exit is damned, update players death & WoR home-position
2553 $self->contr->savebed ($slaying, $hp, $sp)
2554 if $exit->flag (FLAG_DAMNED);
2555
2556 (async { 2833 (async {
2557 $self->deactivate_recursive; # just to be sure 2834 $Coro::current->{desc} = "enter_exit";
2835
2558 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
2559 $self->goto ($slaying, $hp, $sp); 2851 $self->goto ($map, $x, $y);
2560 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
2561 1; 2857 1
2562 }) { 2858 }) {
2563 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2564 . "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. "
2565 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2566 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2567 2863
2568 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2569 $self->leave_link; 2865 $self->leave_link;
2570 } 2866 }
2571 })->prio (1); 2867 })->prio (1);
2572} 2868}
2573 2869
2585sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2586 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2587 2883
2588 utf8::encode $text; 2884 utf8::encode $text;
2589 $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);
2590} 2911}
2591 2912
2592=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2593 2914
2594Send 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
2596the 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
2597the message unless the client supports the msg packet. 2918the message unless the client supports the msg packet.
2598 2919
2599=cut 2920=cut
2600 2921
2922# non-persistent channels (usually the info channel)
2601our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2602 "c/identify" => { 2930 "c/identify" => {
2603 id => "identify", 2931 id => "infobox",
2604 title => "Identify", 2932 title => "Identify",
2605 reply => undef, 2933 reply => undef,
2606 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
2607 }, 2935 },
2608 "c/examine" => { 2936 "c/examine" => {
2609 id => "examine", 2937 id => "infobox",
2610 title => "Examine", 2938 title => "Examine",
2611 reply => undef, 2939 reply => undef,
2612 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2613 }, 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,
2614); 3034);
2615 3035
2616sub cf::client::send_msg { 3036sub cf::client::send_msg {
2617 my ($self, $channel, $msg, $color, @extra) = @_; 3037 my ($self, $channel, $msg, $color, @extra) = @_;
2618 3038
2619 $msg = $self->pl->expand_cfpod ($msg); 3039 $msg = $self->pl->expand_cfpod ($msg)
3040 unless $color & cf::NDI_VERBATIM;
2620 3041
2621 $color &= cf::NDI_CLIENT_MASK; # just in case... 3042 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622 3043
2623 # check predefined channels, for the benefit of C 3044 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3045 if ($CHANNEL{$channel}) {
3046 $channel = $CHANNEL{$channel};
2625 3047
3048 $self->ext_msg (channel_info => $channel);
3049 $channel = $channel->{id};
3050
2626 if (ref $channel) { 3051 } elsif (ref $channel) {
2627 # send meta info to client, if not yet sent 3052 # send meta info to client, if not yet sent
2628 unless (exists $self->{channel}{$channel->{id}}) { 3053 unless (exists $self->{channel}{$channel->{id}}) {
2629 $self->{channel}{$channel->{id}} = $channel; 3054 $self->{channel}{$channel->{id}} = $channel;
2630 $self->ext_msg (channel_info => $channel) 3055 $self->ext_msg (channel_info => $channel);
2631 if $self->can_msg;
2632 } 3056 }
2633 3057
2634 $channel = $channel->{id}; 3058 $channel = $channel->{id};
2635 } 3059 }
2636 3060
2637 return unless @extra || length $msg; 3061 return unless @extra || length $msg;
2638 3062
2639 if ($self->can_msg) {
2640 # default colour, mask it out 3063 # default colour, mask it out
2641 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3064 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2642 if $color & cf::NDI_DEF; 3065 if $color & cf::NDI_DEF;
2643 3066
2644 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3067 my $pkt = "msg "
3068 . $self->{json_coder}->encode (
2645 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2646 } else { 3070 );
2647 if ($color >= 0) {
2648 # replace some tags by gcfclient-compatible ones
2649 for ($msg) {
2650 1 while
2651 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2652 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2653 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2654 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2655 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2656 }
2657 3071
2658 $color &= cf::NDI_COLOR_MASK; 3072 $self->send_big_packet ($pkt);
2659
2660 utf8::encode $msg;
2661
2662 if (0 && $msg =~ /\[/) {
2663 # COMMAND/INFO
2664 $self->send_packet ("drawextinfo $color 10 8 $msg")
2665 } else {
2666 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2667 $self->send_packet ("drawinfo $color $msg")
2668 }
2669 }
2670 }
2671} 3073}
2672 3074
2673=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2674 3076
2675Sends an ext event to the client. 3077Sends an ext event to the client.
2678 3080
2679sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2680 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2681 3083
2682 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2683 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2684 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2685 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2686 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2687 } 3089 }
2688} 3090}
2689 3091
2690=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2691 3093
2695 3097
2696sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2697 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2698 3100
2699 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2700 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2701 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2702 #TODO: version 1, remove 3104 #TODO: version 1, remove
2703 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2704 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2705 } 3107 }
2706} 3108}
2707 3109
2708=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2709 3111
2780 3182
2781 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
2782 if $reply; 3184 if $reply;
2783 3185
2784 } else { 3186 } else {
2785 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";
2786 } 3188 }
2787 3189
2788 cf::override; 3190 cf::override;
2789 }, 3191 },
2790); 3192);
2810 3212
2811 $coro 3213 $coro
2812} 3214}
2813 3215
2814cf::client->attach ( 3216cf::client->attach (
2815 on_destroy => sub { 3217 on_client_destroy => sub {
2816 my ($ns) = @_; 3218 my ($ns) = @_;
2817 3219
2818 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2819 }, 3221 },
2820); 3222);
2836our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
2837 3239
2838$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
2839 3241
2840$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
2841 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
2842 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
2843 sort time 3245 sort time
2844)); 3246));
2845 3247
2846# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
2848=pod 3250=pod
2849 3251
2850The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
2851 3253
2852 cf::object 3254 cf::object
2853 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
2854 insert remove name archname title slaying race decrease_ob_nr 3256 insert remove name archname title slaying race decrease split
3257 value
2855 3258
2856 cf::object::player 3259 cf::object::player
2857 player 3260 player
2858 3261
2859 cf::player 3262 cf::player
2864 3267
2865=cut 3268=cut
2866 3269
2867for ( 3270for (
2868 ["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
2869 insert remove inv name archname title slaying race 3272 insert remove inv nrof name archname title slaying race
2870 decrease_ob_nr)], 3273 decrease split destroy change_exp value msg lore send_msg)],
2871 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
2872 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
2873 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
2874) { 3277) {
2875 no strict 'refs';
2876 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
2877 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2878 for @funs; 3280 for @funs;
2879} 3281}
2880 3282
2895 3297
2896 my $qcode = $code; 3298 my $qcode = $code;
2897 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2898 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
2899 3301
3302 %vars = (_dummy => 0) unless %vars;
3303
3304 my @res;
2900 local $_; 3305 local $_;
2901 local @safe::cf::_safe_eval_args = values %vars;
2902 3306
2903 my $eval = 3307 my $eval =
2904 "do {\n" 3308 "do {\n"
2905 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2906 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
2907 . $code 3311 . $code
2908 . "\n}" 3312 . "\n}"
2909 ; 3313 ;
2910 3314
3315 if ($CFG{safe_eval}) {
2911 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
2912 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2913 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 }
2914 3324
2915 if ($@) { 3325 if ($@) {
2916 warn "$@"; 3326 warn "$@",
2917 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
2918 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
2919 } 3329 }
2920 3330
2921 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
2922} 3332}
2923 3333
2937=cut 3347=cut
2938 3348
2939sub register_script_function { 3349sub register_script_function {
2940 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
2941 3351
2942 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
2943 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
2944} 3354}
2945 3355
2946=back 3356=back
2947 3357
2948=cut 3358=cut
2949 3359
2950############################################################################# 3360#############################################################################
2951# the server's init and main functions 3361# the server's init and main functions
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}
2952 3405
2953sub load_facedata($) { 3406sub load_facedata($) {
2954 my ($path) = @_; 3407 my ($path) = @_;
2955 3408
2956 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
2957 # for this (global event?) 3410 # for this (global event?)
2958 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
2959 3412
2960 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2961 3414
2962 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
2963 3416
2964 my $facedata; 3417 my $facedata;
2965 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
2966 or die "$path: $!"; 3419 or die "$path: $!";
2967 3420
2969 3422
2970 $facedata->{version} == 2 3423 $facedata->{version} == 2
2971 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
2972 3425
2973 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2974 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
2975 type => FT_RSRC, 3429 type => FT_RSRC,
2976 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
2977 }; 3432 };
2978 cf::cede_to_tick; 3433 cf::cede_to_tick;
2979 3434
2980 { 3435 {
2981 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
2982 3437
2983 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
2984 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3440
2985 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
2986 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
2987 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2988 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2989 3445
2990 cf::cede_to_tick; 3446 cf::cede_to_tick;
2991 } 3447 }
2992 3448
2993 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
2994 next unless $info->{smooth}; 3450 next unless $info->{smooth};
3451
2995 my $idx = cf::face::find $face 3452 my $idx = cf::face::find $face
2996 or next; 3453 or next;
3454
2997 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
2998 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
2999 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3000 } else { 3458 } else {
3001 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3002 } 3460 }
3003 3461
3004 cf::cede_to_tick; 3462 cf::cede_to_tick;
3005 } 3463 }
3006 } 3464 }
3015 3473
3016 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3017 } 3475 }
3018 3476
3019 { 3477 {
3020 # TODO: for gcfclient pleasure, we should give resources
3021 # that gcfclient doesn't grok a >10000 face index.
3022 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3023 3479
3024 my $soundconf = delete $res->{"res/sound.conf"};
3025
3026 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3481 if (defined $info->{type}) {
3027 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3028 my $data;
3029 3483
3030 if ($info->{type} & 1) { 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3031 # prepend meta info 3485 cf::face::set_type $idx, $info->{type};
3032
3033 my $meta = $enc->encode ({
3034 name => $name,
3035 %{ $info->{meta} || {} },
3036 });
3037
3038 $data = pack "(w/a*)*", $meta, $info->{data};
3039 } else { 3486 } else {
3040 $data = $info->{data}; 3487 $RESOURCE{$name} = $info; # unused
3041 } 3488 }
3042 3489
3043 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3044 cf::face::set_type $idx, $info->{type};
3045
3046 cf::cede_to_tick; 3490 cf::cede_to_tick;
3047 } 3491 }
3048
3049 if ($soundconf) {
3050 $soundconf = $enc->decode (delete $soundconf->{data});
3051
3052 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3053 my $sound = $soundconf->{compat}[$_]
3054 or next;
3055
3056 my $face = cf::face::find "sound/$sound->[1]";
3057 cf::sound::set $sound->[0] => $face;
3058 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3059 }
3060
3061 while (my ($k, $v) = each %{$soundconf->{event}}) {
3062 my $face = cf::face::find "sound/$v";
3063 cf::sound::set $k => $face;
3064 }
3065 }
3066 } 3492 }
3493
3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3067 3495
3068 1 3496 1
3069} 3497}
3070 3498
3071register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3073 3501
3074 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
3075 $ns->fx_want ($k, $v); 3503 $ns->fx_want ($k, $v);
3076 } 3504 }
3077}; 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}
3078 3516
3079sub reload_regions { 3517sub reload_regions {
3080 # HACK to clear player env face cache, we need some signal framework 3518 # HACK to clear player env face cache, we need some signal framework
3081 # for this (global event?) 3519 # for this (global event?)
3082 %ext::player_env::MUSIC_FACE_CACHE = (); 3520 %ext::player_env::MUSIC_FACE_CACHE = ();
3096} 3534}
3097 3535
3098sub reload_archetypes { 3536sub reload_archetypes {
3099 load_resource_file "$DATADIR/archetypes" 3537 load_resource_file "$DATADIR/archetypes"
3100 or die "unable to load archetypes\n"; 3538 or die "unable to load archetypes\n";
3101 #d# NEED to laod twice to resolve forward references
3102 # this really needs to be done in an extra post-pass
3103 # (which needs to be synchronous, so solve it differently)
3104 load_resource_file "$DATADIR/archetypes"
3105 or die "unable to load archetypes\n";
3106} 3539}
3107 3540
3108sub reload_treasures { 3541sub reload_treasures {
3109 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3110 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3111} 3544}
3112 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
3113sub reload_resources { 3569sub reload_resources {
3114 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3115 3571
3572 reload_facedata;
3573 reload_sound;
3574 reload_archetypes;
3116 reload_regions; 3575 reload_regions;
3117 reload_facedata;
3118 #reload_archetypes;#d#
3119 reload_archetypes;
3120 reload_treasures; 3576 reload_treasures;
3121 3577
3122 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3123}
3124
3125sub init {
3126 reload_resources;
3127} 3579}
3128 3580
3129sub reload_config { 3581sub reload_config {
3582 trace "reloading config file...\n";
3583
3130 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3131 or return; 3585 or return;
3132 3586
3133 local $/; 3587 local $/;
3134 *CFG = YAML::Syck::Load <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3135 3589
3136 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3137 3591
3138 $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};
3139 $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};
3140 3594
3141 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
3143 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3144 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3145 }; 3599 };
3146 warn $@ if $@; 3600 warn $@ if $@;
3147 } 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;
3148} 3632}
3149 3633
3150sub 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
3151 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3152 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
3153 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#
3154 (async { 3647 (async {
3155 Event::one_event; 3648 $Coro::current->{desc} = "IDLE BUG HANDLER";
3649 EV::loop EV::LOOP_ONESHOT;
3156 })->prio (Coro::PRIO_MAX); 3650 })->prio (Coro::PRIO_MAX);
3157 }; 3651 };
3158 3652
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;
3159 reload_config; 3667 reload_config;
3160 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
3161 load_extensions; 3678 load_extensions;
3162 3679
3163 $TICK_WATCHER->start; 3680 utime time, time, $RUNTIMEFILE;
3164 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;
3165} 3698}
3166 3699
3167############################################################################# 3700#############################################################################
3168# initialisation and cleanup 3701# initialisation and cleanup
3169 3702
3170# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
3171BEGIN { 3704BEGIN {
3705 our %SIGWATCHER = ();
3172 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
3173 Event->signal ( 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3174 reentrant => 0,
3175 data => WF_AUTOCANCEL,
3176 signal => $signal,
3177 prio => 0,
3178 cb => sub {
3179 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
3180 },
3181 ); 3709 };
3182 } 3710 }
3183} 3711}
3184 3712
3185sub write_runtime { 3713sub write_runtime_sync {
3186 my $runtime = "$LOCALDIR/runtime"; 3714 my $t0 = AE::time;
3187 3715
3188 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
3189 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
3190 3718
3191 IO::AIO::aio_utime $runtime, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3192 3720
3193 my $guard = cf::lock_acquire "write_runtime"; 3721 my $guard = cf::lock_acquire "write_runtime";
3194 3722
3195 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3723 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3196 or return; 3724 or return;
3197 3725
3198 my $value = $cf::RUNTIME + 90 + 10; 3726 my $value = $cf::RUNTIME + 90 + 10;
3199 # 10 is the runtime save interval, for a monotonic clock 3727 # 10 is the runtime save interval, for a monotonic clock
3200 # 60 allows for the watchdog to kill the server. 3728 # 60 allows for the watchdog to kill the server.
3210 aio_utime $fh, undef, undef; 3738 aio_utime $fh, undef, undef;
3211 3739
3212 close $fh 3740 close $fh
3213 or return; 3741 or return;
3214 3742
3215 aio_rename "$runtime~", $runtime 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3216 and return; 3744 and return;
3217 3745
3218 warn "runtime file written.\n"; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3219 3747
3220 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 };
3221} 3799}
3222 3800
3223sub emergency_save() { 3801sub emergency_save() {
3224 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3225 3803
3226 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;
3227 3810
3228 cf::sync_job { 3811 cf::sync_job {
3812 cf::write_runtime_sync; # external watchdog should not bark
3813
3229 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3230 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3231 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3232 warn "begin emergency player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3233 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3234 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3235 $pl->valid or next; 3820 $pl->valid or next;
3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3236 $pl->save; 3822 $pl->save;
3237 } 3823 }
3238 warn "end emergency player save\n"; 3824 info "emergency_perl_save: end player save\n";
3239 3825
3240 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";
3241 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3242 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3243 $map->valid or next; 3831 $map->valid or next;
3244 $map->save; 3832 $map->save;
3245 } 3833 }
3246 warn "end emergency map save\n"; 3834 info "emergency_perl_save: end map save\n";
3247 3835
3248 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";
3249 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3250 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
3251 }; 3864 };
3252 3865
3253 warn "leave emergency perl save\n"; 3866 info "emergency_perl_save: leave\n";
3254} 3867}
3255 3868
3256sub post_cleanup { 3869sub post_cleanup {
3257 my ($make_core) = @_; 3870 my ($make_core) = @_;
3258 3871
3872 IO::AIO::flush;
3873
3259 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3260 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 }
3261} 3904}
3262 3905
3263sub do_reload_perl() { 3906sub do_reload_perl() {
3264 # can/must only be called in main 3907 # can/must only be called in main
3265 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
3266 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3267 return; 3910 return;
3268 } 3911 }
3269 3912
3913 return if $RELOAD++;
3914
3915 my $t1 = AE::time;
3916
3917 while ($RELOAD) {
3270 warn "reloading..."; 3918 info "reloading...";
3271 3919
3272 warn "entering sync_job"; 3920 trace "entering sync_job";
3273 3921
3274 cf::sync_job { 3922 cf::sync_job {
3275 cf::write_runtime; # external watchdog should not bark
3276 cf::emergency_save; 3923 cf::emergency_save;
3277 cf::write_runtime; # external watchdog should not bark
3278 3924
3279 warn "syncing database to disk";
3280 BDB::db_env_txn_checkpoint $DB_ENV;
3281
3282 # if anything goes wrong in here, we should simply crash as we already saved
3283
3284 warn "cancelling all WF_AUTOCANCEL watchers";
3285 for (Event::all_watchers) {
3286 $_->cancel if $_->data & WF_AUTOCANCEL;
3287 }
3288
3289 warn "flushing outstanding aio requests";
3290 for (;;) {
3291 BDB::flush;
3292 IO::AIO::flush;
3293 Coro::cede;
3294 last unless IO::AIO::nreqs || BDB::nreqs;
3295 warn "iterate...";
3296 }
3297
3298 ++$RELOAD;
3299
3300 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3301 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3302 %EXT_CORO = (); 3927 %EXT_CORO = ();
3303 3928
3304 warn "removing commands"; 3929 trace "removing commands";
3305 %COMMAND = (); 3930 %COMMAND = ();
3306 3931
3307 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3308 %EXTCMD = (); 3933 %EXTCMD = ();
3309 %EXTICMD = (); 3934 %EXTICMD = ();
3310 3935
3311 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3312 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3313 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3314 3939
3315 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3316 eval { 3941 eval {
3317 $cb->($pkg); 3942 $cb->($pkg);
3318 1 3943 1
3319 } 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;
3320 } 3949 }
3321 3950
3322 warn "... nuking $pkg";
3323 Symbol::delete_package $pkg;
3324 }
3325
3326 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3327 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3328 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3329 3954
3330 warn "... unloading $k"; 3955 trace "... unloading $k";
3331 delete $INC{$k}; 3956 delete $INC{$k};
3332 3957
3333 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3334 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3335 3960
3336 if (my $cb = $k->can ("unload_module")) { 3961 if (my $cb = $k->can ("unload_module")) {
3337 $cb->(); 3962 $cb->();
3963 }
3964
3965 clear_package $k;
3338 } 3966 }
3339 3967
3340 Symbol::delete_package $k;
3341 }
3342
3343 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3344 Symbol::delete_package "safe::$_" 3969 clear_package "safe::$_"
3345 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);
3346 3971
3347 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3348 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3349 delete $INC{"cf/pod.pm"}; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3350 3975
3351 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3352 # and global variables created in xs 3977 # and global variables created in xs
3353 #Symbol::delete_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3354 3979
3355 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3356 3981
3357 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3358 require cf; 3983 require cf;
3359 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3984 cf::_connect_to_perl_1;
3360 3985
3361 warn "loading config and database again"; 3986 trace "loading config and database again";
3362 cf::reload_config; 3987 cf::reload_config;
3363 3988
3364 warn "loading extensions"; 3989 trace "loading extensions";
3365 cf::load_extensions; 3990 cf::load_extensions;
3366 3991
3992 if ($REATTACH_ON_RELOAD) {
3367 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3368 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3369 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3370 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3371 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3372 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3999 }
3373 4000
4001 trace "running post_init jobs";
4002 (pop @POST_INIT)->(1) while @POST_INIT;
4003
3374 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3375 4005
3376 1 4006 1
3377 } or do { 4007 } or do {
3378 warn $@; 4008 error $@;
3379 warn "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3380 exit 1; 4010 };
4011
4012 info "reloaded";
4013 --$RELOAD;
3381 }; 4014 }
3382 4015
3383 warn "reloaded"; 4016 $t1 = AE::time - $t1;
4017 info "reload completed in ${t1}s\n";
3384}; 4018};
3385 4019
3386our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3387 4021
3388sub reload_perl() { 4022sub reload_perl() {
3389 # doing reload synchronously and two reloads happen back-to-back, 4023 # doing reload synchronously and two reloads happen back-to-back,
3390 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3391 4025
3392 $RELOAD_WATCHER ||= Event->timer ( 4026 $RELOAD_WATCHER ||= cf::async {
3393 reentrant => 0, 4027 Coro::AIO::aio_wait cache_extensions;
3394 after => 0, 4028
3395 data => WF_AUTOCANCEL, 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3396 cb => sub {
3397 do_reload_perl; 4030 do_reload_perl;
3398 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
3399 }, 4032 };
3400 ); 4033 };
3401} 4034}
3402 4035
3403register_command "reload" => sub { 4036register_command "reload" => sub {
3404 my ($who, $arg) = @_; 4037 my ($who, $arg) = @_;
3405 4038
3406 if ($who->flag (FLAG_WIZ)) { 4039 if ($who->flag (FLAG_WIZ)) {
3407 $who->message ("reloading server."); 4040 $who->message ("reloading server.");
4041 async {
4042 $Coro::current->{desc} = "perl_reload";
3408 async { reload_perl }; 4043 reload_perl;
4044 };
3409 } 4045 }
3410}; 4046};
3411 4047
3412unshift @INC, $LIBDIR; 4048#############################################################################
3413 4049
3414my $bug_warning = 0; 4050my $bug_warning = 0;
3415 4051
3416our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3417our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
3418 4054
3419sub wait_for_tick { 4055sub wait_for_tick {
3420 return unless $TICK_WATCHER->is_active;
3421 return if $Coro::current == $Coro::main; 4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3422 4057
3423 my $signal = new Coro::Signal; 4058 my $signal = new Coro::Signal;
3424 push @WAIT_FOR_TICK, $signal; 4059 push @WAIT_FOR_TICK, $signal;
3425 $signal->wait; 4060 $signal->wait;
3426} 4061}
3427 4062
3428sub wait_for_tick_begin { 4063sub wait_for_tick_begin {
3429 return unless $TICK_WATCHER->is_active;
3430 return if $Coro::current == $Coro::main; 4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3431 4065
3432 my $signal = new Coro::Signal; 4066 my $signal = new Coro::Signal;
3433 push @WAIT_FOR_TICK_BEGIN, $signal; 4067 push @WAIT_FOR_TICK_BEGIN, $signal;
3434 $signal->wait; 4068 $signal->wait;
3435} 4069}
3436 4070
3437 my $min = 1e6;#d# 4071sub tick {
3438 my $avg = 10;
3439$TICK_WATCHER = Event->timer (
3440 reentrant => 0,
3441 parked => 1,
3442 prio => 0,
3443 at => $NEXT_TICK || $TICK,
3444 data => WF_AUTOCANCEL,
3445 cb => sub {
3446 if ($Coro::current != $Coro::main) { 4072 if ($Coro::current != $Coro::main) {
3447 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"
3448 unless ++$bug_warning > 10; 4074 unless ++$bug_warning > 10;
3449 return; 4075 return;
3450 } 4076 }
3451 4077
3452 $NOW = $tick_start = Event::time;
3453
3454 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3455 4079
3456 0 && sync_job {#d# 4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3457 for(1..10) {
3458 my $t = Event::time;
3459 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3460 or die;
3461 4081
3462 $map->width (50); 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3463 $map->height (50); 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3464 $map->alloc; 4084 Coro::async_pool {
3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work 4085 $Coro::current->{desc} = "runtime saver";
3466 my $t = Event::time - $t; 4086 write_runtime_sync
3467 4087 or error "ERROR: unable to write runtime file: $!";
3468 #next unless $t < 0.0013;#d#
3469 if ($t < $min) {
3470 $min = $t;
3471 }
3472 $avg = $avg * 0.99 + $t * 0.01;
3473 }
3474 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3475 exit 0;
3476 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3477 }; 4088 };
4089 }
3478 4090
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool {
3485 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 }
3489
3490# my $AFTER = Event::time;
3491# warn $AFTER - $NOW;#d#
3492
3493 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3494 $sig->send; 4092 $sig->send;
3495 } 4093 }
3496 while (my $sig = shift @WAIT_FOR_TICK) { 4094 while (my $sig = shift @WAIT_FOR_TICK) {
3497 $sig->send; 4095 $sig->send;
3498 } 4096 }
3499 4097
3500 $NOW = Event::time; 4098 $LOAD = ($NOW - $TICK_START) / $TICK;
3501
3502 # if we are delayed by four ticks or more, skip them all
3503 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3504
3505 $TICK_WATCHER->at ($NEXT_TICK);
3506 $TICK_WATCHER->start;
3507
3508 $LOAD = ($NOW - $tick_start) / $TICK;
3509 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4099 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3510 4100
3511 _post_tick; 4101 if (0) {
3512 4102 if ($NEXT_TICK) {
3513 4103 my $jitter = $TICK_START - $NEXT_TICK;
4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4105 debug "jitter $JITTER\n";#d#
4106 }
3514 }, 4107 }
3515); 4108}
3516 4109
3517{ 4110{
3518 BDB::max_poll_time $TICK * 0.1; 4111 # configure BDB
3519 $BDB_POLL_WATCHER = Event->io ( 4112
3520 reentrant => 0,
3521 fd => BDB::poll_fileno,
3522 poll => 'r',
3523 prio => 0,
3524 data => WF_AUTOCANCEL,
3525 cb => \&BDB::poll_cb,
3526 );
3527 BDB::min_parallel 8; 4113 BDB::min_parallel 16;
3528 4114 BDB::max_poll_reqs $TICK * 0.1;
3529 BDB::set_sync_prepare { 4115 $AnyEvent::BDB::WATCHER->priority (1);
3530 my $status;
3531 my $current = $Coro::current;
3532 (
3533 sub {
3534 $status = $!;
3535 $current->ready; undef $current;
3536 },
3537 sub {
3538 Coro::schedule while defined $current;
3539 $! = $status;
3540 },
3541 )
3542 };
3543 4116
3544 unless ($DB_ENV) { 4117 unless ($DB_ENV) {
3545 $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);
3546 4124
3547 cf::sync_job { 4125 cf::sync_job {
3548 eval { 4126 eval {
3549 BDB::db_env_open 4127 BDB::db_env_open
3550 $DB_ENV, 4128 $DB_ENV,
3552 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
3553 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4131 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3554 0666; 4132 0666;
3555 4133
3556 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4134 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3557
3558 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3559 $DB_ENV->set_lk_detect;
3560 }; 4135 };
3561 4136
3562 cf::cleanup "db_env_open(db): $@" if $@; 4137 cf::cleanup "db_env_open(db): $@" if $@;
3563 }; 4138 };
3564 } 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 };
3565} 4150}
3566 4151
3567{ 4152{
4153 # configure IO::AIO
4154
3568 IO::AIO::min_parallel 8; 4155 IO::AIO::min_parallel 8;
3569
3570 undef $Coro::AIO::WATCHER;
3571 IO::AIO::max_poll_time $TICK * 0.1; 4156 IO::AIO::max_poll_time $TICK * 0.1;
3572 $AIO_POLL_WATCHER = Event->io ( 4157 undef $AnyEvent::AIO::WATCHER;
3573 reentrant => 0,
3574 data => WF_AUTOCANCEL,
3575 fd => IO::AIO::poll_fileno,
3576 poll => 'r',
3577 prio => 6,
3578 cb => \&IO::AIO::poll_cb,
3579 );
3580} 4158}
3581 4159
3582my $_log_backtrace; 4160my $_log_backtrace;
3583 4161
3584sub _log_backtrace { 4162sub _log_backtrace {
3587 $msg =~ s/\n//; 4165 $msg =~ s/\n//;
3588 4166
3589 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
3590 if ($_log_backtrace < 2) { 4168 if ($_log_backtrace < 2) {
3591 ++$_log_backtrace; 4169 ++$_log_backtrace;
4170 my $perl_bt = Carp::longmess $msg;
3592 async { 4171 async {
4172 $Coro::current->{desc} = "abt $msg";
4173
3593 my @bt = fork_call { 4174 my @bt = fork_call {
3594 @addr = map { sprintf "%x", $_ } @addr; 4175 @addr = map { sprintf "%x", $_ } @addr;
3595 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4176 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3596 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 |"
3597 or die "addr2line: $!"; 4178 or die "addr2line: $!";
3605 } 4186 }
3606 4187
3607 @funcs 4188 @funcs
3608 }; 4189 };
3609 4190
3610 LOG llevInfo, "[ABT] $msg\n"; 4191 LOG llevInfo, "[ABT] $perl_bt\n";
4192 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3611 LOG llevInfo, "[ABT] $_\n" for @bt; 4193 LOG llevInfo, "[ABT] $_\n" for @bt;
3612 --$_log_backtrace; 4194 --$_log_backtrace;
3613 }; 4195 };
3614 } else { 4196 } else {
3615 LOG llevInfo, "[ABT] $msg\n"; 4197 LOG llevInfo, "[ABT] $msg\n";
3616 LOG llevInfo, "[ABT] [suppressed]\n"; 4198 LOG llevInfo, "[ABT] [suppressed]\n";
3617 } 4199 }
3618} 4200}
3619 4201
3620# load additional modules 4202# load additional modules
3621use cf::pod; 4203require "cf/$_.pm" for @EXTRA_MODULES;
4204cf::_connect_to_perl_2;
3622 4205
3623END { cf::emergency_save } 4206END { cf::emergency_save }
3624 4207
36251 42081
3626 4209

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines