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.247 by root, Tue Apr 17 18:24:30 2007 UTC vs.
Revision 1.378 by root, Thu Oct 4 11:36:54 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.61 (); 15use Coro 3.64 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
21use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
22 25
26use JSON::XS ();
23use BDB (); 27use BDB ();
24use Data::Dumper; 28use Data::Dumper;
25use Digest::MD5; 29use Digest::MD5;
26use Fcntl; 30use Fcntl;
27use YAML::Syck (); 31use YAML::Syck ();
28use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
29use Time::HiRes; 33use Time::HiRes;
30use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
31 36
32# configure various modules to our taste 37# configure various modules to our taste
33# 38#
34$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
47our %COMMAND = (); 52our %COMMAND = ();
48our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
49 54
50our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
51our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
52our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
54 60
55our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
56our @EVENT; 62our @EVENT;
57our $LIBDIR = datadir . "/ext"; 63
64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
58 75
59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 77our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63our $NEXT_TICK; 80our $NEXT_TICK;
64our $NOW; 81our $NOW;
65our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
66 83
67our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
68our $DB_ENV; 88our $DB_ENV;
69 89
70our %CFG; 90our %CFG;
71 91
72our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
73our $RUNTIME; 93our $RUNTIME;
74 94
75our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
76our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
77our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80 98
81# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
83 101
102our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing
104our $tick_start; # for load detecting purposes
105
84binmode STDOUT; 106binmode STDOUT;
85binmode STDERR; 107binmode STDERR;
86 108
87# read virtual server time, if available 109# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 110unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 111 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 112 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 113 $RUNTIME = <$fh> + 0.;
92} 114}
93 115
94mkdir cf::localdir; 116mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
96mkdir cf::localdir . "/" . cf::tmpdir;
97mkdir cf::localdir . "/" . cf::uniquedir;
98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
100 118
101our $EMERGENCY_POSITION; 119our $EMERGENCY_POSITION;
102 120
103sub cf::map::normalise; 121sub cf::map::normalise;
104 122
… …
115=item $cf::RUNTIME 133=item $cf::RUNTIME
116 134
117The time this server has run, starts at 0 and is increased by $cf::TICK on 135The time this server has run, starts at 0 and is increased by $cf::TICK on
118every server tick. 136every server tick.
119 137
120=item $cf::LIBDIR 138=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
139$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
140$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
121 141
122The perl library directory, where extensions and cf-specific modules can 142Various directories - "/etc", read-only install directory, perl-library
123be found. It will be added to C<@INC> automatically. 143directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
144unique-items directory, player file directory, random maps directory and
145database environment.
124 146
125=item $cf::NOW 147=item $cf::NOW
126 148
127The time of the last (current) server tick. 149The time of the last (current) server tick.
128 150
129=item $cf::TICK 151=item $cf::TICK
130 152
131The interval between server ticks, in seconds. 153The interval between server ticks, in seconds.
154
155=item $cf::LOADAVG
156
157The current CPU load on the server (alpha-smoothed), as a value between 0
158(none) and 1 (overloaded), indicating how much time is spent on processing
159objects per tick. Healthy values are < 0.5.
160
161=item $cf::LOAD
162
163The raw value load value from the last tick.
132 164
133=item %cf::CFG 165=item %cf::CFG
134 166
135Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/crossfire/config>, or
136from wherever your confdir points to. 168from wherever your confdir points to.
… …
139 171
140These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
141returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
142per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
143 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
144=back 182=back
145 183
146=cut 184=cut
147 185
148BEGIN { 186BEGIN {
149 *CORE::GLOBAL::warn = sub { 187 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 188 my $msg = join "", @_;
151 utf8::encode $msg;
152 189
153 $msg .= "\n" 190 $msg .= "\n"
154 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
192
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
155 194
156 LOG llevError, $msg; 195 LOG llevError, $msg;
157 }; 196 };
158} 197}
159 198
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
161@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
162@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
163@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
164@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 203@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
204@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
165@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 205@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
166 206
167# we bless all objects into (empty) derived classes to force a method lookup 207# we bless all objects into (empty) derived classes to force a method lookup
168# within the Safe compartment. 208# within the Safe compartment.
169for my $pkg (qw( 209for my $pkg (qw(
170 cf::global cf::attachable 210 cf::global cf::attachable
… …
178} 218}
179 219
180$Event::DIED = sub { 220$Event::DIED = sub {
181 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
182}; 222};
223
224#############################################################################
183 225
184=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
185 227
186=over 4 228=over 4
187 229
… …
206 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
207 $d 249 $d
208 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
209} 251}
210 252
211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
212
213=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
214 254
215Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
216 256
217=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
218 258
219Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
220 267
221=item cf::lock_wait $string 268=item cf::lock_wait $string
222 269
223Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
224 271
… …
227Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
228a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
229for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
230returned. 277returned.
231 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
232Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
233uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
234 284
285=item $locked = cf::lock_active $string
286
287Return true if the lock is currently active, i.e. somebody has locked it.
288
235=cut 289=cut
236 290
237our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
238 293
239sub lock_wait($) { 294sub lock_wait($) {
240 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
241 301
242 # wait for lock, if any 302 # wait for lock, if any
243 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
244 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
245 Coro::schedule; 305 Coro::schedule;
… …
251 311
252 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
253 lock_wait $key; 313 lock_wait $key;
254 314
255 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
256 317
257 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
258 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
260 } 322 }
323}
324
325sub lock_active($) {
326 my ($key) = @_;
327
328 ! ! $LOCK{$key}
261} 329}
262 330
263sub freeze_mainloop { 331sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 332 return unless $TICK_WATCHER->is_active;
265 333
… …
268 }; 336 };
269 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
270 $guard 338 $guard
271} 339}
272 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
273=item cf::async { BLOCK } 399=item cf::async { BLOCK }
274 400
275Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
276C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
277thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
… …
280 406
281BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
282 408
283=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
284 410
285The design of crossfire+ requires that the main coro ($Coro::main) is 411The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 412is always able to handle events or runnable, as Crossfire TRT is only
287reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable.
288 415
289If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
290the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 418server will be frozen during this time, so the block should either finish
292fast or be very important. 419fast or be very important.
… …
295 422
296sub sync_job(&) { 423sub sync_job(&) {
297 my ($job) = @_; 424 my ($job) = @_;
298 425
299 if ($Coro::current == $Coro::main) { 426 if ($Coro::current == $Coro::main) {
427 my $time = Event::time;
428
300 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
302 431
303 # TODO: use suspend/resume instead 432 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 433 # (but this is cancel-safe)
… …
306 435
307 my $busy = 1; 436 my $busy = 1;
308 my @res; 437 my @res;
309 438
310 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
311 @res = eval { $job->() }; 441 @res = eval { $job->() };
312 warn $@ if $@; 442 warn $@ if $@;
313 undef $busy; 443 undef $busy;
314 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
315 445
316 while ($busy) { 446 while ($busy) {
317 Coro::cede or Event::one_event; 447 Coro::cede or Event::one_event;
318 } 448 }
449
450 $time = Event::time - $time;
451
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load
319 456
320 wantarray ? @res : $res[0] 457 wantarray ? @res : $res[0]
321 } else { 458 } else {
322 # we are in another coroutine, how wonderful, everything just works 459 # we are in another coroutine, how wonderful, everything just works
323 460
… …
343 $EXT_CORO{$coro+0} = $coro; 480 $EXT_CORO{$coro+0} = $coro;
344 481
345 $coro 482 $coro
346} 483}
347 484
348sub write_runtime { 485=item fork_call { }, $args
349 my $guard = cf::lock_acquire "write_runtime";
350 486
351 my $runtime = cf::localdir . "/runtime"; 487Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling.
352 491
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 492=cut
354 or return;
355 493
356 my $value = $cf::RUNTIME + 90 + 10; 494sub fork_call(&@) {
357 # 10 is the runtime save interval, for a monotonic clock 495 my ($cb, @args) = @_;
358 # 60 allows for the watchdog to kill the server.
359 496
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 497 # we seemingly have to make a local copy of the whole thing,
361 and return; 498 # otherwise perl prematurely frees the stuff :/
499 # TODO: investigate and fix (likely this will be rather laborious)
362 500
363 # always fsync - this file is important 501 my @res = Coro::Util::fork_eval {
364 aio_fsync $fh 502 reset_signals;
365 and return; 503 &$cb
504 }, @args;
366 505
367 close $fh 506 wantarray ? @res : $res[-1]
368 or return; 507}
369 508
370 aio_rename "$runtime~", $runtime 509=item $value = cf::db_get $family => $key
371 and return;
372 510
511Returns a single value from the environment database.
512
513=item cf::db_put $family => $key => $value
514
515Stores the given C<$value> in the family. It can currently store binary
516data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
517
518=item $db = cf::db_table "name"
519
520Create and/or open a new database table. The string must not be "db" and must be unique
521within each server.
522
523=cut
524
525sub db_table($) {
526 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV;
528
529 eval {
530 $db->set_flags (BDB::CHKSUM);
531
532 utf8::encode $name;
533 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
534 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
535 cf::cleanup "db_open(db): $!" if $!;
536 };
537 cf::cleanup "db_open(db): $@" if $@;
538
539 $db
540}
541
542our $DB;
543
544sub db_init {
545 cf::sync_job {
546 $DB ||= db_table "db";
547 };
548}
549
550sub db_get($$) {
551 my $key = "$_[0]/$_[1]";
552
553 cf::sync_job {
554 BDB::db_get $DB, undef, $key, my $data;
555
556 $! ? ()
557 : $data
373 1 558 }
559}
560
561sub db_put($$$) {
562 BDB::dbreq_pri 4;
563 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
564}
565
566=item cf::cache $id => [$paths...], $processversion => $process
567
568Generic caching function that returns the value of the resource $id,
569caching and regenerating as required.
570
571This function can block.
572
573=cut
574
575sub cache {
576 my ($id, $src, $processversion, $process) = @_;
577
578 my $meta =
579 join "\x00",
580 $processversion,
581 map {
582 aio_stat $_
583 and Carp::croak "$_: $!";
584
585 ($_, (stat _)[7,9])
586 } @$src;
587
588 my $dbmeta = db_get cache => "$id/meta";
589 if ($dbmeta ne $meta) {
590 # changed, we may need to process
591
592 my @data;
593 my $md5;
594
595 for (0 .. $#$src) {
596 0 <= aio_load $src->[$_], $data[$_]
597 or Carp::croak "$src->[$_]: $!";
598 }
599
600 # if processing is expensive, check
601 # checksum first
602 if (1) {
603 $md5 =
604 join "\x00",
605 $processversion,
606 map {
607 cf::cede_to_tick;
608 ($src->[$_], Digest::MD5::md5_hex $data[$_])
609 } 0.. $#$src;
610
611
612 my $dbmd5 = db_get cache => "$id/md5";
613 if ($dbmd5 eq $md5) {
614 db_put cache => "$id/meta", $meta;
615
616 return db_get cache => "$id/data";
617 }
618 }
619
620 my $t1 = Time::HiRes::time;
621 my $data = $process->(\@data);
622 my $t2 = Time::HiRes::time;
623
624 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
625
626 db_put cache => "$id/data", $data;
627 db_put cache => "$id/md5" , $md5;
628 db_put cache => "$id/meta", $meta;
629
630 return $data;
631 }
632
633 db_get cache => "$id/data"
374} 634}
375 635
376=item cf::datalog type => key => value, ... 636=item cf::datalog type => key => value, ...
377 637
378Log a datalog packet of the given type with the given key-value pairs. 638Log a datalog packet of the given type with the given key-value pairs.
… …
396attach callbacks/event handlers (a collection of which is called an "attachment") 656attach callbacks/event handlers (a collection of which is called an "attachment")
397to it. All such attachable objects support the following methods. 657to it. All such attachable objects support the following methods.
398 658
399In the following description, CLASS can be any of C<global>, C<object> 659In the following description, CLASS can be any of C<global>, C<object>
400C<player>, C<client> or C<map> (i.e. the attachable objects in 660C<player>, C<client> or C<map> (i.e. the attachable objects in
401crossfire+). 661Crossfire TRT).
402 662
403=over 4 663=over 4
404 664
405=item $attachable->attach ($attachment, key => $value...) 665=item $attachable->attach ($attachment, key => $value...)
406 666
… …
569 $registry = $CB_TYPE[$object_type] ||= []; 829 $registry = $CB_TYPE[$object_type] ||= [];
570 830
571 } elsif ($type eq "subtype") { 831 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 832 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 833 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 834 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 835
576 } elsif ($type eq "package") { 836 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 837 my $pkg = shift @arg;
578 838
579 while (my ($name, $id) = each %cb_id) { 839 while (my ($name, $id) = each %cb_id) {
… …
608 _attach $registry, $klass, @attach; 868 _attach $registry, $klass, @attach;
609 } 869 }
610 870
611 $obj->{$name} = \%arg; 871 $obj->{$name} = \%arg;
612 } else { 872 } else {
613 warn "object uses attachment '$name' that is not available, postponing.\n"; 873 warn "object uses attachment '$name' which is not available, postponing.\n";
614 } 874 }
615 875
616 $obj->{_attachment}{$name} = undef; 876 $obj->{_attachment}{$name} = undef;
617} 877}
618 878
… …
620 if (ref $_[0]) { 880 if (ref $_[0]) {
621 _object_attach @_; 881 _object_attach @_;
622 } else { 882 } else {
623 _attach shift->_attach_registry, @_; 883 _attach shift->_attach_registry, @_;
624 } 884 }
885 _recalc_want;
625}; 886};
626 887
627# all those should be optimised 888# all those should be optimised
628sub cf::attachable::detach { 889sub cf::attachable::detach {
629 my ($obj, $name) = @_; 890 my ($obj, $name) = @_;
… …
632 delete $obj->{_attachment}{$name}; 893 delete $obj->{_attachment}{$name};
633 reattach ($obj); 894 reattach ($obj);
634 } else { 895 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 896 Carp::croak "cannot, currently, detach class attachments";
636 } 897 }
898 _recalc_want;
637}; 899};
638 900
639sub cf::attachable::attached { 901sub cf::attachable::attached {
640 my ($obj, $name) = @_; 902 my ($obj, $name) = @_;
641 903
… …
656 "; 918 ";
657 die if $@; 919 die if $@;
658} 920}
659 921
660our $override; 922our $override;
661our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 923our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
662 924
663sub override { 925sub override {
664 $override = 1; 926 $override = 1;
665 @invoke_results = (); 927 @INVOKE_RESULTS = (@_);
666} 928}
667 929
668sub do_invoke { 930sub do_invoke {
669 my $event = shift; 931 my $event = shift;
670 my $callbacks = shift; 932 my $callbacks = shift;
671 933
672 @invoke_results = (); 934 @INVOKE_RESULTS = ();
673 935
674 local $override; 936 local $override;
675 937
676 for (@$callbacks) { 938 for (@$callbacks) {
677 eval { &{$_->[1]} }; 939 eval { &{$_->[1]} };
… …
694 956
695Generate an object-specific event with the given arguments. 957Generate an object-specific event with the given arguments.
696 958
697This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 959This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
698removed in future versions), and there is no public API to access override 960removed in future versions), and there is no public API to access override
699results (if you must, access C<@cf::invoke_results> directly). 961results (if you must, access C<@cf::INVOKE_RESULTS> directly).
700 962
701=back 963=back
702 964
703=cut 965=cut
704 966
705############################################################################# 967#############################################################################
706# object support 968# object support
969#
970
971sub _can_merge {
972 my ($ob1, $ob2) = @_;
973
974 local $Storable::canonical = 1;
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977
978 $fob1 eq $fob2
979}
707 980
708sub reattach { 981sub reattach {
709 # basically do the same as instantiate, without calling instantiate 982 # basically do the same as instantiate, without calling instantiate
710 my ($obj) = @_; 983 my ($obj) = @_;
711 984
… …
758sub object_freezer_save { 1031sub object_freezer_save {
759 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
760 1033
761 sync_job { 1034 sync_job {
762 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
763 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
764 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
765 1039
766 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
767 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
768 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
769 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
… …
788 } 1062 }
789 } else { 1063 } else {
790 aio_unlink $filename; 1064 aio_unlink $filename;
791 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
792 } 1066 }
793 } 1067 };
794} 1068}
795 1069
796sub object_freezer_as_string { 1070sub object_freezer_as_string {
797 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
798 1072
… …
810 or return; 1084 or return;
811 1085
812 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
813 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
814 or return; 1088 or return;
1089
815 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
816 } 1091 }
817 1092
1093 utf8::decode (my $decname = $filename);
818 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 1095 $decname, length $data, scalar @{$av || []};
1096
820 return ($data, $av); 1097 ($data, $av)
821} 1098}
1099
1100=head2 COMMAND CALLBACKS
1101
1102=over 4
1103
1104=cut
822 1105
823############################################################################# 1106#############################################################################
824# command handling &c 1107# command handling &c
825 1108
826=item cf::register_command $name => \&callback($ob,$args); 1109=item cf::register_command $name => \&callback($ob,$args);
… …
839 push @{ $COMMAND{$name} }, [$caller, $cb]; 1122 push @{ $COMMAND{$name} }, [$caller, $cb];
840} 1123}
841 1124
842=item cf::register_extcmd $name => \&callback($pl,$packet); 1125=item cf::register_extcmd $name => \&callback($pl,$packet);
843 1126
844Register a callbackf ro execution when the client sends an extcmd packet. 1127Register a callback for execution when the client sends an (synchronous)
1128extcmd packet. Ext commands will be processed in the order they are
1129received by the server, like other user commands. The first argument is
1130the logged-in player. Ext commands can only be processed after a player
1131has logged in successfully.
845 1132
846If the callback returns something, it is sent back as if reply was being 1133If the callback returns something, it is sent back as if reply was being
847called. 1134called.
848 1135
1136=item cf::register_exticmd $name => \&callback($ns,$packet);
1137
1138Register a callback for execution when the client sends an (asynchronous)
1139exticmd packet. Exti commands are processed by the server as soon as they
1140are received, i.e. out of order w.r.t. other commands. The first argument
1141is a client socket. Exti commands can be received anytime, even before
1142log-in.
1143
1144If the callback returns something, it is sent back as if reply was being
1145called.
1146
849=cut 1147=cut
850 1148
851sub register_extcmd { 1149sub register_extcmd {
852 my ($name, $cb) = @_; 1150 my ($name, $cb) = @_;
853 1151
854 $EXTCMD{$name} = $cb; 1152 $EXTCMD{$name} = $cb;
1153}
1154
1155sub register_exticmd {
1156 my ($name, $cb) = @_;
1157
1158 $EXTICMD{$name} = $cb;
855} 1159}
856 1160
857cf::player->attach ( 1161cf::player->attach (
858 on_command => sub { 1162 on_command => sub {
859 my ($pl, $name, $params) = @_; 1163 my ($pl, $name, $params) = @_;
… …
868 cf::override; 1172 cf::override;
869 }, 1173 },
870 on_extcmd => sub { 1174 on_extcmd => sub {
871 my ($pl, $buf) = @_; 1175 my ($pl, $buf) = @_;
872 1176
873 my $msg = eval { from_json $buf }; 1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
874 1178
875 if (ref $msg) { 1179 if (ref $msg) {
1180 my ($type, $reply, @payload) =
1181 "ARRAY" eq ref $msg
1182 ? @$msg
1183 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1184
1185 my @reply;
1186
876 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1187 if (my $cb = $EXTCMD{$type}) {
877 if (my %reply = $cb->($pl, $msg)) { 1188 @reply = $cb->($pl, @payload);
878 $pl->ext_reply ($msg->{msgid}, %reply);
879 }
880 } 1189 }
1190
1191 $pl->ext_reply ($reply, @reply)
1192 if $reply;
1193
881 } else { 1194 } else {
882 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
883 } 1196 }
884 1197
885 cf::override; 1198 cf::override;
886 }, 1199 },
887); 1200);
888 1201
889sub load_extension {
890 my ($path) = @_;
891
892 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
893 my $base = $1;
894 my $pkg = $1;
895 $pkg =~ s/[^[:word:]]/_/g;
896 $pkg = "ext::$pkg";
897
898 warn "... loading '$path' into '$pkg'\n";
899
900 open my $fh, "<:utf8", $path
901 or die "$path: $!";
902
903 my $source =
904 "package $pkg; use strict; use utf8;\n"
905 . "#line 1 \"$path\"\n{\n"
906 . (do { local $/; <$fh> })
907 . "\n};\n1";
908
909 unless (eval $source) {
910 my $msg = $@ ? "$path: $@\n"
911 : "extension disabled.\n";
912 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
913 warn $@;
914 warn "mandatory extension failed to load, exiting.\n";
915 exit 1;
916 }
917 die $@;
918 }
919
920 push @EXTS, $pkg;
921}
922
923sub load_extensions { 1202sub load_extensions {
1203 cf::sync_job {
1204 my %todo;
1205
924 for my $ext (<$LIBDIR/*.ext>) { 1206 for my $path (<$LIBDIR/*.ext>) {
925 next unless -r $ext; 1207 next unless -r $path;
926 eval { 1208
927 load_extension $ext; 1209 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1210 my $base = $1;
1211 my $pkg = $1;
1212 $pkg =~ s/[^[:word:]]/_/g;
1213 $pkg = "ext::$pkg";
1214
1215 open my $fh, "<:utf8", $path
1216 or die "$path: $!";
1217
1218 my $source = do { local $/; <$fh> };
1219
1220 my %ext = (
1221 path => $path,
1222 base => $base,
1223 pkg => $pkg,
1224 );
1225
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228
1229 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n"
1231 . "#line 1 \"$path\"\n{\n"
1232 . $source
1233 . "\n};\n1";
1234
1235 $todo{$base} = \%ext;
1236 }
1237
1238 my %done;
1239 while (%todo) {
1240 my $progress;
1241
1242 while (my ($k, $v) = each %todo) {
1243 for (split /,\s*/, $v->{meta}{depends}) {
1244 goto skip
1245 unless exists $done{$_};
1246 }
1247
1248 warn "... loading '$k' into '$v->{pkg}'\n";
1249
1250 unless (eval $v->{source}) {
1251 my $msg = $@ ? "$v->{path}: $@\n"
1252 : "$v->{base}: extension inactive.\n";
1253
1254 if (exists $v->{meta}{mandatory}) {
1255 warn $msg;
1256 warn "mandatory extension failed to load, exiting.\n";
1257 exit 1;
1258 }
1259
1260 warn $msg;
1261 }
1262
1263 $done{$k} = delete $todo{$k};
1264 push @EXTS, $v->{pkg};
1265 $progress = 1;
928 1 1266 }
929 } or warn "$ext not loaded: $@"; 1267
1268 skip:
1269 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1270 unless $progress;
1271 }
930 } 1272 };
931} 1273}
932 1274
933############################################################################# 1275#############################################################################
934 1276
1277=back
1278
935=head2 CORE EXTENSIONS 1279=head2 CORE EXTENSIONS
936 1280
937Functions and methods that extend core crossfire objects. 1281Functions and methods that extend core crossfire objects.
938 1282
939=cut 1283=cut
… …
944 1288
945=head3 cf::player 1289=head3 cf::player
946 1290
947=over 4 1291=over 4
948 1292
1293=item cf::player::num_playing
1294
1295Returns the official number of playing players, as per the Crossfire metaserver rules.
1296
1297=cut
1298
1299sub num_playing {
1300 scalar grep
1301 $_->ob->map
1302 && !$_->hidden
1303 && !$_->ob->flag (cf::FLAG_WIZ),
1304 cf::player::list
1305}
1306
949=item cf::player::find $login 1307=item cf::player::find $login
950 1308
951Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
952 1310
953=cut 1311=cut
954 1312
955sub playerdir($) { 1313sub playerdir($) {
956 cf::localdir 1314 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1315 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1316}
962 1317
963sub path($) { 1318sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1319 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
991 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1346 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
992 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1347 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
993 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1348 aio_unlink +(playerdir $login) . "/$login.pl.pst";
994 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
995 1350
996 my $pl = load_pl path $login 1351 my $f = new_from_file cf::object::thawer path $login
997 or return; 1352 or return;
1353
1354 my $pl = cf::player::load_pl $f
1355 or return;
1356 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs;
998 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
999 } 1359 }
1000 } 1360 }
1001} 1361}
1002 1362
… …
1012 1372
1013 aio_mkdir playerdir $pl, 0770; 1373 aio_mkdir playerdir $pl, 0770;
1014 $pl->{last_save} = $cf::RUNTIME; 1374 $pl->{last_save} = $cf::RUNTIME;
1015 1375
1016 $pl->save_pl ($path); 1376 $pl->save_pl ($path);
1017 Coro::cede; 1377 cf::cede_to_tick;
1018} 1378}
1019 1379
1020sub new($) { 1380sub new($) {
1021 my ($login) = @_; 1381 my ($login) = @_;
1022 1382
… …
1026 $self->{deny_save} = 1; 1386 $self->{deny_save} = 1;
1027 1387
1028 $cf::PLAYER{$login} = $self; 1388 $cf::PLAYER{$login} = $self;
1029 1389
1030 $self 1390 $self
1391}
1392
1393=item $player->send_msg ($channel, $msg, $color, [extra...])
1394
1395=cut
1396
1397sub send_msg {
1398 my $ns = shift->ns
1399 or return;
1400 $ns->send_msg (@_);
1031} 1401}
1032 1402
1033=item $pl->quit_character 1403=item $pl->quit_character
1034 1404
1035Nukes the player without looking back. If logged in, the connection will 1405Nukes the player without looking back. If logged in, the connection will
… …
1084while and may block, so not sync_job-capable, ever. 1454while and may block, so not sync_job-capable, ever.
1085 1455
1086=cut 1456=cut
1087 1457
1088sub list_logins { 1458sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1459 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1460 or return [];
1091 1461
1092 my @logins; 1462 my @logins;
1093 1463
1094 for my $login (@$dirs) { 1464 for my $login (@$dirs) {
1465 my $path = path $login;
1466
1467 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") {
1095 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1096 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1097 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1098 1473
1099 utf8::decode $login; 1474 utf8::decode $login;
1100 push @logins, $login; 1475 push @logins, $login;
1101 } 1476 }
1102 1477
… …
1129 } 1504 }
1130 1505
1131 \@paths 1506 \@paths
1132} 1507}
1133 1508
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1510
1511Expand crossfire pod fragments into protocol xml.
1512
1513=cut
1514
1515sub expand_cfpod {
1516 ((my $self), (local $_)) = @_;
1517
1518 # escape & and <
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521
1522 # this is buggy, it needs to properly take care of nested <'s
1523
1524 1 while
1525 # replace B<>, I<>, U<> etc.
1526 s/B<([^\>]*)>/<b>$1<\/b>/
1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1530 # replace G<male|female> tags
1531 || s{G<([^>|]*)\|([^>]*)>}{
1532 $self->gender ? $2 : $1
1533 }ge
1534 # replace H<hint text>
1535 || s{H<([^\>]*)>}
1536 {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "")
1540 [$self->{hintmode}]
1541 }ge;
1542
1543 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553}
1554
1555sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode}
1558}
1559
1134=item $player->ext_reply ($msgid, %msg) 1560=item $player->ext_reply ($msgid, @msg)
1135 1561
1136Sends an ext reply to the player. 1562Sends an ext reply to the player.
1137 1563
1138=cut 1564=cut
1139 1565
1140sub ext_reply($$%) { 1566sub ext_reply($$@) {
1141 my ($self, $id, %msg) = @_; 1567 my ($self, $id, @msg) = @_;
1142 1568
1143 $msg{msgid} = $id; 1569 $self->ns->ext_reply ($id, @msg)
1144
1145 $self->send ("ext " . cf::to_json \%msg);
1146} 1570}
1147 1571
1148=item $player->ext_event ($type, %msg) 1572=item $player->ext_msg ($type, @msg)
1149 1573
1150Sends an ext event to the client. 1574Sends an ext event to the client.
1151 1575
1152=cut 1576=cut
1153 1577
1154sub ext_event($$%) { 1578sub ext_msg($$@) {
1155 my ($self, $type, %msg) = @_; 1579 my ($self, $type, @msg) = @_;
1156 1580
1157 $self->ns->ext_event ($type, %msg); 1581 $self->ns->ext_msg ($type, @msg);
1158} 1582}
1159 1583
1160=head3 cf::region 1584=head3 cf::region
1161 1585
1162=over 4 1586=over 4
… …
1165 1589
1166package cf::region; 1590package cf::region;
1167 1591
1168=item cf::region::find_by_path $path 1592=item cf::region::find_by_path $path
1169 1593
1170Tries to decuce the probable region for a map knowing only its path. 1594Tries to decuce the likely region for a map knowing only its path.
1171 1595
1172=cut 1596=cut
1173 1597
1174sub find_by_path($) { 1598sub find_by_path($) {
1175 my ($path) = @_; 1599 my ($path) = @_;
1176 1600
1177 my ($match, $specificity); 1601 my ($match, $specificity);
1178 1602
1179 for my $region (list) { 1603 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) { 1604 if ($region->{match} && $path =~ $region->{match}) {
1181 ($match, $specificity) = ($region, $region->specificity) 1605 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity; 1606 if $region->specificity > $specificity;
1183 } 1607 }
1184 } 1608 }
1185 1609
… …
1249 my ($self, $merge) = @_; 1673 my ($self, $merge) = @_;
1250 1674
1251 # we have to keep some variables in memory intact 1675 # we have to keep some variables in memory intact
1252 local $self->{path}; 1676 local $self->{path};
1253 local $self->{load_path}; 1677 local $self->{load_path};
1254 local $self->{deny_save};
1255 local $self->{deny_reset};
1256 1678
1257 $self->SUPER::thawer_merge ($merge); 1679 $self->SUPER::thawer_merge ($merge);
1258} 1680}
1259 1681
1260sub normalise { 1682sub normalise {
… …
1307 $self->init; # pass $1 etc. 1729 $self->init; # pass $1 etc.
1308 return $self; 1730 return $self;
1309 } 1731 }
1310 } 1732 }
1311 1733
1312 Carp::carp "unable to resolve path '$path' (base '$base')."; 1734 Carp::cluck "unable to resolve path '$path' (base '$base').";
1313 () 1735 ()
1314} 1736}
1315 1737
1316sub init { 1738sub init {
1317 my ($self) = @_; 1739 my ($self) = @_;
… …
1332 1754
1333# the original (read-only) location 1755# the original (read-only) location
1334sub load_path { 1756sub load_path {
1335 my ($self) = @_; 1757 my ($self) = @_;
1336 1758
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1759 "$MAPDIR/$self->{path}.map"
1338} 1760}
1339 1761
1340# the temporary/swap location 1762# the temporary/swap location
1341sub save_path { 1763sub save_path {
1342 my ($self) = @_; 1764 my ($self) = @_;
1343 1765
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1767 "$TMPDIR/$path.map"
1346} 1768}
1347 1769
1348# the unique path, undef == no special unique path 1770# the unique path, undef == no special unique path
1349sub uniq_path { 1771sub uniq_path {
1350 my ($self) = @_; 1772 my ($self) = @_;
1351 1773
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1775 "$UNIQUEDIR/$path"
1354} 1776}
1355 1777
1356# and all this just because we cannot iterate over 1778# and all this just because we cannot iterate over
1357# all maps in C++... 1779# all maps in C++...
1358sub change_all_map_light { 1780sub change_all_map_light {
… …
1360 1782
1361 $_->change_map_light ($change) 1783 $_->change_map_light ($change)
1362 for grep $_->outdoor, values %cf::MAP; 1784 for grep $_->outdoor, values %cf::MAP;
1363} 1785}
1364 1786
1787sub decay_objects {
1788 my ($self) = @_;
1789
1790 return if $self->{deny_reset};
1791
1792 $self->do_decay_objects;
1793}
1794
1365sub unlink_save { 1795sub unlink_save {
1366 my ($self) = @_; 1796 my ($self) = @_;
1367 1797
1368 utf8::encode (my $save = $self->save_path); 1798 utf8::encode (my $save = $self->save_path);
1369 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1799 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1372 1802
1373sub load_header_from($) { 1803sub load_header_from($) {
1374 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1375 1805
1376 utf8::encode $path; 1806 utf8::encode $path;
1377 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1378 # or return;
1379
1380 $self->_load_header ($path)
1381 or return; 1808 or return;
1809
1810 $self->_load_header ($f)
1811 or return;
1812
1813 local $MAP_LOADING{$self->{path}} = $self;
1814 $f->resolve_delayed_derefs;
1382 1815
1383 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1384 1817
1385 1 1818 1
1386} 1819}
… …
1425 $self->load_header_orig 1858 $self->load_header_orig
1426 or return; 1859 or return;
1427 $self->prepare_orig; 1860 $self->prepare_orig;
1428 } 1861 }
1429 1862
1863 $self->{deny_reset} = 1
1864 if $self->no_reset;
1865
1430 $self->default_region (cf::region::find_by_path $self->{path}) 1866 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region; 1867 unless $self->default_region;
1432 1868
1433 1 1869 1
1434} 1870}
… …
1437sub find { 1873sub find {
1438 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1439 1875
1440 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1441 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1442 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1443 1880
1444 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1445 my $guard = cf::lock_acquire "map_find:$path"; 1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1446 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1447 or return; 1886 or return;
1448 1887
1449 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1450 1889
1451 $map->load_header 1890 $map->load_header
1452 or return; 1891 or return;
1453 1892
1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1457 $map->reset; 1898 $map->reset;
1458 undef $guard;
1459 return find $path; 1899 return find $path;
1460 } 1900 }
1461 1901
1462 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1463 } 1903 }
… …
1470 my ($self) = @_; 1910 my ($self) = @_;
1471 1911
1472 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1473 1913
1474 my $path = $self->{path}; 1914 my $path = $self->{path};
1915
1916 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1476 1918
1919 return unless $self->valid;
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1478 1921
1479 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1480 1923
1481 $self->alloc; 1924 $self->alloc;
1482 1925
1483 $self->pre_load; 1926 $self->pre_load;
1484 Coro::cede; 1927 cf::cede_to_tick;
1485 1928
1486 $self->_load_objects ($self->{load_path}, 1) 1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1931 $self->_load_objects ($f)
1487 or return; 1932 or return;
1488 1933
1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1490 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1491 1936
1492 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1493 utf8::encode $uniq; 1938 utf8::encode $uniq;
1494 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1495 $self->clear_unique_items; 1941 $self->clear_unique_items;
1496 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1497 } 1945 }
1498 } 1946 }
1499 1947
1500 Coro::cede; 1948 $f->resolve_delayed_derefs;
1949
1950 cf::cede_to_tick;
1501 # now do the right thing for maps 1951 # now do the right thing for maps
1502 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1503 Coro::cede;
1504
1505 unless ($self->{deny_activate}) {
1506 $self->decay_objects;
1507 $self->fix_auto_apply;
1508 $self->update_buttons;
1509 Coro::cede;
1510 $self->set_darkness_map;
1511 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1954 unless $self->difficulty;
1513 Coro::cede; 1955 cf::cede_to_tick;
1956
1957 unless ($self->{deny_activate}) {
1958 $self->decay_objects;
1959 $self->fix_auto_apply;
1960 $self->update_buttons;
1961 cf::cede_to_tick;
1962 $self->set_darkness_map;
1963 cf::cede_to_tick;
1514 $self->activate; 1964 $self->activate;
1515 Coro::cede; 1965 }
1966
1967 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME);
1969
1970 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1971 }
1517 1972
1518 $self->post_load; 1973 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1974}
1523 1975
1524sub customise_for { 1976sub customise_for {
1525 my ($self, $ob) = @_; 1977 my ($self, $ob) = @_;
1526 1978
1527 return find "~" . $ob->name . "/" . $self->{path} 1979 return find "~" . $ob->name . "/" . $self->{path}
1528 if $self->per_player; 1980 if $self->per_player;
1529 1981
1982# return find "?party/" . $ob->name . "/" . $self->{path}
1983# if $self->per_party;
1984
1530 $self 1985 $self
1531} 1986}
1532 1987
1533# find and load all maps in the 3x3 area around a map 1988# find and load all maps in the 3x3 area around a map
1534sub load_diag { 1989sub load_neighbours {
1535 my ($map) = @_; 1990 my ($map) = @_;
1536 1991
1537 my @diag; # diagonal neighbours 1992 my @neigh; # diagonal neighbours
1538 1993
1539 for (0 .. 3) { 1994 for (0 .. 3) {
1540 my $neigh = $map->tile_path ($_) 1995 my $neigh = $map->tile_path ($_)
1541 or next; 1996 or next;
1542 $neigh = find $neigh, $map 1997 $neigh = find $neigh, $map
1543 or next; 1998 or next;
1544 $neigh->load; 1999 $neigh->load;
1545 2000
2001 push @neigh,
1546 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2002 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1547 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2003 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1548 } 2004 }
1549 2005
1550 for (@diag) { 2006 for (grep defined $_->[0], @neigh) {
2007 my ($path, $origin) = @$_;
1551 my $neigh = find @$_ 2008 my $neigh = find $path, $origin
1552 or next; 2009 or next;
1553 $neigh->load; 2010 $neigh->load;
1554 } 2011 }
1555} 2012}
1556 2013
… …
1561} 2018}
1562 2019
1563sub do_load_sync { 2020sub do_load_sync {
1564 my ($map) = @_; 2021 my ($map) = @_;
1565 2022
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main;
2025
1566 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1567} 2027}
1568 2028
1569our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
1570our $MAP_PREFETCHER = undef; 2030our $MAP_PREFETCHER = undef;
1571 2031
1572sub find_async { 2032sub find_async {
1573 my ($path, $origin) = @_; 2033 my ($path, $origin, $load) = @_;
1574 2034
1575 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
1576 2036
1577 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
1578 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1579 } 2039 }
1580 2040
1581 undef $MAP_PREFETCH{$path}; 2041 $MAP_PREFETCH{$path} |= $load;
2042
1582 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1583 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1584 for my $path (keys %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1585 my $map = find $path 2048 if (my $map = find $k) {
1586 or next;
1587 $map->load; 2049 $map->load if $v;
2050 }
1588 2051
1589 delete $MAP_PREFETCH{$path}; 2052 delete $MAP_PREFETCH{$k};
1590 } 2053 }
1591 } 2054 }
1592 undef $MAP_PREFETCHER; 2055 undef $MAP_PREFETCHER;
1593 }; 2056 };
1594 $MAP_PREFETCHER->prio (6); 2057 $MAP_PREFETCHER->prio (6);
… …
1597} 2060}
1598 2061
1599sub save { 2062sub save {
1600 my ($self) = @_; 2063 my ($self) = @_;
1601 2064
1602 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
1603 2066
1604 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
1605 2068
1606 return unless $self->dirty; 2069 return unless $self->dirty;
1607 2070
… …
1613 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1614 2077
1615 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
1616 2079
1617 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
1618 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
1619 }; 2083 };
1620 2084
1621 if ($uniq) { 2085 if ($uniq) {
1622 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1630 my ($self) = @_; 2094 my ($self) = @_;
1631 2095
1632 # save first because save cedes 2096 # save first because save cedes
1633 $self->save; 2097 $self->save;
1634 2098
1635 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
1636 2100
1637 return if $self->players; 2101 return if $self->players;
1638 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
1639 return if $self->{deny_save}; 2103 return if $self->{deny_save};
1640 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
1641 $self->clear; 2109 $self->clear;
1642 $self->in_memory (cf::MAP_SWAPPED);
1643} 2110}
1644 2111
1645sub reset_at { 2112sub reset_at {
1646 my ($self) = @_; 2113 my ($self) = @_;
1647 2114
1648 # TODO: safety, remove and allow resettable per-player maps 2115 # TODO: safety, remove and allow resettable per-player maps
1649 return 1e99 if $self->isa ("ext::map_per_player");#d#
1650 return 1e99 if $self->{deny_reset}; 2116 return 1e99 if $self->{deny_reset};
1651 2117
1652 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2118 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1653 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2119 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1654 2120
… …
1665 my ($self) = @_; 2131 my ($self) = @_;
1666 2132
1667 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2133 my $lock = cf::lock_acquire "map_data:$self->{path}";
1668 2134
1669 return if $self->players; 2135 return if $self->players;
1670 return if $self->isa ("ext::map_per_player");#d#
1671 2136
1672 warn "resetting map ", $self->path;#d# 2137 warn "resetting map ", $self->path;
1673 2138
1674 $self->in_memory (cf::MAP_SWAPPED); 2139 $self->in_memory (cf::MAP_SWAPPED);
1675 2140
1676 # need to save uniques path 2141 # need to save uniques path
1677 unless ($self->{deny_save}) { 2142 unless ($self->{deny_save}) {
… …
1681 if $uniq; 2146 if $uniq;
1682 } 2147 }
1683 2148
1684 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
1685 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
1686 $self->clear; 2153 $self->clear;
1687
1688 $_->clear_links_to ($self) for values %cf::MAP;
1689 2154
1690 $self->unlink_save; 2155 $self->unlink_save;
1691 $self->destroy; 2156 $self->destroy;
1692} 2157}
1693 2158
1694my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
1695 2160
1696sub nuke { 2161sub nuke {
1697 my ($self) = @_; 2162 my ($self) = @_;
1698 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
1699 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
1700 2168
1701 $self->unlink_save; 2169 $self->unlink_save;
1702 2170
1703 bless $self, "cf::map"; 2171 bless $self, "cf::map";
1704 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
1705 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
1706 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
1707 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1708 2176
1709 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
1710 2179
1711 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2181}
2182
2183=item $maps = cf::map::tmp_maps
2184
2185Returns an arrayref with all map paths of currently instantiated and saved
2186maps. May block.
2187
2188=cut
2189
2190sub tmp_maps() {
2191 [
2192 map {
2193 utf8::decode $_;
2194 /\.map$/
2195 ? normalise $_
2196 : ()
2197 } @{ aio_readdir $TMPDIR or [] }
2198 ]
2199}
2200
2201=item $maps = cf::map::random_maps
2202
2203Returns an arrayref with all map paths of currently instantiated and saved
2204random maps. May block.
2205
2206=cut
2207
2208sub random_maps() {
2209 [
2210 map {
2211 utf8::decode $_;
2212 /\.map$/
2213 ? normalise "?random/$_"
2214 : ()
2215 } @{ aio_readdir $RANDOMDIR or [] }
2216 ]
1712} 2217}
1713 2218
1714=item cf::map::unique_maps 2219=item cf::map::unique_maps
1715 2220
1716Returns an arrayref of paths of all shared maps that have 2221Returns an arrayref of paths of all shared maps that have
1717instantiated unique items. May block. 2222instantiated unique items. May block.
1718 2223
1719=cut 2224=cut
1720 2225
1721sub unique_maps() { 2226sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2227 [
1723 or return; 2228 map {
1724
1725 my @paths;
1726
1727 for (@$files) {
1728 utf8::decode $_; 2229 utf8::decode $_;
1729 next if /\.pst$/; 2230 /\.map$/
1730 next unless /^$PATH_SEP/o; 2231 ? normalise $_
1731 2232 : ()
1732 push @paths, cf::map::normalise $_; 2233 } @{ aio_readdir $UNIQUEDIR or [] }
1733 } 2234 ]
1734
1735 \@paths
1736} 2235}
1737 2236
1738package cf; 2237package cf;
1739 2238
1740=back 2239=back
… …
1758 map { $_, inv_recursive_ $_->inv } @_ 2257 map { $_, inv_recursive_ $_->inv } @_
1759} 2258}
1760 2259
1761sub inv_recursive { 2260sub inv_recursive {
1762 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2262}
2263
2264=item $ref = $ob->ref
2265
2266creates and returns a persistent reference to an objetc that can be stored as a string.
2267
2268=item $ob = cf::object::deref ($refstring)
2269
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block.
2272
2273=cut
2274
2275sub deref {
2276 my ($ref) = @_;
2277
2278 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2279 my ($uuid, $name) = ($1, $2);
2280 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2281 or return;
2282 $pl->ob->uuid eq $uuid
2283 or return;
2284
2285 $pl->ob
2286 } else {
2287 warn "$ref: cannot resolve object reference\n";
2288 undef
2289 }
1763} 2290}
1764 2291
1765package cf; 2292package cf;
1766 2293
1767=back 2294=back
… …
1786 2313
1787 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2314 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1788 2315
1789 if ($self->{record_replies}) { 2316 if ($self->{record_replies}) {
1790 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2317 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2318
1791 } else { 2319 } else {
2320 my $pl = $self->contr;
2321
2322 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2323 my $dialog = $pl->{npc_dialog};
2324 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2325
2326 } else {
1792 $msg = $npc->name . " says: $msg" if $npc; 2327 $msg = $npc->name . " says: $msg" if $npc;
1793 $self->message ($msg, $flags); 2328 $self->message ($msg, $flags);
2329 }
1794 } 2330 }
2331}
2332
2333=item $object->send_msg ($channel, $msg, $color, [extra...])
2334
2335=cut
2336
2337sub cf::object::send_msg {
2338 my $pl = shift->contr
2339 or return;
2340 $pl->send_msg (@_);
1795} 2341}
1796 2342
1797=item $player_object->may ("access") 2343=item $player_object->may ("access")
1798 2344
1799Returns wether the given player is authorized to access resource "access" 2345Returns wether the given player is authorized to access resource "access"
… …
1846 $self->deactivate_recursive; 2392 $self->deactivate_recursive;
1847 2393
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2394 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 2395
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2396 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 2397 if $self->map && $self->map->{path} ne "{link}";
1852 2398
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2399 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 2400}
1855 2401
1856sub cf::object::player::leave_link { 2402sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 2403 my ($self, $map, $x, $y) = @_;
2404
2405 return unless $self->contr->active;
1858 2406
1859 my $link_pos = delete $self->{_link_pos}; 2407 my $link_pos = delete $self->{_link_pos};
1860 2408
1861 unless ($map) { 2409 unless ($map) {
1862 # restore original map position 2410 # restore original map position
… …
1876 # use -1 or undef as default coordinates, not 0, 0 2424 # use -1 or undef as default coordinates, not 0, 0
1877 ($x, $y) = ($map->enter_x, $map->enter_y) 2425 ($x, $y) = ($map->enter_x, $map->enter_y)
1878 if $x <=0 && $y <= 0; 2426 if $x <=0 && $y <= 0;
1879 2427
1880 $map->load; 2428 $map->load;
1881 $map->load_diag; 2429 $map->load_neighbours;
1882 2430
1883 return unless $self->contr->active; 2431 return unless $self->contr->active;
1884 $self->activate_recursive; 2432 $self->activate_recursive;
1885 2433
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2434 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 2435 $self->enter_map ($map, $x, $y);
1888} 2436}
1889 2437
1890cf::player->attach ( 2438=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1891 on_logout => sub {
1892 my ($pl) = @_;
1893 2439
1894 # abort map switching before logout 2440Moves the player to the given map-path and coordinates by first freezing
1895 if ($pl->ob->{_link_pos}) { 2441her, loading and preparing them map, calling the provided $check callback
1896 cf::sync_job { 2442that has to return the map if sucecssful, and then unfreezes the player on
1897 $pl->ob->leave_link 2443the new (success) or old (failed) map position. In either case, $done will
1898 }; 2444be called at the end of this process.
1899 }
1900 },
1901 on_login => sub {
1902 my ($pl) = @_;
1903 2445
1904 # try to abort aborted map switching on player login :)
1905 # should happen only on crashes
1906 if ($pl->ob->{_link_pos}) {
1907 $pl->ob->enter_link;
1908 (async {
1909 $pl->ob->reply (undef,
1910 "There was an internal problem at your last logout, "
1911 . "the server will try to bring you to your intended destination in a second.",
1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1915 Coro::Timer::sleep 1;
1916 $pl->ob->leave_link;
1917 })->prio (2);
1918 }
1919 },
1920);
1921
1922=item $player_object->goto ($path, $x, $y)
1923
1924=cut 2446=cut
2447
2448our $GOTOGEN;
1925 2449
1926sub cf::object::player::goto { 2450sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 2451 my ($self, $path, $x, $y, $check, $done) = @_;
2452
2453 # do generation counting so two concurrent goto's will be executed in-order
2454 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 2455
1929 $self->enter_link; 2456 $self->enter_link;
1930 2457
1931 (async { 2458 (async {
2459 $Coro::current->{desc} = "player::goto $path $x $y";
2460
2461 # *tag paths override both path and x|y
2462 if ($path =~ /^\*(.*)$/) {
2463 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2464 my $ob = $obs[rand @obs];
2465
2466 # see if we actually can go there
2467 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2468 $ob = $obs[rand @obs];
2469 } else {
2470 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 }
2472 # else put us there anyways for now #d#
2473
2474 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2475 } else {
2476 ($path, $x, $y) = (undef, undef, undef);
2477 }
2478 }
2479
1932 my $map = eval { 2480 my $map = eval {
1933 my $map = cf::map::find $path; 2481 my $map = defined $path ? cf::map::find $path : undef;
2482
2483 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 2484 $map = $map->customise_for ($self);
2485 $map = $check->($map) if $check && $map;
2486 } else {
2487 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2488 }
2489
1935 $map 2490 $map
2491 };
2492
2493 if ($@) {
2494 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2495 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 2496 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 2497
2498 if ($gen == $self->{_goto_generation}) {
2499 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 2500 $self->leave_link ($map, $x, $y);
2501 }
2502
2503 $done->() if $done;
1940 })->prio (1); 2504 })->prio (1);
1941} 2505}
1942 2506
1943=item $player_object->enter_exit ($exit_object) 2507=item $player_object->enter_exit ($exit_object)
1944 2508
… …
1983 2547
1984 $rmp->{random_seed} ||= $exit->random_seed; 2548 $rmp->{random_seed} ||= $exit->random_seed;
1985 2549
1986 my $data = cf::to_json $rmp; 2550 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2551 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2552 my $meta = "$RANDOMDIR/$md5.meta";
1989 2553
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2554 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2555 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2556 undef $fh;
1993 aio_rename "$meta~", $meta; 2557 aio_rename "$meta~", $meta;
… …
2013 my $hp = $exit->stats->hp; 2577 my $hp = $exit->stats->hp;
2014 my $sp = $exit->stats->sp; 2578 my $sp = $exit->stats->sp;
2015 2579
2016 $self->enter_link; 2580 $self->enter_link;
2017 2581
2582 # if exit is damned, update players death & WoR home-position
2583 $self->contr->savebed ($slaying, $hp, $sp)
2584 if $exit->flag (FLAG_DAMNED);
2585
2018 (async { 2586 (async {
2587 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2588
2019 $self->deactivate_recursive; # just to be sure 2589 $self->deactivate_recursive; # just to be sure
2020 unless (eval { 2590 unless (eval {
2021 $self->goto ($slaying, $hp, $sp); 2591 $self->goto ($slaying, $hp, $sp);
2022 2592
2023 1; 2593 1;
… …
2049 2619
2050 utf8::encode $text; 2620 utf8::encode $text;
2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2621 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2052} 2622}
2053 2623
2624=item $client->send_msg ($channel, $msg, $color, [extra...])
2625
2626Send a drawinfo or msg packet to the client, formatting the msg for the
2627client if neccessary. C<$type> should be a string identifying the type of
2628the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet.
2630
2631=cut
2632
2633our %CHANNEL = (
2634 "c/identify" => {
2635 id => "infobox",
2636 title => "Identify",
2637 reply => undef,
2638 tooltip => "Items recently identified",
2639 },
2640 "c/examine" => {
2641 id => "infobox",
2642 title => "Examine",
2643 reply => undef,
2644 tooltip => "Signs and other items you examined",
2645 },
2646 "c/lookat" => {
2647 id => "infobox",
2648 title => "Look",
2649 reply => undef,
2650 tooltip => "What you saw there",
2651 },
2652);
2653
2654sub cf::client::send_msg {
2655 my ($self, $channel, $msg, $color, @extra) = @_;
2656
2657 $msg = $self->pl->expand_cfpod ($msg);
2658
2659 $color &= cf::NDI_CLIENT_MASK; # just in case...
2660
2661 # check predefined channels, for the benefit of C
2662 if ($CHANNEL{$channel}) {
2663 $channel = $CHANNEL{$channel};
2664
2665 $self->ext_msg (channel_info => $channel)
2666 if $self->can_msg;
2667
2668 $channel = $channel->{id};
2669
2670 } elsif (ref $channel) {
2671 # send meta info to client, if not yet sent
2672 unless (exists $self->{channel}{$channel->{id}}) {
2673 $self->{channel}{$channel->{id}} = $channel;
2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2676 }
2677
2678 $channel = $channel->{id};
2679 }
2680
2681 return unless @extra || length $msg;
2682
2683 if ($self->can_msg) {
2684 # default colour, mask it out
2685 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2686 if $color & cf::NDI_DEF;
2687
2688 $self->send_packet ("msg " . $self->{json_coder}->encode (
2689 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2690 } else {
2691 if ($color >= 0) {
2692 # replace some tags by gcfclient-compatible ones
2693 for ($msg) {
2694 1 while
2695 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2696 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2697 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2698 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2699 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2700 }
2701
2702 $color &= cf::NDI_COLOR_MASK;
2703
2704 utf8::encode $msg;
2705
2706 if (0 && $msg =~ /\[/) {
2707 # COMMAND/INFO
2708 $self->send_packet ("drawextinfo $color 10 8 $msg")
2709 } else {
2710 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2711 $self->send_packet ("drawinfo $color $msg")
2712 }
2713 }
2714 }
2715}
2716
2054=item $client->ext_event ($type, %msg) 2717=item $client->ext_msg ($type, @msg)
2055 2718
2056Sends an exti event to the client. 2719Sends an ext event to the client.
2057 2720
2058=cut 2721=cut
2059 2722
2060sub cf::client::ext_event($$%) { 2723sub cf::client::ext_msg($$@) {
2061 my ($self, $type, %msg) = @_; 2724 my ($self, $type, @msg) = @_;
2062 2725
2726 if ($self->extcmd == 2) {
2727 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2728 } elsif ($self->extcmd == 1) { # TODO: remove
2063 $msg{msgtype} = "event_$type"; 2729 push @msg, msgtype => "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg); 2730 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2731 }
2732}
2733
2734=item $client->ext_reply ($msgid, @msg)
2735
2736Sends an ext reply to the client.
2737
2738=cut
2739
2740sub cf::client::ext_reply($$@) {
2741 my ($self, $id, @msg) = @_;
2742
2743 if ($self->extcmd == 2) {
2744 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2745 } elsif ($self->extcmd == 1) {
2746 #TODO: version 1, remove
2747 unshift @msg, msgtype => "reply", msgid => $id;
2748 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2749 }
2065} 2750}
2066 2751
2067=item $success = $client->query ($flags, "text", \&cb) 2752=item $success = $client->query ($flags, "text", \&cb)
2068 2753
2069Queues a query to the client, calling the given callback with 2754Queues a query to the client, calling the given callback with
2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2755the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2071C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2756C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2072 2757
2073Queries can fail, so check the return code. Or don't, as queries will become 2758Queries can fail, so check the return code. Or don't, as queries will
2074reliable at some point in the future. 2759become reliable at some point in the future.
2075 2760
2076=cut 2761=cut
2077 2762
2078sub cf::client::query { 2763sub cf::client::query {
2079 my ($self, $flags, $text, $cb) = @_; 2764 my ($self, $flags, $text, $cb) = @_;
… …
2087 utf8::encode $text; 2772 utf8::encode $text;
2088 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2773 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2089 2774
2090 $self->send_packet ($self->{query_queue}[0][0]) 2775 $self->send_packet ($self->{query_queue}[0][0])
2091 if @{ $self->{query_queue} } == 1; 2776 if @{ $self->{query_queue} } == 1;
2777
2778 1
2092} 2779}
2093 2780
2094cf::client->attach ( 2781cf::client->attach (
2782 on_connect => sub {
2783 my ($ns) = @_;
2784
2785 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2786 },
2095 on_reply => sub { 2787 on_reply => sub {
2096 my ($ns, $msg) = @_; 2788 my ($ns, $msg) = @_;
2097 2789
2098 # this weird shuffling is so that direct followup queries 2790 # this weird shuffling is so that direct followup queries
2099 # get handled first 2791 # get handled first
… …
2111 } else { 2803 } else {
2112 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2804 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2113 } 2805 }
2114 } 2806 }
2115 }, 2807 },
2808 on_exticmd => sub {
2809 my ($ns, $buf) = @_;
2810
2811 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2812
2813 if (ref $msg) {
2814 my ($type, $reply, @payload) =
2815 "ARRAY" eq ref $msg
2816 ? @$msg
2817 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2818
2819 my @reply;
2820
2821 if (my $cb = $EXTICMD{$type}) {
2822 @reply = $cb->($ns, @payload);
2823 }
2824
2825 $ns->ext_reply ($reply, @reply)
2826 if $reply;
2827
2828 } else {
2829 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2830 }
2831
2832 cf::override;
2833 },
2116); 2834);
2117 2835
2118=item $client->async (\&cb) 2836=item $client->async (\&cb)
2119 2837
2120Create a new coroutine, running the specified callback. The coroutine will 2838Create a new coroutine, running the specified callback. The coroutine will
… …
2161our $safe = new Safe "safe"; 2879our $safe = new Safe "safe";
2162our $safe_hole = new Safe::Hole; 2880our $safe_hole = new Safe::Hole;
2163 2881
2164$SIG{FPE} = 'IGNORE'; 2882$SIG{FPE} = 'IGNORE';
2165 2883
2166$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2884$safe->permit_only (Opcode::opset qw(
2885 :base_core :base_mem :base_orig :base_math
2886 grepstart grepwhile mapstart mapwhile
2887 sort time
2888));
2167 2889
2168# here we export the classes and methods available to script code 2890# here we export the classes and methods available to script code
2169 2891
2170=pod 2892=pod
2171 2893
2172The following functions and methods are available within a safe environment: 2894The following functions and methods are available within a safe environment:
2173 2895
2174 cf::object contr pay_amount pay_player map 2896 cf::object
2897 contr pay_amount pay_player map x y force_find force_add
2898 insert remove name archname title slaying race decrease_ob_nr
2899
2175 cf::object::player player 2900 cf::object::player
2176 cf::player peaceful 2901 player
2177 cf::map trigger 2902
2903 cf::player
2904 peaceful
2905
2906 cf::map
2907 trigger
2178 2908
2179=cut 2909=cut
2180 2910
2181for ( 2911for (
2182 ["cf::object" => qw(contr pay_amount pay_player map)], 2912 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2913 insert remove inv name archname title slaying race
2914 decrease_ob_nr)],
2183 ["cf::object::player" => qw(player)], 2915 ["cf::object::player" => qw(player)],
2184 ["cf::player" => qw(peaceful)], 2916 ["cf::player" => qw(peaceful)],
2185 ["cf::map" => qw(trigger)], 2917 ["cf::map" => qw(trigger)],
2186) { 2918) {
2187 no strict 'refs'; 2919 no strict 'refs';
… …
2258=back 2990=back
2259 2991
2260=cut 2992=cut
2261 2993
2262############################################################################# 2994#############################################################################
2263
2264=head2 EXTENSION DATABASE SUPPORT
2265
2266Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which
2268excludes objects.
2269
2270The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique.
2272
2273=over 4
2274
2275=item $value = cf::db_get $family => $key
2276
2277Returns a single value from the database.
2278
2279=item cf::db_put $family => $key => $value
2280
2281Stores the given C<$value> in the family.
2282
2283=cut
2284
2285our $DB;
2286
2287sub db_init {
2288 unless ($DB) {
2289 $DB = BDB::db_create $DB_ENV;
2290
2291 cf::sync_job {
2292 eval {
2293 $DB->set_flags (BDB::CHKSUM);
2294
2295 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!;
2298 };
2299 cf::cleanup "db_open(db): $@" if $@;
2300 };
2301
2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2306
2307 cf::db_put (board => data => $pst->{board});
2308 cf::db_put (guildrules => data => $pst->{guildrules});
2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2311
2312 unlink $path;
2313 };
2314 }
2315 }
2316}
2317
2318sub db_get($$) {
2319 my $key = "$_[0]/$_[1]";
2320
2321 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data;
2323
2324 $! ? ()
2325 : Compress::LZF::sthaw $data
2326 }
2327}
2328
2329sub db_put($$$) {
2330 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2332}
2333
2334#############################################################################
2335# the server's init and main functions 2995# the server's init and main functions
2336 2996
2337sub load_facedata($) { 2997sub load_facedata($) {
2338 my ($path) = @_; 2998 my ($path) = @_;
2999
3000 # HACK to clear player env face cache, we need some signal framework
3001 # for this (global event?)
3002 %ext::player_env::MUSIC_FACE_CACHE = ();
3003
3004 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2339 3005
2340 warn "loading facedata from $path\n"; 3006 warn "loading facedata from $path\n";
2341 3007
2342 my $facedata; 3008 my $facedata;
2343 0 < aio_load $path, $facedata 3009 0 < aio_load $path, $facedata
… …
2346 $facedata = Coro::Storable::thaw $facedata; 3012 $facedata = Coro::Storable::thaw $facedata;
2347 3013
2348 $facedata->{version} == 2 3014 $facedata->{version} == 2
2349 or cf::cleanup "$path: version mismatch, cannot proceed."; 3015 or cf::cleanup "$path: version mismatch, cannot proceed.";
2350 3016
3017 # patch in the exptable
3018 $facedata->{resource}{"res/exp_table"} = {
3019 type => FT_RSRC,
3020 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3021 };
3022 cf::cede_to_tick;
3023
2351 { 3024 {
2352 my $faces = $facedata->{faceinfo}; 3025 my $faces = $facedata->{faceinfo};
2353 3026
2354 while (my ($face, $info) = each %$faces) { 3027 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3028 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3029 cf::face::set_visibility $idx, $info->{visibility};
3030 cf::face::set_magicmap $idx, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3031 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3032 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2359 Coro::cede; 3033
3034 cf::cede_to_tick;
2360 } 3035 }
2361 3036
2362 while (my ($face, $info) = each %$faces) { 3037 while (my ($face, $info) = each %$faces) {
2363 next unless $info->{smooth}; 3038 next unless $info->{smooth};
2364 my $idx = cf::face::find $face 3039 my $idx = cf::face::find $face
2365 or next; 3040 or next;
2366 if (my $smooth = cf::face::find $info->{smooth}) { 3041 if (my $smooth = cf::face::find $info->{smooth}) {
3042 cf::face::set_smooth $idx, $smooth;
2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3043 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2368 } else { 3044 } else {
2369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3045 warn "smooth face '$info->{smooth}' not found for face '$face'";
2370 } 3046 }
2371 Coro::cede; 3047
3048 cf::cede_to_tick;
2372 } 3049 }
2373 } 3050 }
2374 3051
2375 { 3052 {
2376 my $anims = $facedata->{animinfo}; 3053 my $anims = $facedata->{animinfo};
2377 3054
2378 while (my ($anim, $info) = each %$anims) { 3055 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3056 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede; 3057 cf::cede_to_tick;
2381 } 3058 }
2382 3059
2383 cf::anim::invalidate_all; # d'oh 3060 cf::anim::invalidate_all; # d'oh
2384 } 3061 }
2385 3062
3063 {
3064 # TODO: for gcfclient pleasure, we should give resources
3065 # that gcfclient doesn't grok a >10000 face index.
3066 my $res = $facedata->{resource};
3067
3068 my $soundconf = delete $res->{"res/sound.conf"};
3069
3070 while (my ($name, $info) = each %$res) {
3071 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3072 my $data;
3073
3074 if ($info->{type} & 1) {
3075 # prepend meta info
3076
3077 my $meta = $enc->encode ({
3078 name => $name,
3079 %{ $info->{meta} || {} },
3080 });
3081
3082 $data = pack "(w/a*)*", $meta, $info->{data};
3083 } else {
3084 $data = $info->{data};
3085 }
3086
3087 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3088 cf::face::set_type $idx, $info->{type};
3089
3090 cf::cede_to_tick;
3091 }
3092
3093 if ($soundconf) {
3094 $soundconf = $enc->decode (delete $soundconf->{data});
3095
3096 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3097 my $sound = $soundconf->{compat}[$_]
3098 or next;
3099
3100 my $face = cf::face::find "sound/$sound->[1]";
3101 cf::sound::set $sound->[0] => $face;
3102 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3103 }
3104
3105 while (my ($k, $v) = each %{$soundconf->{event}}) {
3106 my $face = cf::face::find "sound/$v";
3107 cf::sound::set $k => $face;
3108 }
3109 }
3110 }
3111
2386 1 3112 1
2387} 3113}
2388 3114
3115register_exticmd fx_want => sub {
3116 my ($ns, $want) = @_;
3117
3118 while (my ($k, $v) = each %$want) {
3119 $ns->fx_want ($k, $v);
3120 }
3121};
3122
3123sub reload_regions {
3124 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = ();
3127
3128 load_resource_file "$MAPDIR/regions"
3129 or die "unable to load regions file\n";
3130
3131 for (cf::region::list) {
3132 $_->{match} = qr/$_->{match}/
3133 if exists $_->{match};
3134 }
3135}
3136
2389sub reload_facedata { 3137sub reload_facedata {
2390 load_facedata sprintf "%s/facedata", cf::datadir 3138 load_facedata "$DATADIR/facedata"
2391 or die "unable to load facedata\n"; 3139 or die "unable to load facedata\n";
2392} 3140}
2393 3141
2394sub reload_regions {
2395 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2396 or die "unable to load regions file\n";
2397}
2398
2399sub reload_archetypes { 3142sub reload_archetypes {
2400 load_archetype_file sprintf "%s/archetypes", cf::datadir 3143 load_resource_file "$DATADIR/archetypes"
2401 or die "unable to load archetypes\n"; 3144 or die "unable to load archetypes\n";
3145 #d# NEED to laod twice to resolve forward references
3146 # this really needs to be done in an extra post-pass
3147 # (which needs to be synchronous, so solve it differently)
3148 load_resource_file "$DATADIR/archetypes"
3149 or die "unable to load archetypes\n";
2402} 3150}
2403 3151
2404sub reload_treasures { 3152sub reload_treasures {
2405 load_resource_file sprintf "%s/treasures", cf::datadir 3153 load_resource_file "$DATADIR/treasures"
2406 or die "unable to load treasurelists\n"; 3154 or die "unable to load treasurelists\n";
2407} 3155}
2408 3156
2409sub reload_resources { 3157sub reload_resources {
2410 warn "reloading resource files...\n"; 3158 warn "reloading resource files...\n";
2411 3159
2412 reload_regions; 3160 reload_regions;
2413 reload_facedata; 3161 reload_facedata;
3162 #reload_archetypes;#d#
2414 reload_archetypes; 3163 reload_archetypes;
2415 reload_treasures; 3164 reload_treasures;
2416 3165
2417 warn "finished reloading resource files\n"; 3166 warn "finished reloading resource files\n";
2418} 3167}
2419 3168
2420sub init { 3169sub init {
2421 reload_resources; 3170 reload_resources;
2422} 3171}
2423 3172
2424sub cfg_load { 3173sub reload_config {
2425 open my $fh, "<:utf8", cf::confdir . "/config" 3174 open my $fh, "<:utf8", "$CONFDIR/config"
2426 or return; 3175 or return;
2427 3176
2428 local $/; 3177 local $/;
2429 *CFG = YAML::Syck::Load <$fh>; 3178 *CFG = YAML::Syck::Load <$fh>;
2430 3179
… …
2445sub main { 3194sub main {
2446 # we must not ever block the main coroutine 3195 # we must not ever block the main coroutine
2447 local $Coro::idle = sub { 3196 local $Coro::idle = sub {
2448 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2449 (async { 3198 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER";
2450 Event::one_event; 3200 Event::one_event;
2451 })->prio (Coro::PRIO_MAX); 3201 })->prio (Coro::PRIO_MAX);
2452 }; 3202 };
2453 3203
2454 cfg_load; 3204 reload_config;
2455 db_init; 3205 db_init;
2456 load_extensions; 3206 load_extensions;
2457 3207
2458 $TICK_WATCHER->start; 3208 $TICK_WATCHER->start;
2459 Event::loop; 3209 Event::loop;
… …
2475 }, 3225 },
2476 ); 3226 );
2477 } 3227 }
2478} 3228}
2479 3229
3230sub write_runtime {
3231 my $runtime = "$LOCALDIR/runtime";
3232
3233 # first touch the runtime file to show we are still running:
3234 # the fsync below can take a very very long time.
3235
3236 IO::AIO::aio_utime $runtime, undef, undef;
3237
3238 my $guard = cf::lock_acquire "write_runtime";
3239
3240 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3241 or return;
3242
3243 my $value = $cf::RUNTIME + 90 + 10;
3244 # 10 is the runtime save interval, for a monotonic clock
3245 # 60 allows for the watchdog to kill the server.
3246
3247 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3248 and return;
3249
3250 # always fsync - this file is important
3251 aio_fsync $fh
3252 and return;
3253
3254 # touch it again to show we are up-to-date
3255 aio_utime $fh, undef, undef;
3256
3257 close $fh
3258 or return;
3259
3260 aio_rename "$runtime~", $runtime
3261 and return;
3262
3263 warn "runtime file written.\n";
3264
3265 1
3266}
3267
2480sub emergency_save() { 3268sub emergency_save() {
2481 my $freeze_guard = cf::freeze_mainloop; 3269 my $freeze_guard = cf::freeze_mainloop;
2482 3270
2483 warn "enter emergency perl save\n"; 3271 warn "enter emergency perl save\n";
2484 3272
… …
2559 %EXT_CORO = (); 3347 %EXT_CORO = ();
2560 3348
2561 warn "removing commands"; 3349 warn "removing commands";
2562 %COMMAND = (); 3350 %COMMAND = ();
2563 3351
2564 warn "removing ext commands"; 3352 warn "removing ext/exti commands";
2565 %EXTCMD = (); 3353 %EXTCMD = ();
3354 %EXTICMD = ();
2566 3355
2567 warn "unloading/nuking all extensions"; 3356 warn "unloading/nuking all extensions";
2568 for my $pkg (@EXTS) { 3357 for my $pkg (@EXTS) {
2569 warn "... unloading $pkg"; 3358 warn "... unloading $pkg";
2570 3359
… …
2600 Symbol::delete_package "safe::$_" 3389 Symbol::delete_package "safe::$_"
2601 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3390 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2602 3391
2603 warn "unloading cf.pm \"a bit\""; 3392 warn "unloading cf.pm \"a bit\"";
2604 delete $INC{"cf.pm"}; 3393 delete $INC{"cf.pm"};
3394 delete $INC{"cf/pod.pm"};
2605 3395
2606 # don't, removes xs symbols, too, 3396 # don't, removes xs symbols, too,
2607 # and global variables created in xs 3397 # and global variables created in xs
2608 #Symbol::delete_package __PACKAGE__; 3398 #Symbol::delete_package __PACKAGE__;
2609 3399
… …
2612 warn "reloading cf.pm"; 3402 warn "reloading cf.pm";
2613 require cf; 3403 require cf;
2614 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3404 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2615 3405
2616 warn "loading config and database again"; 3406 warn "loading config and database again";
2617 cf::cfg_load; 3407 cf::reload_config;
2618 3408
2619 warn "loading extensions"; 3409 warn "loading extensions";
2620 cf::load_extensions; 3410 cf::load_extensions;
2621 3411
2622 warn "reattaching attachments to objects/players"; 3412 warn "reattaching attachments to objects/players";
… …
2658register_command "reload" => sub { 3448register_command "reload" => sub {
2659 my ($who, $arg) = @_; 3449 my ($who, $arg) = @_;
2660 3450
2661 if ($who->flag (FLAG_WIZ)) { 3451 if ($who->flag (FLAG_WIZ)) {
2662 $who->message ("reloading server."); 3452 $who->message ("reloading server.");
3453 async {
3454 $Coro::current->{desc} = "perl_reload";
2663 async { reload_perl }; 3455 reload_perl;
3456 };
2664 } 3457 }
2665}; 3458};
2666 3459
2667unshift @INC, $LIBDIR; 3460unshift @INC, $LIBDIR;
2668 3461
… …
2700 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3493 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2701 unless ++$bug_warning > 10; 3494 unless ++$bug_warning > 10;
2702 return; 3495 return;
2703 } 3496 }
2704 3497
2705 $NOW = Event::time; 3498 $NOW = $tick_start = Event::time;
2706 3499
2707 cf::server_tick; # one server iteration 3500 cf::server_tick; # one server iteration
2708 3501
2709 $RUNTIME += $TICK; 3502 $RUNTIME += $TICK;
2710 $NEXT_TICK += $TICK; 3503 $NEXT_TICK += $TICK;
2711 3504
2712 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3505 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2713 $NEXT_RUNTIME_WRITE = $NOW + 10; 3506 $NEXT_RUNTIME_WRITE = $NOW + 10;
2714 Coro::async_pool { 3507 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver";
2715 write_runtime 3509 write_runtime
2716 or warn "ERROR: unable to write runtime file: $!"; 3510 or warn "ERROR: unable to write runtime file: $!";
2717 }; 3511 };
2718 } 3512 }
2719 3513
2720# my $AFTER = Event::time; 3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2721# warn $AFTER - $NOW;#d# 3515 $sig->send;
3516 }
3517 while (my $sig = shift @WAIT_FOR_TICK) {
3518 $sig->send;
3519 }
3520
3521 $NOW = Event::time;
2722 3522
2723 # if we are delayed by four ticks or more, skip them all 3523 # if we are delayed by four ticks or more, skip them all
2724 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3524 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2725 3525
2726 $TICK_WATCHER->at ($NEXT_TICK); 3526 $TICK_WATCHER->at ($NEXT_TICK);
2727 $TICK_WATCHER->start; 3527 $TICK_WATCHER->start;
2728 3528
2729 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3529 $LOAD = ($NOW - $tick_start) / $TICK;
2730 $sig->send; 3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2731 }
2732 while (my $sig = shift @WAIT_FOR_TICK) {
2733 $sig->send;
2734 }
2735 3531
2736 _post_tick; 3532 _post_tick;
2737 }, 3533 },
2738); 3534);
2739 3535
2740{ 3536{
3537 BDB::min_parallel 8;
2741 BDB::max_poll_time $TICK * 0.1; 3538 BDB::max_poll_time $TICK * 0.1;
2742 $BDB_POLL_WATCHER = Event->io ( 3539 $BDB_POLL_WATCHER = Event->io (
2743 reentrant => 0, 3540 reentrant => 0,
2744 fd => BDB::poll_fileno, 3541 fd => BDB::poll_fileno,
2745 poll => 'r', 3542 poll => 'r',
2746 prio => 0, 3543 prio => 0,
2747 data => WF_AUTOCANCEL, 3544 data => WF_AUTOCANCEL,
2748 cb => \&BDB::poll_cb, 3545 cb => \&BDB::poll_cb,
2749 ); 3546 );
2750 BDB::min_parallel 8;
2751 3547
2752 BDB::set_sync_prepare { 3548 BDB::set_sync_prepare {
2753 my $status; 3549 my $status;
2754 my $current = $Coro::current; 3550 my $current = $Coro::current;
2755 ( 3551 (
… …
2764 ) 3560 )
2765 }; 3561 };
2766 3562
2767 unless ($DB_ENV) { 3563 unless ($DB_ENV) {
2768 $DB_ENV = BDB::db_env_create; 3564 $DB_ENV = BDB::db_env_create;
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3567 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3568 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2769 3569
2770 cf::sync_job { 3570 cf::sync_job {
2771 eval { 3571 eval {
2772 BDB::db_env_open 3572 BDB::db_env_open
2773 $DB_ENV, 3573 $DB_ENV,
2774 $BDB_ENV_DIR, 3574 $BDBDIR,
2775 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3575 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2776 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3576 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2777 0666; 3577 0666;
2778 3578
2779 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3579 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2780
2781 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2782 $DB_ENV->set_lk_detect;
2783 }; 3580 };
2784 3581
2785 cf::cleanup "db_env_open(db): $@" if $@; 3582 cf::cleanup "db_env_open(db): $@" if $@;
2786 }; 3583 };
2787 } 3584 }
3585
3586 $BDB_DEADLOCK_WATCHER = Event->timer (
3587 after => 3,
3588 interval => 1,
3589 hard => 1,
3590 prio => 0,
3591 data => WF_AUTOCANCEL,
3592 cb => sub {
3593 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3594 },
3595 );
3596 $BDB_CHECKPOINT_WATCHER = Event->timer (
3597 after => 11,
3598 interval => 60,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3604 },
3605 );
3606 $BDB_TRICKLE_WATCHER = Event->timer (
3607 after => 5,
3608 interval => 10,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3614 },
3615 );
2788} 3616}
2789 3617
2790{ 3618{
2791 IO::AIO::min_parallel 8; 3619 IO::AIO::min_parallel 8;
2792 3620
… …
2795 $AIO_POLL_WATCHER = Event->io ( 3623 $AIO_POLL_WATCHER = Event->io (
2796 reentrant => 0, 3624 reentrant => 0,
2797 data => WF_AUTOCANCEL, 3625 data => WF_AUTOCANCEL,
2798 fd => IO::AIO::poll_fileno, 3626 fd => IO::AIO::poll_fileno,
2799 poll => 'r', 3627 poll => 'r',
2800 prio => 6, 3628 prio => 0,
2801 cb => \&IO::AIO::poll_cb, 3629 cb => \&IO::AIO::poll_cb,
2802 ); 3630 );
2803} 3631}
2804 3632
3633my $_log_backtrace;
3634
3635sub _log_backtrace {
3636 my ($msg, @addr) = @_;
3637
3638 $msg =~ s/\n//;
3639
3640 # limit the # of concurrent backtraces
3641 if ($_log_backtrace < 2) {
3642 ++$_log_backtrace;
3643 async {
3644 $Coro::current->{desc} = "abt $msg";
3645
3646 my @bt = fork_call {
3647 @addr = map { sprintf "%x", $_ } @addr;
3648 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3649 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3650 or die "addr2line: $!";
3651
3652 my @funcs;
3653 my @res = <$fh>;
3654 chomp for @res;
3655 while (@res) {
3656 my ($func, $line) = splice @res, 0, 2, ();
3657 push @funcs, "[$func] $line";
3658 }
3659
3660 @funcs
3661 };
3662
3663 LOG llevInfo, "[ABT] $msg\n";
3664 LOG llevInfo, "[ABT] $_\n" for @bt;
3665 --$_log_backtrace;
3666 };
3667 } else {
3668 LOG llevInfo, "[ABT] $msg\n";
3669 LOG llevInfo, "[ABT] [suppressed]\n";
3670 }
3671}
3672
3673# load additional modules
3674use cf::pod;
3675
2805END { cf::emergency_save } 3676END { cf::emergency_save }
2806 3677
28071 36781
2808 3679

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines