Back
[00:05:43] -!- logger[mah] has quit [Remote host closed the connection]
[00:05:50] -!- logger[mah] [logger[mah]!~loggermah@mail.mah.priv.at] has joined #linuxcnc-devel
[00:06:37] -!- TheLarch [TheLarch!~Larch@adsl-75-57-149-138.dsl.emhril.sbcglobal.net] has joined #linuxcnc-devel
[00:06:37] -!- TheLarch has quit [Changing host]
[00:06:38] -!- TheLarch [TheLarch!~Larch@unaffiliated/l84supper] has joined #linuxcnc-devel
[00:08:02] -!- L84Supper has quit [Ping timeout: 272 seconds]
[00:11:52] -!- kmiyashiro has quit [Ping timeout: 250 seconds]
[00:13:28] -!- tlab has quit [Quit: Leaving]
[00:52:10] -!- L84Supper [L84Supper!~Larch@unaffiliated/l84supper] has joined #linuxcnc-devel
[00:53:38] -!- TheLarch has quit [Ping timeout: 272 seconds]
[00:55:58] -!- Nick001-Shop has quit [Remote host closed the connection]
[01:10:24] -!- adb has quit [Ping timeout: 264 seconds]
[01:11:39] -!- sumpfralle1 has quit [Quit: Leaving.]
[01:18:10] -!- sumpfralle has quit [Ping timeout: 250 seconds]
[01:33:22] -!- tjb1 has quit [Ping timeout: 246 seconds]
[01:44:13] -!- tjb1 has quit [Ping timeout: 246 seconds]
[01:48:14] -!- rob_h has quit [Ping timeout: 255 seconds]
[02:03:42] -!- ve7it has quit [Remote host closed the connection]
[02:14:24] -!- toastydeath has quit [Ping timeout: 260 seconds]
[02:16:16] -!- andypugh has quit [Quit: andypugh]
[02:18:30] -!- sumpfralle1 has quit [Ping timeout: 272 seconds]
[02:25:15] -!- tjb1 has quit [Ping timeout: 256 seconds]
[02:55:21] -!- kmiyashiro has quit [Quit: kmiyashiro]
[03:10:39] -!- yuvipanda has quit [Changing host]
[03:13:41] -!- FinboySlick has quit [Remote host closed the connection]
[03:14:36] -!- pjm has quit [Ping timeout: 245 seconds]
[03:16:26] -!- yuvipanda has quit [Quit: yuvipanda]
[03:23:04] -!- yuvipanda has quit [Client Quit]
[03:41:06] -!- hdokes|werkin has quit [Read error: Connection reset by peer]
[03:59:43] -!- acdha has quit [Quit: Computer has gone to sleep.]
[04:01:01] -!- Keknom has quit [Quit: Leaving.]
[04:06:28] -!- acdha has quit [Quit: Computer has gone to sleep.]
[04:52:18] -!- yuvipanda has quit [Quit: yuvipanda]
[05:00:04] -!- pjm__ has quit [Ping timeout: 246 seconds]
[05:00:56] -!- schwinn434 has quit [Ping timeout: 255 seconds]
[05:01:44] sliptonic is now known as sliptonic_away
[05:04:09] sliptonic_away is now known as sliptonic
[05:49:33] -!- psha[work] [psha[work]!~psha@195.135.238.205] has joined #linuxcnc-devel
[06:01:29] -!- Jymmm has quit [Remote host closed the connection]
[06:02:29] -!- Fox_Muldr has quit [Ping timeout: 260 seconds]
[06:02:31] -!- karavanjoW has quit [Client Quit]
[06:11:59] -!- dhoovie has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/]
[06:41:13] -!- mhaberler [mhaberler!~mhaberler@089144206193.atnat0015.highway.a1.net] has joined #linuxcnc-devel
[06:43:36] -!- vladimirek [vladimirek!~vladimire@95.105.250.72] has joined #linuxcnc-devel
[06:50:18] -!- tjb1 has quit [Quit: tjb1]
[07:14:31] -!- mhaberler has quit [Read error: Connection reset by peer]
[07:38:26] -!- archivist_herron has quit [Ping timeout: 255 seconds]
[07:47:52] -!- crib has quit [Ping timeout: 246 seconds]
[08:00:48] -!- archivist_herron has quit [Ping timeout: 244 seconds]
[08:22:20] -!- adb [adb!~IonMoldom@178-211-235-11.dhcp.voenergies.net] has joined #linuxcnc-devel
[08:22:41] -!- mhaberler [mhaberler!~mhaberler@089144206193.atnat0015.highway.a1.net] has joined #linuxcnc-devel
[08:36:21] -!- mhaberler has quit [Read error: Connection reset by peer]
[08:40:31] -!- tayy has quit [Remote host closed the connection]
[08:40:44] -!- emel has quit [Excess Flood]
[08:46:27] -!- mhaberler [mhaberler!~mhaberler@089144206193.atnat0015.highway.a1.net] has joined #linuxcnc-devel
[08:52:45] -!- Valen has quit [Quit: Leaving.]
[08:56:06] theos is now known as Guest37765
[08:59:40] -!- Guest37765 has quit [Ping timeout: 250 seconds]
[09:02:17] -!- mhaberler has quit [Quit: mhaberler]
[09:09:26] -!- racycle has quit [Quit: racycle]
[10:10:39] -!- kmiyashiro has quit [Quit: kmiyashiro]
[10:28:06] hdokes is now known as hdokes|werkin
[10:53:09] -!- rob_h [rob_h!~rob_h@027c2a75.bb.sky.com] has joined #linuxcnc-devel
[11:03:42] -!- mk0 has quit [Ping timeout: 264 seconds]
[11:24:56] -!- mackerski_ has quit [Remote host closed the connection]
[11:25:50] -!- mackerski has quit [Read error: Connection reset by peer]
[11:25:51] mackerski_ is now known as mackerski
[11:26:07] -!- dhoovie has quit [Ping timeout: 246 seconds]
[11:37:54] -!- sumpfralle has quit [Ping timeout: 264 seconds]
[12:43:28] -!- dhoovie|2 has quit [Read error: Connection reset by peer]
[12:51:13] -!- psha[work] has quit [Quit: Lost terminal]
[12:59:22] -!- schwinn434 has quit [Ping timeout: 252 seconds]
[13:00:27] -!- mhaberler [mhaberler!~mhaberler@extern-180.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[13:04:37] -!- mhaberler has quit [Client Quit]
[13:19:04] -!- pingufan has quit [Quit: Konversation terminated!]
[13:36:20] -!- darkstar| has quit [Remote host closed the connection]
[13:59:25] -!- asdfasd has quit [Ping timeout: 246 seconds]
[14:13:54] -!- mackerski has quit [Ping timeout: 264 seconds]
[14:13:54] mackerski_ is now known as mackerski
[14:26:15] -!- wboykinm has quit [Read error: Connection reset by peer]
[14:36:23] -!- automata_ has quit [Ping timeout: 255 seconds]
[14:40:21] -!- mhaberler [mhaberler!~mhaberler@extern-180.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[15:07:36] -!- r00t4rd3d has quit [Quit: Leaving]
[15:12:34] -!- maximilian_h [maximilian_h!~bonsai@p549FC06E.dip.t-dialin.net] has joined #linuxcnc-devel
[15:15:23] -!- acdha has quit [Quit: Computer has gone to sleep.]
[15:23:04] -!- mhaberler has quit [Quit: mhaberler]
[15:23:24] -!- automata_ has quit [Ping timeout: 252 seconds]
[15:25:43] -!- maximilian_h has quit [Quit: Leaving.]
[15:36:19] -!- kwallace [kwallace!~kwallace@smb-165.sonnet.com] has joined #linuxcnc-devel
[15:37:51] -!- acdha has quit [Quit: Computer has gone to sleep.]
[15:54:28] -!- yuvipanda has quit [Ping timeout: 248 seconds]
[15:54:29] yuvipanda_ is now known as yuvipanda
[15:59:32] -!- riz_ [riz_!62dd7d6e@gateway/web/freenode/ip.98.221.125.110] has joined #linuxcnc-devel
[15:59:45] <riz_> hey guys
[16:01:06] <riz_> Quick question. I am not seeing how linuxcnc handles thread scheduling and thread quantums. Where is this done in the code?
[16:11:15] <L84Supper> riz_:
http://git.mah.priv.at/gitweb/emc2-dev.git/blob/cb531920f74e38e6d8ba3da6866798a31cf10804:/src/hal/hal_lib.c#l2660
[16:11:18] <L84Supper> everthing in HAL + motion is executed from there
[16:11:57] <L84Supper> * this is the task function that implements threads in realtime *
[16:12:29] -!- proxee has quit [Quit: Page closed]
[16:13:35] <riz_> Yeah, I saw that before. It starts on line 2669, but maybe I dont understand how the time slicing happens between threads
[16:14:34] <riz_> Are threads given a certain quantum to run for, if so, where is that done?
[16:20:20] -!- tronwizard has quit [Ping timeout: 255 seconds]
[16:21:56] <pcw_home> I dint think so, threads simply run to completion
[16:24:52] <pcw_home> all LinuxCNC real time threads are periodic, not scheduled
[16:30:38] -!- abetusk has quit [Quit: Leaving]
[16:31:26] <riz_> So, what if there is an eror on the thread and it never completes? Is that just handled by a watchdog?
[16:32:20] <pcw_home> that will cause (I think) a real time error
[16:32:54] <pcw_home> so thinks like comps can never busywait
[16:38:07] <riz_> Im just trying to understand the software architecture. Is linuxcnc just composed of a single process that spawns threads for the individual modules?
[16:38:19] <riz_> Or are there multiple processes?
[16:40:02] <pcw_home> I am no expert but are you talking about the real time portion or the userland parts?
[16:44:17] -!- wboykinm has quit [Read error: Connection reset by peer]
[16:46:01] -!- wboykinm has quit [Read error: Connection reset by peer]
[16:48:18] <riz_> I was mainly talking about the entire application
[16:48:31] <riz_> Is the real time a process and ul a process?
[16:49:34] <pcw_home> AFAIK the real time portion is simply synchronous/periodic and of course the non real time portion can have any manner of processes/threads etc
[16:55:57] <pcw_home> So the real time threads are real time only. No connection with the rest of LinuxCNC except via
[16:55:59] <pcw_home> data passed between the realtime/non realtime realms
[16:57:09] -!- tronwizard has quit [Ping timeout: 252 seconds]
[17:00:26] -!- theos has quit [Quit: cya]
[17:00:34] -!- holst has quit [Ping timeout: 252 seconds]
[17:03:33] -!- mackerski has quit [Quit: mackerski]
[17:07:57] -!- yuvipanda has quit [Ping timeout: 244 seconds]
[17:07:57] yuvipanda_ is now known as yuvipanda
[17:09:25] -!- Simon1 has quit [Read error: Connection reset by peer]
[17:14:53] -!- acdha has quit [Quit: Computer has gone to sleep.]
[17:15:01] -!- Poincare has quit [Ping timeout: 245 seconds]
[17:22:20] -!- ve7it [ve7it!~LawrenceG@S01060014d19d0b68.pk.shawcable.net] has joined #linuxcnc-devel
[17:23:10] -!- wboykinm has quit [Read error: Connection reset by peer]
[17:27:23] -!- ybon has quit [Ping timeout: 255 seconds]
[17:29:47] -!- mackerski has quit [Ping timeout: 260 seconds]
[17:29:47] mackerski_ is now known as mackerski
[17:39:22] -!- mackerski has quit [Quit: mackerski]
[17:45:30] -!- mackerski has quit [Read error: Operation timed out]
[17:47:12] -!- wboykinm has quit [Read error: Connection reset by peer]
[17:48:30] -!- wboykinm has quit [Read error: Connection reset by peer]
[17:53:33] -!- acdha has quit [Quit: Computer has gone to sleep.]
[17:55:22] -!- mackerski has quit [Quit: mackerski]
[18:38:44] -!- yuvipanda has quit [Ping timeout: 248 seconds]
[18:38:45] yuvipanda_ is now known as yuvipanda
[18:39:50] -!- ve7it has quit [Remote host closed the connection]
[18:41:26] -!- sumpfralle has quit [Ping timeout: 272 seconds]
[18:57:30] -!- riz_ has quit [Quit: Page closed]
[19:05:28] -!- mackerski has quit [Quit: mackerski]
[19:05:32] -!- IchGuckLive has quit [Quit: ChatZilla 0.9.87 [Firefox 16.0.2/20121025205401]]
[19:08:23] -!- andypugh [andypugh!~andy2@cpc16-basl9-2-0-cust685.20-1.cable.virginmedia.com] has joined #linuxcnc-devel
[19:52:05] -!- jthornton has quit [Read error: Connection reset by peer]
[19:52:18] -!- JT-Shop has quit [Read error: Connection reset by peer]
[19:52:30] -!- jthornton [jthornton!~john@184-63-140-99.cust.wildblue.net] has joined #linuxcnc-devel
[20:10:18] -!- motioncontrol has quit [Quit: Sto andando via]
[20:10:53] -!- _ilias has quit [Ping timeout: 245 seconds]
[20:19:33] -!- mhaberler [mhaberler!~mhaberler@extern-183.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[20:26:56] -!- Loetmichel has quit [Ping timeout: 250 seconds]
[20:31:20] -!- mhaberler has quit [Quit: mhaberler]
[20:36:41] -!- wboykinm has quit [Remote host closed the connection]
[21:01:11] -!- PCW [PCW!~chatzilla@99.88.10.65] has joined #linuxcnc-devel
[21:07:42] -!- JT-Shop [JT-Shop!~John@184-63-140-99.cust.wildblue.net] has joined #linuxcnc-devel
[21:07:44] -!- bedah has quit [Quit: nye]
[21:07:50] -!- JT-Shop has quit [Read error: Connection reset by peer]
[21:08:26] -!- vladimirek has quit [Remote host closed the connection]
[21:12:11] -!- JT-Shop [JT-Shop!~John@184-63-140-99.cust.wildblue.net] has joined #linuxcnc-devel
[21:21:25] -!- Keknom has quit [Quit: Leaving.]
[21:27:18] -!- Loetmichel has quit [Disconnected by services]
[21:27:22] -!- ve7it [ve7it!~LawrenceG@S01060014d19d0b68.pk.shawcable.net] has joined #linuxcnc-devel
[21:27:25] ksdfhskjdf is now known as Loetmichel
[21:28:52] -!- Cylly has quit [Ping timeout: 244 seconds]
[21:31:06] -!- mhaberler [mhaberler!~mhaberler@extern-183.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[21:33:41] -!- ve7it has quit [Remote host closed the connection]
[21:41:26] -!- schwinn434 has quit [Ping timeout: 252 seconds]
[21:41:27] -!- skunkworks has quit [Remote host closed the connection]
[21:43:05] yuvipanda is now known as ConfusedPanda
[21:45:23] -!- joe9 has quit [Quit: leaving]
[21:47:57] -!- skunkworks [skunkworks!~chatzilla@str-broadband-ccmts-ws-26.dsl.airstreamcomm.net] has joined #linuxcnc-devel
[21:54:37] -!- FinboySlick has quit [Quit: Leaving.]
[21:55:32] -!- phantoxeD has quit [Ping timeout: 248 seconds]
[22:02:12] -!- Youdaman has quit [Ping timeout: 265 seconds]
[22:09:52] -!- maximilian_h [maximilian_h!~bonsai@g230135059.adsl.alicedsl.de] has joined #linuxcnc-devel
[22:09:57] ConfusedPanda is now known as CompilingPanda
[22:09:58] -!- maximilian_h [maximilian_h!~bonsai@g230135059.adsl.alicedsl.de] has parted #linuxcnc-devel
[22:13:48] -!- mhaberler has quit [Ping timeout: 265 seconds]
[22:18:07] -!- DJ9DJ has quit [Quit: bye]
[22:40:59] -!- syyl has quit [Quit: Leaving]
[22:52:33] -!- ve7it [ve7it!~LawrenceG@S01060014d19d0b68.pk.shawcable.net] has joined #linuxcnc-devel
[22:54:06] <kwallace> Hello. I want to scrap a working file and then have git replace the one I started with. Does "git checkout my_file" make a copy of my local file from my last commit and put it where the working file was?
[22:54:39] -!- _ilias has quit [Quit: Page closed]
[22:55:22] <andypugh> I _think_ it normally pulls the original from the repo.
[22:58:38] <kwallace> The problem is that the file has been changed on the remote end so I want to abandon my work. I usually commit before I "pull", but I don't want to commit my local file.
[23:00:38] <andypugh> Sounds like a question for someone with more clue than you, and I am not that person.
[23:01:13] -!- sumpfralle has quit [Ping timeout: 246 seconds]
[23:03:00] <kwallace> Thanks for replying. The last time I got creative I deleted someone else's work. I don't want to do that again.
[23:05:54] -!- Spida has quit [Read error: Operation timed out]
[23:15:08] -!- acdha has quit [Quit: Leaving...]
[23:17:34] <seb_kuzminsky> kwallace: 'git checkout myfile' restores the file in your working tree to the state it was before you changed it
[23:17:51] <seb_kuzminsky> in git-speak, it replaces the file in your working tree with the file in your HEAD
[23:18:04] <seb_kuzminsky> HEAD is the commit in the repo that your working tree is based on
[23:18:44] <seb_kuzminsky> it's the commit that's shown if you say 'git show', and it's the commit at the top when you say 'git log'
[23:18:51] <seb_kuzminsky> does that answer your question?
[23:34:00] -!- L33TG33KG34R has quit [Ping timeout: 252 seconds]
[23:35:56] <kwallace> Thanks. I think so. I moved the modified files, so I can keep some of the edits for later, but I want to be able to pull the remote so I can work on the latest remote edits. I guess the worst that can happen is that I just start over with a clone.
[23:36:14] <seb_kuzminsky> kwallace: i's suggest a different work flow
[23:36:23] <kwallace> ?
[23:36:35] <seb_kuzminsky> firstly, it's *always* safe to run 'git fetch' (note: not 'git pull'!)
[23:37:04] <seb_kuzminsky> git fetch retrieves all new commits and files and stuff from the repo on git.linuxcnc.org, but it does *not* modify any of your files or branches
[23:37:23] <seb_kuzminsky> so after a 'git fetch' you can see what's changed upstream, without having any of your in-progress work disrupted
[23:37:42] <seb_kuzminsky> for example, you can run 'gitk origin/v2.5_branch' to see what's happened in the 2.5_branch on origin
[23:38:02] <seb_kuzminsky> if you want to sync up your work with origin, you'd do something like this:
[23:38:17] <seb_kuzminsky> 'git status' to see what changes you have in your tree that need to be committed or discarded
[23:38:31] <seb_kuzminsky> 'git commit' the stuff you want to keep, and 'git checkout' the stuff you want to discard
[23:38:54] <seb_kuzminsky> (as noted above, 'git checkout filename' restores filename to the way it was before you changed it)
[23:39:17] <seb_kuzminsky> then look at your branch and the upstream branch with 'gitk mybranch origin/master' (or whatever branch on origin you're based on)
[23:39:59] <seb_kuzminsky> assuming you have some local commits that you want to integrate with origin/master, you'd then run 'git rebase origin/master' to "transplant" your commits onto the freshly fetched origin/master branch
[23:40:06] <seb_kuzminsky> does all that make sense?
[23:43:06] -!- tjb1 has quit [Quit: tjb1]
[23:46:30] <kwallace> I think I'm catching on.
[23:49:11] -!- tjb1 has quit [Ping timeout: 260 seconds]
[23:51:06] <kwallace> Cool. Checkout worked just like you said it would.
[23:51:15] <seb_kuzminsky> whew!
[23:51:55] toastyde1th is now known as toastydeath
[23:54:29] <kwallace> Now all git status gives me only untracked files, so I should be able to do a pull. I need to look more at the fetch command.
[23:54:36] -!- Brandonian has quit [Quit: Brandonian]
[23:56:03] <seb_kuzminsky> you should never use pull, imo
[23:56:50] <seb_kuzminsky> 'git pull' does 'git fetch && git merge', which may be convenient but pollutes our git history with unnecessary merge commits
[23:57:04] <seb_kuzminsky> better to do 'git fetch' followed by 'git rebase'