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.329 by root, Fri Aug 10 05:38:16 2007 UTC vs.
Revision 1.533 by root, Thu Apr 29 07:59:17 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines