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.132 by root, Thu Jan 4 01:35:56 2007 UTC vs.
Revision 1.139 by root, Fri Jan 5 19:12:03 2007 UTC

… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
180sub to_json($) { 179sub to_json($) {
181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
182 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
183} 182}
184 183
185=item my $guard = cf::guard { BLOCK }
186
187Run the given callback when the guard object gets destroyed (useful for
188coroutine cancellations).
189
190You can call C<< ->cancel >> on the guard object to stop the block from
191being executed.
192
193=cut
194
195sub guard(&) {
196 bless \(my $cb = $_[0]), cf::guard::;
197}
198
199sub cf::guard::cancel {
200 ${$_[0]} = sub { };
201}
202
203sub cf::guard::DESTROY {
204 ${$_[0]}->();
205}
206
207=item cf::lock_wait $string 184=item cf::lock_wait $string
208 185
209Wait until the given lock is available. See cf::lock_acquire. 186Wait until the given lock is available. See cf::lock_acquire.
210 187
211=item my $lock = cf::lock_acquire $string 188=item my $lock = cf::lock_acquire $string
212 189
213Wait until the given lock is available and then acquires it and returns 190Wait until the given lock is available and then acquires it and returns
214a guard object. If the guard object gets destroyed (goes out of scope, 191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
215for example when the coroutine gets canceled), the lock is automatically 192for example when the coroutine gets canceled), the lock is automatically
216returned. 193returned.
217 194
218Lock names should begin with a unique identifier (for example, find_map 195Lock names should begin with a unique identifier (for example, cf::map::find
219uses map_find and load_map uses map_load). 196uses map_find and cf::map::load uses map_load).
220 197
221=cut 198=cut
222 199
223our %LOCK; 200our %LOCK;
224 201
… …
238 # wait, to be sure we are not locked 215 # wait, to be sure we are not locked
239 lock_wait $key; 216 lock_wait $key;
240 217
241 $LOCK{$key} = []; 218 $LOCK{$key} = [];
242 219
243 cf::guard { 220 Coro::guard {
244 # wake up all waiters, to be on the safe side 221 # wake up all waiters, to be on the safe side
245 $_->ready for @{ delete $LOCK{$key} }; 222 $_->ready for @{ delete $LOCK{$key} };
246 } 223 }
247} 224}
248 225
249=item cf::async { BLOCK } 226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
250 228
251Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 229 my $guard = Coro::guard { $TICK_WATCHER->start };
252error instead of exiting the server in case of a problem. 230 $TICK_WATCHER->stop;
253 231 $guard
254=cut
255
256sub async(&) {
257 my ($cb) = @_;
258
259 Coro::async {
260 eval { $cb->() };
261 warn $@ if $@;
262 }
263} 232}
264 233
265=item cf::sync_job { BLOCK } 234=item cf::sync_job { BLOCK }
266 235
267The design of crossfire+ requires that the main coro ($Coro::main) is 236The design of crossfire+ requires that the main coro ($Coro::main) is
… …
282 # this is the main coro, too bad, we have to block 251 # this is the main coro, too bad, we have to block
283 # till the operation succeeds, freezing the server :/ 252 # till the operation succeeds, freezing the server :/
284 253
285 # TODO: use suspend/resume instead 254 # TODO: use suspend/resume instead
286 # (but this is cancel-safe) 255 # (but this is cancel-safe)
287 local $FREEZE = 1; 256 my $freeze_guard = freeze_mainloop;
288 257
289 my $busy = 1; 258 my $busy = 1;
290 my @res; 259 my @res;
291 260
292 (Coro::async { 261 (Coro::async_pool {
293 @res = eval { $job->() }; 262 @res = eval { $job->() };
294 warn $@ if $@; 263 warn $@ if $@;
295 undef $busy; 264 undef $busy;
296 })->prio (Coro::PRIO_MAX); 265 })->prio (Coro::PRIO_MAX);
297 266
298 while ($busy) { 267 while ($busy) {
299 Coro::cede_notself; 268 unless (Coro::cede) {
300 Event::one_event unless Coro::nready; 269 Coro::nready ? Event::one_event 0 : Event::one_event;
270 Coro::cede_notself unless Coro::cede;
271 }
301 } 272 }
302 273
303 wantarray ? @res : $res[0] 274 wantarray ? @res : $res[0]
304 } else { 275 } else {
305 # we are in another coroutine, how wonderful, everything just works 276 # we are in another coroutine, how wonderful, everything just works
… …
308 } 279 }
309} 280}
310 281
311=item $coro = cf::coro { BLOCK } 282=item $coro = cf::coro { BLOCK }
312 283
313Creates and returns a new coro. This coro is automcatially being canceled 284Creates (and readies) and returns a new coro. This coro is automcatially
314when the extension calling this is being unloaded. 285being canceled when the extension calling this is being unloaded.
315 286
316=cut 287=cut
317 288
318sub coro(&) { 289sub coro(&) {
319 my $cb = shift; 290 my $cb = shift;
320 291
321 my $coro = &cf::async ($cb); 292 my $coro = &Coro::async_pool ($cb);
322 293
323 $coro->on_destroy (sub { 294 $coro->on_destroy (sub {
324 delete $EXT_CORO{$coro+0}; 295 delete $EXT_CORO{$coro+0};
325 }); 296 });
326 $EXT_CORO{$coro+0} = $coro; 297 $EXT_CORO{$coro+0} = $coro;
… …
1136package cf::map; 1107package cf::map;
1137 1108
1138use Fcntl; 1109use Fcntl;
1139use Coro::AIO; 1110use Coro::AIO;
1140 1111
1141our $MAX_RESET = 7200; 1112our $MAX_RESET = 3600;
1142our $DEFAULT_RESET = 3600; 1113our $DEFAULT_RESET = 3000;
1143 1114
1144sub generate_random_map { 1115sub generate_random_map {
1145 my ($path, $rmp) = @_; 1116 my ($path, $rmp) = @_;
1146 1117
1147 # mit "rum" bekleckern, nicht 1118 # mit "rum" bekleckern, nicht
… …
1177 or return; 1148 or return;
1178 1149
1179 my $map = cf::map::new 1150 my $map = cf::map::new
1180 or return; 1151 or return;
1181 1152
1153 # for better error messages only, will be overwritten
1154 $map->path ($path);
1155
1182 $map->load_header ($path) 1156 $map->load_header ($path)
1183 or return; 1157 or return;
1184 1158
1185 $map->{load_path} = $path; 1159 $map->{load_path} = $path;
1186 1160
1187 $map 1161 $map
1188} 1162}
1189 1163
1190sub find_map; 1164sub find;
1191sub find_map { 1165sub find {
1192 my ($path, $origin) = @_; 1166 my ($path, $origin) = @_;
1193 1167
1194 #warn "find_map<$path,$origin>\n";#d# 1168 #warn "find<$path,$origin>\n";#d#
1195 1169
1196 $path = new cf::path $path, $origin && $origin->path; 1170 $path = new cf::path $path, $origin && $origin->path;
1197 my $key = $path->as_string; 1171 my $key = $path->as_string;
1198 1172
1199 cf::lock_wait "map_find:$key"; 1173 cf::lock_wait "map_find:$key";
… …
1201 $cf::MAP{$key} || do { 1175 $cf::MAP{$key} || do {
1202 my $guard = cf::lock_acquire "map_find:$key"; 1176 my $guard = cf::lock_acquire "map_find:$key";
1203 1177
1204 # do it the slow way 1178 # do it the slow way
1205 my $map = try_load_header $path->save_path; 1179 my $map = try_load_header $path->save_path;
1180
1181 Coro::cede;
1206 1182
1207 if ($map) { 1183 if ($map) {
1208 $map->last_access ((delete $map->{last_access}) 1184 $map->last_access ((delete $map->{last_access})
1209 || $cf::RUNTIME); #d# 1185 || $cf::RUNTIME); #d#
1210 # safety 1186 # safety
… …
1230 1206
1231 $map->path ($key); 1207 $map->path ($key);
1232 $map->{path} = $path; 1208 $map->{path} = $path;
1233 $map->{last_save} = $cf::RUNTIME; 1209 $map->{last_save} = $cf::RUNTIME;
1234 1210
1211 Coro::cede;
1212
1235 if ($map->should_reset) { 1213 if ($map->should_reset) {
1236 $map->reset; 1214 $map->reset;
1237 undef $guard; 1215 undef $guard;
1238 $map = find_map $path 1216 $map = find $path
1239 or return; 1217 or return;
1240 } 1218 }
1241 1219
1242 $cf::MAP{$key} = $map 1220 $cf::MAP{$key} = $map
1243 } 1221 }
… …
1265 if (aio_open $uniq, O_RDONLY, 0) { 1243 if (aio_open $uniq, O_RDONLY, 0) {
1266 $self->clear_unique_items; 1244 $self->clear_unique_items;
1267 $self->load_objects ($uniq, 0); 1245 $self->load_objects ($uniq, 0);
1268 } 1246 }
1269 } 1247 }
1248
1249 Coro::cede;
1270 1250
1271 # now do the right thing for maps 1251 # now do the right thing for maps
1272 $self->link_multipart_objects; 1252 $self->link_multipart_objects;
1273 1253
1274 if ($self->{path}->is_style_map) { 1254 if ($self->{path}->is_style_map) {
… …
1282 $self->difficulty ($self->estimate_difficulty) 1262 $self->difficulty ($self->estimate_difficulty)
1283 unless $self->difficulty; 1263 unless $self->difficulty;
1284 $self->activate; 1264 $self->activate;
1285 } 1265 }
1286 1266
1267 Coro::cede;
1268
1287 $self->in_memory (cf::MAP_IN_MEMORY); 1269 $self->in_memory (cf::MAP_IN_MEMORY);
1288} 1270}
1289 1271
1290sub load_map_sync { 1272sub find_sync {
1291 my ($path, $origin) = @_; 1273 my ($path, $origin) = @_;
1292 1274
1293 #warn "load_map_sync<$path, $origin>\n";#d#
1294
1295 cf::sync_job { 1275 cf::sync_job {
1296 my $map = cf::map::find_map $path, $origin 1276 my $map = cf::map::find $path, $origin;
1297 or return;
1298 $map->load;
1299 $map 1277 $map
1300 } 1278 }
1279}
1280
1281sub do_load_sync {
1282 my ($map) = @_;
1283
1284 cf::sync_job { $map->load };
1301} 1285}
1302 1286
1303sub save { 1287sub save {
1304 my ($self) = @_; 1288 my ($self) = @_;
1289
1290 my $lock = cf::lock_acquire "map_data:" . $self->path;
1305 1291
1306 $self->{last_save} = $cf::RUNTIME; 1292 $self->{last_save} = $cf::RUNTIME;
1307 1293
1308 return unless $self->dirty; 1294 return unless $self->dirty;
1309 1295
… …
1328 my ($self) = @_; 1314 my ($self) = @_;
1329 1315
1330 # save first because save cedes 1316 # save first because save cedes
1331 $self->save; 1317 $self->save;
1332 1318
1319 my $lock = cf::lock_acquire "map_data:" . $self->path;
1320
1333 return if $self->players; 1321 return if $self->players;
1334 return if $self->in_memory != cf::MAP_IN_MEMORY; 1322 return if $self->in_memory != cf::MAP_IN_MEMORY;
1335 return if $self->{deny_save}; 1323 return if $self->{deny_save};
1336 1324
1337 $self->clear; 1325 $self->clear;
… …
1379} 1367}
1380 1368
1381sub reset { 1369sub reset {
1382 my ($self) = @_; 1370 my ($self) = @_;
1383 1371
1372 my $lock = cf::lock_acquire "map_data:" . $self->path;
1373
1384 return if $self->players; 1374 return if $self->players;
1385 return if $self->{path}{user_rel};#d# 1375 return if $self->{path}{user_rel};#d#
1386 1376
1387 warn "resetting map ", $self->path;#d# 1377 warn "resetting map ", $self->path;#d#
1388 1378
… …
1407 1397
1408sub customise_for { 1398sub customise_for {
1409 my ($map, $ob) = @_; 1399 my ($map, $ob) = @_;
1410 1400
1411 if ($map->per_player) { 1401 if ($map->per_player) {
1412 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1402 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1413 } 1403 }
1414 1404
1415 $map 1405 $map
1416} 1406}
1417 1407
1418sub emergency_save { 1408sub emergency_save {
1419 local $cf::FREEZE = 1; 1409 my $freeze_guard = cf::freeze_mainloop;
1420 1410
1421 warn "enter emergency map save\n"; 1411 warn "enter emergency map save\n";
1422 1412
1423 cf::sync_job { 1413 cf::sync_job {
1424 warn "begin emergency map save\n"; 1414 warn "begin emergency map save\n";
… …
1514 my $link_pos = delete $self->{_link_pos}; 1504 my $link_pos = delete $self->{_link_pos};
1515 1505
1516 unless ($map) { 1506 unless ($map) {
1517 # restore original map position 1507 # restore original map position
1518 ($map, $x, $y) = @{ $link_pos || [] }; 1508 ($map, $x, $y) = @{ $link_pos || [] };
1519 $map = cf::map::find_map $map; 1509 $map = cf::map::find $map;
1520 1510
1521 unless ($map) { 1511 unless ($map) {
1522 ($map, $x, $y) = @$EMERGENCY_POSITION; 1512 ($map, $x, $y) = @$EMERGENCY_POSITION;
1523 $map = cf::map::find_map $map 1513 $map = cf::map::find $map
1524 or die "FATAL: cannot load emergency map\n"; 1514 or die "FATAL: cannot load emergency map\n";
1525 } 1515 }
1526 } 1516 }
1527 1517
1528 ($x, $y) = (-1, -1) 1518 ($x, $y) = (-1, -1)
… …
1553 my ($pl) = @_; 1543 my ($pl) = @_;
1554 1544
1555 # try to abort aborted map switching on player login :) 1545 # try to abort aborted map switching on player login :)
1556 # should happen only on crashes 1546 # should happen only on crashes
1557 if ($pl->ob->{_link_pos}) { 1547 if ($pl->ob->{_link_pos}) {
1548
1558 $pl->ob->enter_link; 1549 $pl->ob->enter_link;
1559 cf::async { 1550 (Coro::async_pool {
1560 # we need this sleep as the login has a concurrent enter_exit running 1551 # we need this sleep as the login has a concurrent enter_exit running
1561 # and this sleep increases chances of the player not ending up in scorn 1552 # and this sleep increases chances of the player not ending up in scorn
1562 Coro::Timer::sleep 1; 1553 Coro::Timer::sleep 1;
1563 $pl->ob->leave_link; 1554 $pl->ob->leave_link;
1564 }; 1555 })->prio (2);
1565 } 1556 }
1566 }, 1557 },
1567); 1558);
1568 1559
1569=item $player_object->goto_map ($path, $x, $y) 1560=item $player_object->goto ($path, $x, $y)
1570 1561
1571=cut 1562=cut
1572 1563
1573sub cf::object::player::goto_map { 1564sub cf::object::player::goto {
1574 my ($self, $path, $x, $y) = @_; 1565 my ($self, $path, $x, $y) = @_;
1575 1566
1576 $self->enter_link; 1567 $self->enter_link;
1577 1568
1578 (cf::async { 1569 (Coro::async_pool {
1579 $path = new cf::path $path; 1570 $path = new cf::path $path;
1580 1571
1581 my $map = cf::map::find_map $path->as_string; 1572 my $map = cf::map::find $path->as_string;
1582 $map = $map->customise_for ($self) if $map; 1573 $map = $map->customise_for ($self) if $map;
1583 1574
1584# warn "entering ", $map->path, " at ($x, $y)\n" 1575# warn "entering ", $map->path, " at ($x, $y)\n"
1585# if $map; 1576# if $map;
1586 1577
… …
1645 1636
1646 return unless $self->type == cf::PLAYER; 1637 return unless $self->type == cf::PLAYER;
1647 1638
1648 $self->enter_link; 1639 $self->enter_link;
1649 1640
1650 (cf::async { 1641 (Coro::async_pool {
1642 $self->deactivate_recursive; # just to be sure
1651 unless (eval { 1643 unless (eval {
1652 prepare_random_map $exit 1644 prepare_random_map $exit
1653 if $exit->slaying eq "/!"; 1645 if $exit->slaying eq "/!";
1654 1646
1655 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1647 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1656 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1648 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1657 1649
1658 1; 1650 1;
1659 }) { 1651 }) {
1660 $self->message ("Something went wrong deep within the crossfire server. " 1652 $self->message ("Something went wrong deep within the crossfire server. "
1661 . "I'll try to bring you back to the map you were before. " 1653 . "I'll try to bring you back to the map you were before. "
… …
1746=cut 1738=cut
1747 1739
1748sub cf::client::coro { 1740sub cf::client::coro {
1749 my ($self, $cb) = @_; 1741 my ($self, $cb) = @_;
1750 1742
1751 my $coro = &cf::async ($cb); 1743 my $coro = &Coro::async_pool ($cb);
1752 1744
1753 $coro->on_destroy (sub { 1745 $coro->on_destroy (sub {
1754 delete $self->{_coro}{$coro+0}; 1746 delete $self->{_coro}{$coro+0};
1755 }); 1747 });
1756 1748
… …
1994 local $/; 1986 local $/;
1995 *CFG = YAML::Syck::Load <$fh>; 1987 *CFG = YAML::Syck::Load <$fh>;
1996 1988
1997 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 1989 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1998 1990
1991 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
1992 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
1993
1999 if (exists $CFG{mlockall}) { 1994 if (exists $CFG{mlockall}) {
2000 eval { 1995 eval {
2001 $CFG{mlockall} ? &mlockall : &munlockall 1996 $CFG{mlockall} ? &mlockall : &munlockall
2002 and die "WARNING: m(un)lockall failed: $!\n"; 1997 and die "WARNING: m(un)lockall failed: $!\n";
2003 }; 1998 };
… …
2007 2002
2008sub main { 2003sub main {
2009 # we must not ever block the main coroutine 2004 # we must not ever block the main coroutine
2010 local $Coro::idle = sub { 2005 local $Coro::idle = sub {
2011 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2006 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2012 (Coro::unblock_sub { 2007 Coro::async_pool { Event::one_event };
2013 Event::one_event;
2014 })->();
2015 }; 2008 };
2016 2009
2017 cfg_load; 2010 cfg_load;
2018 db_load; 2011 db_load;
2019 load_extensions; 2012 load_extensions;
… …
2030 return; 2023 return;
2031 } 2024 }
2032 2025
2033 warn "reloading..."; 2026 warn "reloading...";
2034 2027
2035 local $FREEZE = 1; 2028 my $guard = freeze_mainloop;
2036 cf::emergency_save; 2029 cf::emergency_save;
2037 2030
2038 eval { 2031 eval {
2039 # if anything goes wrong in here, we should simply crash as we already saved 2032 # if anything goes wrong in here, we should simply crash as we already saved
2040 2033
… …
2176 reentrant => 0, 2169 reentrant => 0,
2177 prio => 0, 2170 prio => 0,
2178 at => $NEXT_TICK || $TICK, 2171 at => $NEXT_TICK || $TICK,
2179 data => WF_AUTOCANCEL, 2172 data => WF_AUTOCANCEL,
2180 cb => sub { 2173 cb => sub {
2181 unless ($FREEZE) {
2182 cf::server_tick; # one server iteration 2174 cf::server_tick; # one server iteration
2183 $RUNTIME += $TICK; 2175 $RUNTIME += $TICK;
2184 }
2185
2186 $NEXT_TICK += $TICK; 2176 $NEXT_TICK += $TICK;
2187 2177
2188 # if we are delayed by four ticks or more, skip them all 2178 # if we are delayed by four ticks or more, skip them all
2189 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2179 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2190 2180

Diff Legend

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