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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines